Add option to dim only text/nondefault bg colors.

English.lproj/PreferencePanel.xib

@@ -1335,6 +1335,28 @@
 													<int key="NSPeriodicInterval">25</int>
 												</object>
 											</object>
+											<object class="NSButton" id="652260021">
+												<reference key="NSNextResponder" ref="1019983678"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{283, 98}, {298, 18}}</string>
+												<reference key="NSSuperview" ref="1019983678"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="438107074">
+													<int key="NSCellFlags">-2080244224</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Dimming affects only text, not background.</string>
+													<reference key="NSSupport" ref="966507434"/>
+													<reference key="NSControlView" ref="652260021"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="93419583"/>
+													<reference key="NSAlternateImage" ref="573748959"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
 											<object class="NSButton" id="1009965154">
 												<reference key="NSNextResponder" ref="1019983678"/>
 												<int key="NSvFlags">256</int>
@@ -1360,7 +1382,7 @@
 											<object class="NSButton" id="253372206">
 												<reference key="NSNextResponder" ref="1019983678"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{283, 98}, {228, 18}}</string>
+												<string key="NSFrame">{{283, 78}, {228, 18}}</string>
 												<reference key="NSSuperview" ref="1019983678"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="651640814">
@@ -12020,6 +12042,30 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 					<int key="connectionID">5329</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">settingChanged:</string>
+						<reference key="source" ref="155244235"/>
+						<reference key="destination" ref="652260021"/>
+					</object>
+					<int key="connectionID">5332</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="652260021"/>
+						<reference key="destination" ref="253372206"/>
+					</object>
+					<int key="connectionID">5333</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dimOnlyText</string>
+						<reference key="source" ref="155244235"/>
+						<reference key="destination" ref="652260021"/>
+					</object>
+					<int key="connectionID">5334</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -15164,6 +15210,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<reference ref="253372206"/>
 							<reference ref="42775949"/>
 							<reference ref="140624317"/>
+							<reference ref="652260021"/>
 						</object>
 						<reference key="parent" ref="75732044"/>
 					</object>
@@ -17172,6 +17219,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<reference key="object" ref="592396050"/>
 						<reference key="parent" ref="140624317"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5330</int>
+						<reference key="object" ref="652260021"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="438107074"/>
+						</object>
+						<reference key="parent" ref="1019983678"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5331</int>
+						<reference key="object" ref="438107074"/>
+						<reference key="parent" ref="652260021"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -18232,6 +18293,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>5325.IBPluginDependency</string>
 					<string>5325.IBViewBoundsToFrameTransform</string>
 					<string>5326.IBPluginDependency</string>
+					<string>5330.IBPluginDependency</string>
+					<string>5330.IBViewBoundsToFrameTransform</string>
+					<string>5331.IBPluginDependency</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -19503,6 +19567,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDjYAAwwYAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
 						<bytes key="NSTransformStruct">P4AAAL+AAABD2AAAw1UAAA</bytes>
 					</object>
@@ -19525,7 +19594,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">5329</int>
+			<int key="maxID">5334</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -19919,6 +19988,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>deleteSendsCtrlHButton</string>
 							<string>dimBackgroundWindows</string>
 							<string>dimInactiveSplitPanes</string>
+							<string>dimOnlyText</string>
 							<string>disableSmcupRmcup</string>
 							<string>disableWindowResizing</string>
 							<string>displayFontAccessoryView</string>
@@ -20118,6 +20188,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>NSButton</string>
 							<string>NSButton</string>
 							<string>NSButton</string>
+							<string>NSButton</string>
 							<string>NSView</string>
 							<string>NSSlider</string>
 							<string>NSSlider</string>
@@ -20316,6 +20387,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>deleteSendsCtrlHButton</string>
 							<string>dimBackgroundWindows</string>
 							<string>dimInactiveSplitPanes</string>
+							<string>dimOnlyText</string>
 							<string>disableSmcupRmcup</string>
 							<string>disableWindowResizing</string>
 							<string>displayFontAccessoryView</string>
