Background transparency

iTerm2.xcodeproj/project.pbxproj

@@ -4658,7 +4658,7 @@
 		0464AB0C006CD2EC7F000001 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0610;
+				LastUpgradeCheck = 0620;
 			};
 			buildConfigurationList = BB024D39096EE4080021E793 /* Build configuration list for PBXProject "iTerm2" */;
 			compatibilityVersion = "Xcode 3.2";

sources/ITAddressBookMgr.h

@@ -128,6 +128,10 @@
 #define KEY_BLEND                  @"Blend"
 #define KEY_BLUR                   @"Blur"
 #define KEY_BLUR_RADIUS            @"Blur Radius"
+#define KEY_USE_INACTIVE_TRANSPARENCY   @"Use Inactive Transparency Values"
+#define KEY_INACTIVE_TRANSPARENCY       @"Inactive Transparency"
+#define KEY_INACTIVE_BLUR          @"Use Inactive Blur"
+#define KEY_INACTIVE_BLUR_RADIUS   @"Inactive Blur Radius"
 #define KEY_ANTI_ALIASING          @"Anti Aliasing"  // DEPRECATED
 #define KEY_ASCII_ANTI_ALIASED     @"ASCII Anti Aliased"
 #define KEY_USE_NONASCII_FONT      @"Use Non-ASCII Font"

sources/KeysPreferencesViewController.m

@@ -178,7 +178,11 @@ - (void)generateHotkeyWindowProfile {
     [dict setObject:[NSNumber numberWithFloat:0.3] forKey:KEY_TRANSPARENCY];
     [dict setObject:[NSNumber numberWithFloat:0.5] forKey:KEY_BLEND];
     [dict setObject:[NSNumber numberWithFloat:2.0] forKey:KEY_BLUR_RADIUS];
+    [dict setObject:[NSNumber numberWithFloat:0.3] forKey:KEY_INACTIVE_TRANSPARENCY];
+    [dict setObject:[NSNumber numberWithFloat:2.0] forKey:KEY_INACTIVE_BLUR_RADIUS];
     [dict setObject:[NSNumber numberWithBool:YES] forKey:KEY_BLUR];
+    [dict setObject:[NSNumber numberWithBool:YES] forKey:KEY_INACTIVE_BLUR];
+    [dict setObject:[NSNumber numberWithBool:YES] forKey:KEY_USE_INACTIVE_TRANSPARENCY];
     [dict setObject:[NSNumber numberWithInt:-1] forKey:KEY_SCREEN];
     [dict setObject:[NSNumber numberWithInt:-1] forKey:KEY_SPACE];
     [dict setObject:@"" forKey:KEY_SHORTCUT];

sources/PTYSession.h

@@ -193,6 +193,8 @@ typedef enum {
 
 @property(nonatomic, retain) iTermColorMap *colorMap;
 @property(nonatomic, assign) float transparency;
+@property(nonatomic, assign) BOOL useInactiveTransparency;
+@property(nonatomic, assign) float inactiveTransparency;
 @property(nonatomic, assign) float blend;
 @property(nonatomic, assign) BOOL useBoldFont;
 @property(nonatomic, assign) BOOL useItalicFont;

sources/PTYSession.m

@@ -801,6 +801,8 @@ - (BOOL)setScreenSize:(NSRect)aRect parent:(id<WindowControllerInterface>)parent
      horizontalSpacing:[[_profile objectForKey:KEY_HORIZONTAL_SPACING] floatValue]
        verticalSpacing:[[_profile objectForKey:KEY_VERTICAL_SPACING] floatValue]];
     [self setTransparency:[[_profile objectForKey:KEY_TRANSPARENCY] floatValue]];
+    [self setInactiveTransparency:[[_profile objectForKey:KEY_INACTIVE_TRANSPARENCY] floatValue]];
+    [self setUseInactiveTransparency:[[_profile objectForKey:KEY_USE_INACTIVE_TRANSPARENCY] boolValue]];
     const float theBlend =
         [_profile objectForKey:KEY_BLEND] ? [[_profile objectForKey:KEY_BLEND] floatValue] : 0.5;
     [self setBlend:theBlend];
@@ -2281,6 +2283,8 @@ - (void)setPreferencesFromAddressBookEntry:(NSDictionary *)aePrefs
 
     // transparency
     [self setTransparency:[iTermProfilePreferences floatForKey:KEY_TRANSPARENCY inProfile:aDict]];
+    [self setUseInactiveTransparency:[iTermProfilePreferences boolForKey:KEY_USE_INACTIVE_TRANSPARENCY inProfile:aDict]];
+    [self setInactiveTransparency:[iTermProfilePreferences floatForKey:KEY_INACTIVE_TRANSPARENCY inProfile:aDict]];
     [self setBlend:[iTermProfilePreferences floatForKey:KEY_BLEND inProfile:aDict]];
 
     // bold 
@@ -2669,6 +2673,26 @@ - (void)setTransparency:(float)transparency
     [_textview setTransparency:transparency];
 }
 