@@ -20756,6 +20828,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<string key="name">dimInactiveSplitPanes</string>
 								<string key="candidateClassName">NSButton</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">dimOnlyText</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">disableSmcupRmcup</string>
 								<string key="candidateClassName">NSButton</string>

Headers/iTerm/PTYTextView.h

@@ -250,6 +250,12 @@ typedef struct PTYFontInfo PTYFontInfo;
     NSMutableArray* lineBreakIndexOffsets_;
     // For accessibility. This is the actual indices at which newlines occcur in allText_.
     NSMutableArray* lineBreakCharOffsets_;
+
+    // Brightness of background color
+    double backgroundBrightness_;
+
+    // Dim everything but the default background color.
+    BOOL dimOnlyText_;
 }
 + (NSCursor *)textViewCursor;
@@ -312,12 +318,13 @@ typedef struct PTYFontInfo PTYFontInfo;
 - (void)setBlinkingCursor:(BOOL)bFlag;
 - (void)setBlinkAllowed:(BOOL)value;
 - (void)setCursorType:(ITermCursorType)value;
+- (void)setDimOnlyText:(BOOL)value;
 //color stuff
 - (NSColor*)defaultFGColor;
 - (NSColor*)defaultBGColor;
 - (NSColor*)defaultBoldColor;
-- (NSColor*)colorForCode:(int)theIndex alternateSemantics:(BOOL)alt bold:(BOOL)isBold;
+- (NSColor*)colorForCode:(int)theIndex alternateSemantics:(BOOL)alt bold:(BOOL)isBold isBackground:(BOOL)isBackground;
 - (NSColor*)selectionColor;
 - (NSColor*)defaultCursorColor;
 - (NSColor*)selectedTextColor;

Headers/iTerm/PreferencePanel.h

@@ -180,6 +180,10 @@ typedef enum { CURSOR_UNDERLINE, CURSOR_VERTICAL, CURSOR_BOX } ITermCursorType;
     IBOutlet NSButton* dimBackgroundWindows;
     BOOL defaultDimBackgroundWindows;
+    // Dim text (and non-default background colors)
+    IBOutlet NSButton* dimOnlyText;
+    BOOL defaultDimOnlyText;
+
     // Window border
     IBOutlet NSButton* showWindowBorder;
     BOOL defaultShowWindowBorder;
@@ -507,6 +511,7 @@ typedef enum { BulkCopyColors, BulkCopyDisplay, BulkCopyWindow, BulkCopyTerminal
 - (BOOL)lionStyleFullscreen;
 - (BOOL)dimInactiveSplitPanes;
 - (BOOL)dimBackgroundWindows;
+- (BOOL)dimOnlyText;
 - (BOOL)checkTestRelease;
 - (BOOL)legacySmartCursorColor;
 - (float)legacyMinimumContrast;

PTYSession.m

@@ -317,6 +317,7 @@ static NSString* SESSION_ARRANGEMENT_WORKING_DIRECTORY = @"Working Directory";
     [WRAPPER setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
     TEXTVIEW = [[PTYTextView alloc] initWithFrame: NSMakeRect(0, VMARGIN, aSize.width, aSize.height)];
+    [TEXTVIEW setDimOnlyText:[[PreferencePanel sharedInstance] dimOnlyText]];
     [TEXTVIEW setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
     [TEXTVIEW setFont:[ITAddressBookMgr fontWithDesc:[addressBookEntry objectForKey:KEY_NORMAL_FONT]]
                nafont:[ITAddressBookMgr fontWithDesc:[addressBookEntry objectForKey:KEY_NON_ASCII_FONT]]

PTYTextView.m

@@ -377,6 +377,12 @@ static CGFloat PerceivedBrightness(CGFloat r, CGFloat g, CGFloat b) {
     cursorType_ = value;
 }
+- (void)setDimOnlyText:(BOOL)value
+{
+    dimOnlyText_ = value;
+    [[self superview] setNeedsDisplay:YES];
+}
+
 - (NSDictionary*)markedTextAttributes
 {
     return markedTextAttributes;
@@ -432,6 +438,7 @@ static CGFloat PerceivedBrightness(CGFloat r, CGFloat g, CGFloat b) {
     defaultBGColor = color;
     PTYScroller *scroller = (PTYScroller*)[[[dataSource session] SCROLLVIEW] verticalScroller];
     BOOL isDark = ([self _perceivedBrightness:color] < kBackgroundConsideredDarkThreshold);
+    backgroundBrightness_ = PerceivedBrightness([color redComponent], [color greenComponent], [color blueComponent]);
     [scroller setHasDarkBackground:isDark];
     [self setNeedsDisplay:YES];
 }
@@ -562,17 +569,31 @@ static CGFloat PerceivedBrightness(CGFloat r, CGFloat g, CGFloat b) {
     // Find a linear interpolation between kCenter and the requested color component
     // in proportion to 1- dimmingAmount_.
-    const double kCenter = 0.5;
-    return [NSColor colorWithCalibratedRed:(1 - dimmingAmount_) * r + dimmingAmount_ * kCenter
-                                     green:(1 - dimmingAmount_) * g + dimmingAmount_ * kCenter
-                                      blue:(1 - dimmingAmount_) * b + dimmingAmount_ * kCenter
-                                     alpha:[orig alphaComponent]];
+    if (!dimOnlyText_) {
+        const double kCenter = 0.5;
+        return [NSColor colorWithCalibratedRed:(1 - dimmingAmount_) * r + dimmingAmount_ * kCenter
+                                         green:(1 - dimmingAmount_) * g + dimmingAmount_ * kCenter
+                                          blue:(1 - dimmingAmount_) * b + dimmingAmount_ * kCenter
+                                         alpha:[orig alphaComponent]];
+    } else {
+        return [NSColor colorWithCalibratedRed:(1 - dimmingAmount_) * r + dimmingAmount_ * backgroundBrightness_
+                                         green:(1 - dimmingAmount_) * g + dimmingAmount_ * backgroundBrightness_
+                                          blue:(1 - dimmingAmount_) * b + dimmingAmount_ * backgroundBrightness_
+                                         alpha:[orig alphaComponent]];
+    }
 }
-- (NSColor*)colorForCode:(int)theIndex alternateSemantics:(BOOL)alt bold:(BOOL)isBold
+- (NSColor*)colorForCode:(int)theIndex alternateSemantics:(BOOL)alt bold:(BOOL)isBold isBackground:(BOOL)isBackground
 {
-    return [self _dimmedColorFrom:[self _colorForCode:theIndex alternateSemantics:alt bold:isBold]];
+    NSColor *theColor = [self _colorForCode:theIndex
+                         alternateSemantics:alt
+                                       bold:isBold];
+    if (isBackground && dimOnlyText_) {
+        return theColor;
+    } else {
+        return [self _dimmedColorFrom:theColor];
+    }
 }
 - (NSColor *)selectionColor
@@ -4069,7 +4090,11 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
         if (!hasBGImage && ![self useTransparency]) {
             alpha = 1;
         }
-        [[self _dimmedColorFrom:[[self defaultBGColor] colorWithAlphaComponent:alpha]] set];
+        if (!dimOnlyText_) {
+            [[self _dimmedColorFrom:[[self defaultBGColor] colorWithAlphaComponent:alpha]] set];
+        } else {
+            [[[self defaultBGColor] colorWithAlphaComponent:alpha] set];
+        }
         NSRect fillDest = bgRect;
         fillDest.origin.y += fillDest.size.height;
         NSRectFillUsingOperation(fillDest,
@@ -4092,7 +4117,11 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
         if (!hasBGImage && ![self useTransparency]) {
             alpha = 1;
         }
-        [[self _dimmedColorFrom:[[self defaultBGColor] colorWithAlphaComponent:alpha]] set];
+        if (!dimOnlyText_) {
+            [[self _dimmedColorFrom:[[self defaultBGColor] colorWithAlphaComponent:alpha]] set];
+        } else {
+            [[[self defaultBGColor] colorWithAlphaComponent:alpha] set];
+        }
         NSRectFillUsingOperation(bgRect,
                                  hasBGImage ? NSCompositeSourceOver : NSCompositeCopy);
     }
@@ -4112,7 +4141,11 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
         if (!hasBGImage && ![self useTransparency]) {
             alpha = 1;
         }
-        [[self _dimmedColorFrom:[[self defaultBGColor] colorWithAlphaComponent:alpha]] set];
+        if (!dimOnlyText_) {
+            [[self _dimmedColorFrom:[[self defaultBGColor] colorWithAlphaComponent:alpha]] set];
+        } else {
+            [[[self defaultBGColor] colorWithAlphaComponent:alpha] set];
+        }
         NSRectFillUsingOperation(bgRect, hasBGImage?NSCompositeSourceOver:NSCompositeCopy);
     }
 }
@@ -4670,13 +4703,18 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
                 theLine[i].alternateForegroundSemantics &&
                 theLine[i].foregroundColor == ALTSEM_FG_DEFAULT) {
                 // Has default foreground color so use background color.
-                thisCharColor = [self _dimmedColorFrom:defaultBGColor];
+                if (!dimOnlyText_) {
+                    thisCharColor = [self _dimmedColorFrom:defaultBGColor];
+                } else {
+                    thisCharColor = defaultBGColor;
+                }
             } else {
                 // Not reversed or not subject to reversing (only default
                 // foreground color is drawn in reverse video).
                 thisCharColor = [self colorForCode:theLine[i].foregroundColor
                                 alternateSemantics:theLine[i].alternateForegroundSemantics
-                                              bold:theLine[i].bold];
+                                              bold:theLine[i].bold
+                                      isBackground:NO];
             }
         }