+- (float)inactiveTransparency {
+    return [_textview inactiveTransparency];
+}
+
+- (void)setInactiveTransparency:(float)inactiveTransparency {
+    // Limit transparency because fully transparent windows can't be clicked on.
+    if (inactiveTransparency > 0.9) {
+        inactiveTransparency = 0.9;
+    }
+    [_textview setInactiveTransparency:inactiveTransparency];
+}
+
+- (BOOL)useInactiveTransparency {
+    return [_textview useInactiveTransparency];
+}
+
+- (void)setUseInactiveTransparency:(BOOL)useInactiveTransparency {
+    [_textview setUseInactiveTransparency:useInactiveTransparency];
+}
+
 - (float)blend
 {
     return [_textview blend];
@@ -4648,7 +4672,7 @@ - (NSImage *)patternedImage {
 - (void)textViewDrawBackgroundImageInView:(NSView *)view
                                  viewRect:(NSRect)rect
                    blendDefaultBackground:(BOOL)blendDefaultBackground {
-    const float alpha = _textview.useTransparency ? (1.0 - _textview.transparency) : 1.0;
+    float alpha = [_textview transparencyAlpha];
     if (_backgroundImage) {
         NSRect localRect = [_view convertRect:rect fromView:view];
         NSImage *image;

sources/PTYTab.h

@@ -179,7 +179,7 @@
 - (PTYSession*)sessionBelow:(PTYSession*)session;
 - (BOOL)canSplitVertically:(BOOL)isVertical withSize:(NSSize)newSessionSize;
 - (NSImage*)image:(BOOL)withSpaceForFrame;
-- (bool)blur;
+- (BOOL)blur;
 - (double)blurRadius;
 - (void)recheckBlur;
 

sources/PTYTab.m

@@ -1855,21 +1855,16 @@ - (NSSize)_minSizeOfView:(NSView*)view
 }
 
 // Blur the window if any session is blurred.
-- (bool)blur
-{
-    int n = 0;
-    int y = 0;
+- (BOOL)blur {
     NSArray* sessions = [self sessions];
     for (PTYSession* session in sessions) {
         if ([session transparency] > 0 &&
             [[session textview] useTransparency] &&
             [[[session profile] objectForKey:KEY_BLUR] boolValue]) {
-            ++y;
-        } else {
-            ++n;
+            return YES;
         }
     }
-    return y > 0;
+    return NO;
 }
 
 - (double)blurRadius
@@ -1891,15 +1886,66 @@ - (double)blurRadius
     }
 }
 
-- (void)recheckBlur
-{
+- (BOOL)useInactiveTransparency {
+    NSArray* sessions = [self sessions];
+    for (PTYSession* session in sessions) {
+        if ([[session textview] useInactiveTransparency]) {
+            return YES;
+        }
+    }
+    return NO;
+}
+
+- (BOOL)inactiveBlur {
+    NSArray* sessions = [self sessions];
+    for (PTYSession* session in sessions) {
+        if ([session inactiveTransparency] > 0 &&
+            [[session textview] useInactiveTransparency] &&
+            [[[session profile] objectForKey:KEY_INACTIVE_BLUR] boolValue]) {
+            return YES;
+        }
+    }
+    return NO;
+}
+
+- (double)inactiveBlurRadius {
+    double sum = 0;
+    double count = 0;
+    NSArray* sessions = [self sessions];
+    for (PTYSession* session in sessions) {
+        if ([[[session profile] objectForKey:KEY_INACTIVE_BLUR] boolValue]) {
+            sum += [[session profile] objectForKey:KEY_INACTIVE_BLUR_RADIUS]
+                 ? [[[session profile] objectForKey:KEY_INACTIVE_BLUR_RADIUS] floatValue]
+                 : 2.0;
+            ++count;
+        }
+    }
+    if (count > 0) {
+        return sum / count;
+    } else {
+        // This shouldn't actually happen, but better save than divide by zero.
+        return 2.0;
+    }
+}
+
+- (void)recheckBlur {
     PtyLog(@"PTYTab recheckBlur");
     if ([realParentWindow_ currentTab] == self &&
         ![[realParentWindow_ window] isMiniaturized]) {
-        if ([self blur]) {
-            [parentWindow_ enableBlur:[self blurRadius]];
+        if ([[[self realParentWindow] window] isKeyWindow]){
+            if ([self blur]) {
+                [parentWindow_ enableBlur:[self blurRadius]];
+            } else {
+                [parentWindow_ disableBlur];
+            }
         } else {
-            [parentWindow_ disableBlur];
+            if ([self inactiveBlur]) {
+                [parentWindow_ enableBlur:[self inactiveBlurRadius]];
+            } else if (![self useInactiveTransparency] && [self blur]) {
+                [parentWindow_ enableBlur:[self blurRadius]];
+            } else {
+                [parentWindow_ disableBlur];
+            }
         }
     }
 }

sources/PTYTextView.h

@@ -199,11 +199,16 @@ typedef enum {
 // Transparency level. 0 to 1.
 @property(nonatomic, assign) double transparency;
 
+// Transparency level. 0 to 1.
+@property(nonatomic, assign) double inactiveTransparency;
+
 // Blending level for background color over background image
 @property(nonatomic, assign) double blend;
 
 // Should transparency be used?
 @property(nonatomic, readonly) BOOL useTransparency;
+@property(nonatomic, readonly) BOOL useInactiveTransparency;
+@property(nonatomic, readonly) BOOL isBackground;
 
 // Indicates if the last key pressed was a repeat.
 @property(nonatomic, readonly) BOOL keyIsARepeat;
@@ -317,6 +322,9 @@ typedef enum {
 // Updates the preferences for semantic history.
 - (void)setSemanticHistoryPrefs:(NSDictionary *)prefs;
 
+// Is the main window active?
+- (void)setIsBackground:(BOOL)isBackground;
+
 // Various accessors (TODO: convert as many as possible into properties)
 - (void)setFont:(NSFont*)aFont
     nonAsciiFont:(NSFont *)nonAsciiFont
@@ -419,5 +427,11 @@ typedef enum {
                          prefix:(NSString *)prefix
                          suffix:(NSString *)suffix;
 
+// Get the transparency value for foreground or background windows.
+- (double)transparencyAlpha;
+
+// Allow a special transparency for inactive windows.
+- (void)setUseInactiveTransparency:(BOOL)useInactiveTransparency;
+
 @end
 

sources/PTYTextView.m

@@ -5221,6 +5221,27 @@ - (void)setTransparency:(double)fVal
     [self setNeedsDisplay:YES];
 }
 
+- (void)setInactiveTransparency:(double)inactiveTransparency
+{
+    _inactiveTransparency = inactiveTransparency;
+    [_colorMap invalidateCache];
+    [self setNeedsDisplay:YES];
+}
+
+- (void)setUseInactiveTransparency:(BOOL)useInactiveTransparency
+{
+    _useInactiveTransparency = useInactiveTransparency;
+    [_colorMap invalidateCache];
+    [self setNeedsDisplay:YES];
+}
+
+- (void)setIsBackground:(BOOL)isBackground
+{
+    _isBackground = isBackground;
+    [_colorMap invalidateCache];
+    [self setNeedsDisplay:YES];
+}
+
 - (void)setBlend:(double)fVal
 {
     _blend = MIN(MAX(0.3, fVal), 1);
@@ -6376,7 +6397,11 @@ - (BOOL)_drawLine:(int)line
     int WIDTH = [_dataSource width];
     screen_char_t* theLine = [_dataSource getLineAtIndex:line];
     BOOL hasBGImage = [_delegate textViewHasBackgroundImage];
+
     double selectedAlpha = 1.0 - _transparency;
+    if(_isBackground){
+        selectedAlpha = 1.0 - _inactiveTransparency;
+    }
     double alphaIfTransparencyInUse = [self transparencyAlpha];
     BOOL reversed = [[_dataSource terminal] reverseVideo];
     NSColor *aColor = nil;
@@ -7163,7 +7188,13 @@ - (NSColor *)smartCursorColorForChar:(screen_char_t)screenChar
 }
 
 - (double)transparencyAlpha {
-    return [self useTransparency] ? 1.0 - _transparency : 1.0;
+    if([self useTransparency]){
+        if([self isBackground] && [self useInactiveTransparency]){
+            return 1.0 - _inactiveTransparency;
+        }
+        return 1.0 - _transparency;
+    }
+    return 1.0;
 }
 
 - (screen_char_t)charForCursorAtColumn:(int)column

sources/ProfilePreferencesViewController.m

@@ -155,7 +155,12 @@ - (void)awakeFromNib {
         static const CGFloat kMaxHeight = 438;
         if (view.frame.size.height > kMaxHeight) {
             // If the view is too tall, wrap it in a scroll view.
-            NSRect theFrame = NSMakeRect(0, 0, view.frame.size.width, kMaxHeight);
+
+            CGFloat widthWithScrollBar = view.frame.size.width +
+            [NSScroller scrollerWidthForControlSize:NSRegularControlSize scrollerStyle:NSScrollerStyleLegacy];
+
+            NSRect theFrame = NSMakeRect(0, 0, widthWithScrollBar, kMaxHeight);
+
             iTermSizeRememberingView *sizeRememberingView =
             [[[iTermSizeRememberingView alloc] initWithFrame:theFrame] autorelease];
             sizeRememberingView.autoresizingMask = (NSViewWidthSizable | NSViewHeightSizable);

sources/ProfilesWindowPreferencesViewController.m

@@ -24,6 +24,10 @@ @implementation ProfilesWindowPreferencesViewController {
     IBOutlet NSSlider *_transparency;
     IBOutlet NSButton *_useBlur;
     IBOutlet NSSlider *_blurRadius;
+    IBOutlet NSButton *_useInactiveTransparency;
+    IBOutlet NSSlider *_inactiveTransparency;
+    IBOutlet NSButton *_useInactiveBlur;
+    IBOutlet NSSlider *_inactiveBlurRadius;
     IBOutlet NSButton *_useBackgroundImage;
     IBOutlet iTermImageWell *_backgroundImagePreview;
     IBOutlet NSButton *_backgroundImageTiled;
@@ -70,6 +74,31 @@ - (void)awakeFromNib {
                     key:KEY_BLUR_RADIUS
                    type:kPreferenceInfoTypeSlider];
 
+    info = [self defineControl:_useInactiveTransparency
+                           key:KEY_USE_INACTIVE_TRANSPARENCY
+                          type:kPreferenceInfoTypeCheckbox];
+    info.observer = ^() {
+        _inactiveTransparency.enabled = (_useInactiveTransparency.state == NSOnState);
+        _useInactiveBlur.enabled = (_useInactiveTransparency.state == NSOnState);
+    };
+
+    [self defineControl:_inactiveTransparency
+                    key:KEY_INACTIVE_TRANSPARENCY
+                   type:kPreferenceInfoTypeSlider];
+
+    info = [self defineControl:_useInactiveBlur
+                           key:KEY_INACTIVE_BLUR
+                          type:kPreferenceInfoTypeCheckbox];
+    info.observer = ^() {
+        _inactiveBlurRadius.enabled =
+        (_useInactiveTransparency.state == NSOnState
+         && _useInactiveBlur.state == NSOnState);
+    };
+
+    [self defineControl:_inactiveBlurRadius
+                    key:KEY_INACTIVE_BLUR_RADIUS
+                   type:kPreferenceInfoTypeSlider];
+
     [self defineControl:_backgroundImageTiled
                     key:KEY_BACKGROUND_IMAGE_TILED
                    type:kPreferenceInfoTypeCheckbox];

sources/PseudoTerminal.m

@@ -2390,6 +2390,11 @@ - (void)windowDidBecomeKey:(NSNotification *)aNotification {
             [self hideMenuBar];
         }
     }
+
+    for (PTYSession *aSession in [self allSessions]) {
+        [[aSession textview] setIsBackground:NO];
+    }
+
 
     // Note: there was a bug in the old iterm that setting fonts didn't work
     // properly if the font panel was left open in focus-follows-mouse mode.
@@ -2682,6 +2687,7 @@ - (void)windowDidResignKey:(NSNotification *)aNotification {
             [[aSession textview] endFindCursor];
         }
         [[aSession textview] removeUnderline];
+        [[aSession textview] setIsBackground:YES];
     }
 
     PtyLog(@"PseudoTerminal windowDidResignKey");
@@ -2709,6 +2715,7 @@ - (void)windowDidResignKey:(NSNotification *)aNotification {
         tabBarControl.flashing = NO;
         [self showMenuBar];
     }
+
     // update the cursor
     [[[self currentSession] textview] refresh];
     [[[self currentSession] textview] setNeedsDisplay:YES];
@@ -5596,6 +5603,7 @@ - (void)setDimmingForSession:(PTYSession *)aSession
         // broadcasting to the current session.
         [[aSession view] setDimmed:YES];
     }
+    [[aSession tab] recheckBlur];
     [[aSession view] setNeedsDisplay:YES];
 }