@@ -5030,7 +5068,8 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
     aColor = [self colorForCode:ALTSEM_BG_DEFAULT
              alternateSemantics:YES
-                           bold:NO];
+                           bold:NO
+                   isBackground:YES];
     aColor = [aColor colorWithAlphaComponent:selectedAlpha];
     [aColor set];
@@ -5173,12 +5212,14 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
                         // color chars.
                         aColor = [self colorForCode:ALTSEM_FG_DEFAULT
                                  alternateSemantics:YES
-                                               bold:NO];
+                                               bold:NO
+                                       isBackground:NO];
                     } else {
                         // Use the regular background color.
                         aColor = [self colorForCode:bgColor
                                  alternateSemantics:bgAlt
-                                               bold:NO];
+                                               bold:NO
+                                       isBackground:(bgColor == ALTSEM_BG_DEFAULT)];
                     }
                 }
                 aColor = [aColor colorWithAlphaComponent:alphaIfTransparencyInUse];
@@ -5194,7 +5235,8 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
                 // default background color. But don't blend in the bg color if transparency is on.
                 aColor = [self colorForCode:ALTSEM_BG_DEFAULT
                          alternateSemantics:YES
-                                       bold:NO];
+                                       bold:NO
+                               isBackground:YES];
                 aColor = [aColor colorWithAlphaComponent:selectedAlpha];
                 [aColor set];
                 if (![self useTransparency]) {
@@ -5275,7 +5317,8 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
         } else {
             [[self colorForCode:fgColor
                alternateSemantics:fgAlt
-                           bold:fgBold] set];
+                           bold:fgBold
+                   isBackground:NO] set];
         }
         NSRectFill(NSMakeRect(X,
@@ -5385,7 +5428,11 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
                                   y,
                                   charsInLine * charWidth,
                                   lineHeight);
-            [[self _dimmedColorFrom:defaultBGColor] set];
+            if (!dimOnlyText_) {
+                [[self _dimmedColorFrom:defaultBGColor] set];
+            } else {
+                [defaultBGColor set];
+            }
             NSRectFill(r);
             // Draw the characters.
@@ -5483,10 +5530,16 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
 {
     if ([[dataSource terminal] screenMode]) {
         // reversed
-        return [self colorForCode:c.foregroundColor alternateSemantics:c.alternateForegroundSemantics bold:c.bold];
+        return [self colorForCode:c.foregroundColor
+               alternateSemantics:c.alternateForegroundSemantics
+                             bold:c.bold
+                     isBackground:YES];
     } else {
         // normal
-        return [self colorForCode:c.backgroundColor alternateSemantics:c.alternateBackgroundSemantics bold:false];
+        return [self colorForCode:c.backgroundColor
+               alternateSemantics:c.alternateBackgroundSemantics
+                             bold:false
+                     isBackground:YES];
     }
 }
@@ -5627,12 +5680,14 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
                 if (reversed) {
                     bgColor = [self colorForCode:screenChar.backgroundColor
                               alternateSemantics:screenChar.alternateBackgroundSemantics
-                                            bold:screenChar.bold];
+                                            bold:screenChar.bold
+                                    isBackground:NO];
                     bgColor = [bgColor colorWithAlphaComponent:alpha];
                 } else {
                     bgColor = [self colorForCode:screenChar.foregroundColor
                               alternateSemantics:screenChar.alternateForegroundSemantics
-                                            bold:screenChar.bold];
+                                            bold:screenChar.bold
+                                    isBackground:NO];
                     bgColor = [bgColor colorWithAlphaComponent:alpha];
                 }
@@ -5714,7 +5769,8 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
                             // Ensure text has enough contrast by making it black/white if the char's color would be close to the cursor bg.
                             NSColor* proposedForeground = [[self colorForCode:fgColor
                                                            alternateSemantics:fgAlt
-                                                                         bold:screenChar.bold] colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+                                                                         bold:screenChar.bold
+                                                                 isBackground:NO] colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
                             CGFloat fgBrightness = [self _perceivedBrightness:proposedForeground];
                             CGFloat bgBrightness = [self _perceivedBrightness:[bgColor colorUsingColorSpaceName:NSCalibratedRGBColorSpace]];
                             NSColor* overrideColor = nil;
@@ -6441,6 +6497,8 @@ static bool IsUrlChar(NSString* str)
     advancedFontRendering = [[PreferencePanel sharedInstance] advancedFontRendering];
     strokeThickness = [[PreferencePanel sharedInstance] strokeThickness];
     [self setNeedsDisplay:YES];
+    [self setDimOnlyText:[[PreferencePanel sharedInstance] dimOnlyText]];
+
 }
 - (void)_modifyFont:(NSFont*)font baseline:(double)baseline into:(PTYFontInfo*)fontInfo

PreferencePanel.m

@@ -916,6 +916,7 @@ static float versionNumber;
     defaultCheckTestRelease = [prefs objectForKey:@"CheckTestRelease"]?[[prefs objectForKey:@"CheckTestRelease"] boolValue]: YES;
     defaultDimInactiveSplitPanes = [prefs objectForKey:@"DimInactiveSplitPanes"]?[[prefs objectForKey:@"DimInactiveSplitPanes"] boolValue]: YES;
     defaultDimBackgroundWindows = [prefs objectForKey:@"DimBackgroundWindows"]?[[prefs objectForKey:@"DimBackgroundWindows"] boolValue]: NO;
+    defaultDimOnlyText = [prefs objectForKey:@"DimOnlyText"]?[[prefs objectForKey:@"DimOnlyText"] boolValue]: NO;
     defaultShowWindowBorder = [[prefs objectForKey:@"UseBorder"] boolValue];
     defaultLionStyleFullscreen = [prefs objectForKey:@"UseLionStyleFullscreen"] ? [[prefs objectForKey:@"UseLionStyleFullscreen"] boolValue] : YES;
@@ -1046,6 +1047,7 @@ static float versionNumber;
     [prefs setBool:defaultCheckTestRelease forKey:@"CheckTestRelease"];
     [prefs setBool:defaultDimInactiveSplitPanes forKey:@"DimInactiveSplitPanes"];
     [prefs setBool:defaultDimBackgroundWindows forKey:@"DimBackgroundWindows"];
+    [prefs setBool:defaultDimOnlyText forKey:@"DimOnlyText"];
     [prefs setBool:defaultShowWindowBorder forKey:@"UseBorder"];
     [prefs setBool:defaultLionStyleFullscreen forKey:@"UseLionStyleFullscreen"];
@@ -1139,6 +1141,7 @@ static float versionNumber;
     [checkTestRelease setState:defaultCheckTestRelease?NSOnState:NSOffState];
     [dimInactiveSplitPanes setState:defaultDimInactiveSplitPanes?NSOnState:NSOffState];
     [dimBackgroundWindows setState:defaultDimBackgroundWindows?NSOnState:NSOffState];
+    [dimOnlyText setState:defaultDimOnlyText?NSOnState:NSOffState];
     [showWindowBorder setState:defaultShowWindowBorder?NSOnState:NSOffState];
     [lionStyleFullscreen setState:defaultLionStyleFullscreen?NSOnState:NSOffState];
@@ -1251,6 +1254,7 @@ static float versionNumber;
         sender == strokeThickness ||
         sender == dimInactiveSplitPanes ||
         sender == dimBackgroundWindows ||
+        sender == dimOnlyText ||
         sender == showWindowBorder) {
         defaultWindowStyle = [windowStyle indexOfSelectedItem];
         defaultTabViewType=[tabPosition indexOfSelectedItem];
@@ -1265,6 +1269,7 @@ static float versionNumber;
         defaultHideTab = ([hideTab state] == NSOnState);
         defaultDimInactiveSplitPanes = ([dimInactiveSplitPanes state] == NSOnState);
         defaultDimBackgroundWindows = ([dimBackgroundWindows state] == NSOnState);
+        defaultDimOnlyText = ([dimOnlyText state] == NSOnState);
         defaultShowWindowBorder = ([showWindowBorder state] == NSOnState);
         defaultHideScrollbar = ([hideScrollbar state] == NSOnState);
         [[NSNotificationCenter defaultCenter] postNotificationName:@"iTermRefreshTerminal"
@@ -1684,6 +1689,11 @@ static float versionNumber;
     return defaultDimBackgroundWindows;
 }
+- (BOOL)dimOnlyText
+{
+    return defaultDimOnlyText;
+}
+
 - (BOOL)showWindowBorder
 {
     return defaultShowWindowBorder;

PseudoTerminal.m

@@ -2990,6 +2990,7 @@ NSString *sessionsKey = @"sessions";
             } else {
                 [[aSession view] setDimmed:NO];
             }
+            [[aSession view] setBackgroundDimmed:![[self window] isKeyWindow]];
         }
     }
 }

SessionView.h

@@ -60,5 +60,6 @@
 - (int)viewId;
 - (void)setViewId:(int)id;
 - (void)setBackgroundDimmed:(BOOL)backgroundDimmed;
+- (BOOL)backgroundDimmed;
 @end

SessionView.m

@@ -149,14 +149,19 @@ static NSDate* lastResizeDate_;
 - (double)dimmedDimmingAmount
 {
     NSNumber* n = [[NSUserDefaults standardUserDefaults] objectForKey:@"SplitPaneDimmingAmount"];
-    return n ? [n doubleValue] : 0.15;
+    return n ? [n doubleValue] : 0.4;
 }
 - (void)_updateDim
 {
-    double amount = 0;
-    if (dim_) amount += [self dimmedDimmingAmount];
-    if (backgroundDimmed_) amount += [self dimmedDimmingAmount];
+    double x= 0;
+    if (dim_) x += 1;
+    if (backgroundDimmed_) x += 1;
+    // 0 -> 0
+    // 1 -> dimmedDimmingAmount
+    // 2 -> 4/3 * dimmedDimmingAmount
+    double amount = (1 - 1 / (1 + x)) * [self dimmedDimmingAmount] * 2;
+
     [self _dimShadeToDimmingAmount:amount];
 }
@@ -174,12 +179,22 @@ static NSDate* lastResizeDate_;
 - (void)setBackgroundDimmed:(BOOL)backgroundDimmed
 {
+    BOOL orig = backgroundDimmed_;
     if ([[PreferencePanel sharedInstance] dimBackgroundWindows]) {
         backgroundDimmed_ = backgroundDimmed;
+    } else {
+        backgroundDimmed_ = NO;
+    }
+    if (backgroundDimmed_ != orig) {
         [self _updateDim];
     }
 }
+- (BOOL)backgroundDimmed
+{
+    return backgroundDimmed_;
+}
+
 - (void)cancelTimers
 {
     shuttingDown_ = YES;