Skip to content
Snippets Groups Projects
Commit 7d311093 authored by George Nachman's avatar George Nachman
Browse files

Merge branch 'master' of https://github.com/gnachman/iTerm2

parents d96bf6b7 3fdd9527
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 905 additions and 118 deletions
English.lproj/PreferencePanel.xib
+ 607
− 62
View file @ 7d311093
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="4440"/>
<integer value="4910"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -939,14 +939,14 @@
<object class="NSTabViewItem" id="75732044">
<string key="NSIdentifier">Item 4</string>
<object class="NSView" key="NSView" id="1019983678">
<reference key="NSNextResponder" ref="415305200"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSButton" id="903914481">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{271, 231}, {263, 18}}</string>
<string key="NSFrame">{{106, 231}, {263, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="214904959">
@@ -968,7 +968,7 @@
<object class="NSButton" id="883602149">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{271, 271}, {272, 18}}</string>
<string key="NSFrame">{{106, 271}, {272, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="964833048">
@@ -990,7 +990,7 @@
<object class="NSPopUpButton" id="1068266246">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{361, 291}, {103, 26}}</string>
<string key="NSFrame">{{196, 291}, {103, 26}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="23619858">
@@ -1061,7 +1061,7 @@
<object class="NSPopUpButton" id="648902570">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{361, 321}, {103, 26}}</string>
<string key="NSFrame">{{196, 321}, {103, 26}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="2528">
@@ -1142,7 +1142,7 @@
<object class="NSTextField" id="784241984">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{272, 323}, {87, 19}}</string>
<string key="NSFrame">{{107, 323}, {87, 19}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="115997311">
@@ -1158,7 +1158,7 @@
<object class="NSTextField" id="816747508">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{260, 295}, {99, 19}}</string>
<string key="NSFrame">{{95, 295}, {99, 19}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="912508549">
@@ -1174,7 +1174,7 @@
<object class="NSTextField" id="890594965">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{270, 346}, {140, 17}}</string>
<string key="NSFrame">{{105, 346}, {140, 17}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="92798197">
@@ -1190,7 +1190,7 @@
<object class="NSButton" id="324725675">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{271, 251}, {214, 18}}</string>
<string key="NSFrame">{{106, 251}, {214, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="267635134">
@@ -1212,7 +1212,7 @@
<object class="NSButton" id="840263255">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{273, 163}, {205, 18}}</string>
<string key="NSFrame">{{429, 322}, {205, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="438110045">
@@ -1234,7 +1234,7 @@
<object class="NSButton" id="906654666">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{273, 143}, {213, 18}}</string>
<string key="NSFrame">{{429, 302}, {213, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="871545830">
@@ -1256,7 +1256,7 @@
<object class="NSButton" id="364295538">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{273, 123}, {264, 18}}</string>
<string key="NSFrame">{{429, 282}, {264, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="2626113">
@@ -1278,7 +1278,7 @@
<object class="NSTextField" id="212605291">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{272, 187}, {153, 17}}</string>
<string key="NSFrame">{{428, 346}, {153, 17}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="463064438">
@@ -1294,7 +1294,7 @@
<object class="NSButton" id="219255988">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{273, 38}, {178, 18}}</string>
<string key="NSFrame">{{108, 99}, {178, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="893276983">
@@ -1313,10 +1313,54 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="140624317">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{108, 79}, {186, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="592396050">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Dim background windows</string>
<reference key="NSSupport" ref="966507434"/>
<reference key="NSControlView" ref="140624317"/>
<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="1021432808">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{108, 164}, {298, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="667043283">
<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="1021432808"/>
<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>
<string key="NSFrame">{{273, 58}, {228, 18}}</string>
<string key="NSFrame">{{429, 206}, {228, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="53143667">
@@ -1338,7 +1382,7 @@
<object class="NSButton" id="253372206">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{273, 18}, {228, 18}}</string>
<string key="NSFrame">{{429, 186}, {228, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="651640814">
@@ -1360,22 +1404,110 @@
<object class="NSTextField" id="42775949">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{272, 82}, {54, 17}}</string>
<string key="NSFrame">{{107, 188}, {66, 17}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="685288966">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Display</string>
<string key="NSContents">Dimming</string>
<reference key="NSSupport" ref="907832903"/>
<reference key="NSControlView" ref="42775949"/>
<reference key="NSBackgroundColor" ref="303715562"/>
<reference key="NSTextColor" ref="1014689419"/>
</object>
</object>
<object class="NSTextField" id="1041271253">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{428, 230}, {57, 17}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="927506957">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Window</string>
<reference key="NSSupport" ref="907832903"/>
<reference key="NSControlView" ref="1041271253"/>
<reference key="NSBackgroundColor" ref="303715562"/>
<reference key="NSTextColor" ref="1014689419"/>
</object>
</object>
<object class="NSSlider" id="364321727">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{229, 137}, {177, 21}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSliderCell" key="NSCell" id="749728820">
<int key="NSCellFlags">-2079981824</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents"/>
<reference key="NSControlView" ref="364321727"/>
<double key="NSMaxValue">0.59999999999999998</double>
<double key="NSMinValue">0.10000000000000001</double>
<double key="NSValue">0.40000000000000002</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
<bool key="NSAllowsTickMarkValuesOnly">NO</bool>
<bool key="NSVertical">NO</bool>
</object>
</object>
<object class="NSTextField" id="795654564">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{107, 141}, {119, 17}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="357810368">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Dimming amount:</string>
<reference key="NSSupport" ref="966507434"/>
<reference key="NSControlView" ref="795654564"/>
<reference key="NSBackgroundColor" ref="303715562"/>
<reference key="NSTextColor" ref="1014689419"/>
</object>
</object>
<object class="NSTextField" id="874344225">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{228, 125}, {43, 11}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="740864788">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Minimal</string>
<object class="NSFont" key="NSSupport" id="288154494">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">9</double>
<int key="NSfFlags">16</int>
</object>
<reference key="NSControlView" ref="874344225"/>
<reference key="NSBackgroundColor" ref="303715562"/>
<reference key="NSTextColor" ref="1014689419"/>
</object>
</object>
<object class="NSTextField" id="798848490">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{363, 125}, {44, 11}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="254411488">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Very Dim</string>
<reference key="NSSupport" ref="288154494"/>
<reference key="NSControlView" ref="798848490"/>
<reference key="NSBackgroundColor" ref="303715562"/>
<reference key="NSTextColor" ref="1014689419"/>
</object>
</object>
</object>
<string key="NSFrameSize">{767, 383}</string>
<reference key="NSSuperview" ref="415305200"/>
</object>
<string key="NSLabel">Item 4</string>
<reference key="NSColor" ref="303715562"/>
@@ -1384,7 +1516,7 @@
<object class="NSTabViewItem" id="745611275">
<string key="NSIdentifier">2</string>
<object class="NSView" key="NSView" id="105539794">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder" ref="415305200"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3454,11 +3586,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Low</string>
<object class="NSFont" key="NSSupport" id="288154494">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">9</double>
<int key="NSfFlags">16</int>
</object>
<reference key="NSSupport" ref="288154494"/>
<reference key="NSControlView" ref="309125475"/>
<reference key="NSBackgroundColor" ref="303715562"/>
<reference key="NSTextColor" ref="1014689419"/>
@@ -3938,7 +4066,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTabViewItem" id="262523333">
<string key="NSIdentifier">Item 5</string>
<object class="NSView" key="NSView" id="678134053">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder" ref="551361709"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -4461,7 +4589,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="839791606">
<reference key="NSNextResponder" ref="678134053"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{254, 213}, {144, 18}}</string>
<string key="NSFrame">{{254, 171}, {144, 18}}</string>
<reference key="NSSuperview" ref="678134053"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="701158242">
@@ -4494,7 +4622,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>NeXT TIFF v4.0 pasteboard type</string>
</object>
</object>
<string key="NSFrame">{{270, 129}, {126, 81}}</string>
<string key="NSFrame">{{270, 87}, {126, 81}}</string>
<reference key="NSSuperview" ref="678134053"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="292498994">
@@ -4532,7 +4660,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButtonCell" key="NSCell" id="937491890">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Blur</string>
<string key="NSContents">Blur:</string>
<reference key="NSSupport" ref="966507434"/>
<reference key="NSControlView" ref="280552565"/>
<int key="NSButtonFlags">1211912703</int>
@@ -4614,10 +4742,63 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="NSTextColor" ref="1014689419"/>
</object>
</object>
<object class="NSSlider" id="684174978">
<reference key="NSNextResponder" ref="678134053"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{271, 210}, {124, 21}}</string>
<reference key="NSSuperview" ref="678134053"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSliderCell" key="NSCell" id="1023120314">
<int key="NSCellFlags">67501824</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents"/>
<reference key="NSControlView" ref="684174978"/>
<double key="NSMaxValue">10</double>
<double key="NSMinValue">0.10000000000000001</double>
<double key="NSValue">0.10000000000000001</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">0</int>
<bool key="NSAllowsTickMarkValuesOnly">NO</bool>
<bool key="NSVertical">NO</bool>
</object>
</object>
<object class="NSTextField" id="1021492145">
<reference key="NSNextResponder" ref="678134053"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{270, 195}, {60, 11}}</string>
<reference key="NSSuperview" ref="678134053"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="980554129">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Small Radius</string>
<reference key="NSSupport" ref="288154494"/>
<reference key="NSControlView" ref="1021492145"/>
<reference key="NSBackgroundColor" ref="303715562"/>
<reference key="NSTextColor" ref="1014689419"/>
</object>
</object>
<object class="NSTextField" id="230348847">
<reference key="NSNextResponder" ref="678134053"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{338, 195}, {61, 11}}</string>
<reference key="NSSuperview" ref="678134053"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="588607947">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Large Radius</string>
<reference key="NSSupport" ref="288154494"/>
<reference key="NSControlView" ref="230348847"/>
<reference key="NSBackgroundColor" ref="303715562"/>
<reference key="NSTextColor" ref="1014689419"/>
</object>
</object>
<object class="NSButton" id="3387311">
<reference key="NSNextResponder" ref="678134053"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17, 48}, {299, 18}}</string>
<string key="NSFrame">{{17, 18}, {299, 18}}</string>
<reference key="NSSuperview" ref="678134053"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1021914130">
@@ -4638,7 +4819,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="316238356">
<reference key="NSNextResponder" ref="678134053"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17, 68}, {418, 18}}</string>
<string key="NSFrame">{{17, 38}, {418, 18}}</string>
<reference key="NSSuperview" ref="678134053"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="575952701">
@@ -4659,7 +4840,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="568040808">
<reference key="NSNextResponder" ref="678134053"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{14, 92}, {146, 20}}</string>
<string key="NSFrame">{{14, 62}, {146, 20}}</string>
<reference key="NSSuperview" ref="678134053"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="466821490">
@@ -4674,6 +4855,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<string key="NSFrame">{{10, 33}, {433, 353}}</string>
<reference key="NSSuperview" ref="551361709"/>
</object>
<string key="NSLabel">Window</string>
<reference key="NSColor" ref="303715562"/>
@@ -5318,7 +5500,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTabViewItem" id="457157559">
<string key="NSIdentifier">Item 3</string>
<object class="NSView" key="NSView" id="192458284">
<reference key="NSNextResponder" ref="551361709"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -5485,6 +5667,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="NSHScroller" ref="812569577"/>
<reference key="NSContentView" ref="97511335"/>
<reference key="NSHeaderClipView" ref="93498484"/>
<reference key="NSCornerView" ref="905967772"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
</object>
<object class="NSButton" id="981472994">
@@ -5823,21 +6006,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<string key="NSFrame">{{10, 33}, {433, 353}}</string>
<reference key="NSSuperview" ref="551361709"/>
</object>
<string key="NSLabel">Keys</string>
<reference key="NSColor" ref="303715562"/>
<reference key="NSTabView" ref="551361709"/>
</object>
</object>
<reference key="NSSelectedTabViewItem" ref="457157559"/>
<reference key="NSSelectedTabViewItem" ref="262523333"/>
<reference key="NSFont" ref="966507434"/>
<int key="NSTvFlags">0</int>
<bool key="NSAllowTruncatedLabels">YES</bool>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="192458284"/>
<reference ref="678134053"/>
</object>
</object>
<object class="NSButton" id="1072403251">
@@ -5968,6 +6150,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<string key="NSFrameSize">{767, 383}</string>
<reference key="NSSuperview" ref="415305200"/>
</object>
<string key="NSLabel">Bookmarks</string>
<reference key="NSColor" ref="303715562"/>
@@ -7174,14 +7357,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="NSTabView" ref="415305200"/>
</object>
</object>
<reference key="NSSelectedTabViewItem" ref="75732044"/>
<reference key="NSSelectedTabViewItem" ref="745611275"/>
<reference key="NSFont" ref="966507434"/>
<int key="NSTvFlags">6</int>
<bool key="NSAllowTruncatedLabels">YES</bool>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1019983678"/>
<reference ref="105539794"/>
</object>
</object>
</object>
@@ -11174,14 +11357,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">5207</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="219255988"/>
<reference key="destination" ref="253372206"/>
</object>
<int key="connectionID">5208</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">initialFirstResponder</string>
@@ -11614,14 +11789,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">5265</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="280552565"/>
<reference key="destination" ref="839791606"/>
</object>
<int key="connectionID">5266</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
@@ -11966,13 +12133,133 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">5323</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">settingChanged:</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="140624317"/>
</object>
<int key="connectionID">5327</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">dimBackgroundWindows</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="140624317"/>
</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="1021432808"/>
</object>
<int key="connectionID">5332</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">dimOnlyText</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="1021432808"/>
</object>
<int key="connectionID">5334</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">dimmingAmount</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="364321727"/>
</object>
<int key="connectionID">5345</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">settingChanged:</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="364321727"/>
</object>
<int key="connectionID">5346</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="903914481"/>
<reference key="destination" ref="1021432808"/>
</object>
<int key="connectionID">5347</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="1021432808"/>
<reference key="destination" ref="364321727"/>
</object>
<int key="connectionID">5348</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="364321727"/>
<reference key="destination" ref="219255988"/>
</object>
<int key="connectionID">5349</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="219255988"/>
<reference key="destination" ref="140624317"/>
</object>
<int key="connectionID">5350</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="140624317"/>
<reference key="destination" ref="840263255"/>
</object>
<int key="connectionID">5324</int>
<int key="connectionID">5351</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="253372206"/>
<reference key="destination" ref="648902570"/>
</object>
<int key="connectionID">5352</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">bookmarkSettingChanged:</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="684174978"/>
</object>
<int key="connectionID">5370</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">blurRadius</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="684174978"/>
</object>
<int key="connectionID">5371</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="280552565"/>
<reference key="destination" ref="684174978"/>
</object>
<int key="connectionID">5372</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="684174978"/>
<reference key="destination" ref="839791606"/>
</object>
<int key="connectionID">5373</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -15113,10 +15400,17 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="906654666"/>
<reference ref="364295538"/>
<reference ref="212605291"/>
<reference ref="219255988"/>
<reference ref="1041271253"/>
<reference ref="1009965154"/>
<reference ref="253372206"/>
<reference ref="42775949"/>
<reference ref="219255988"/>
<reference ref="140624317"/>
<reference ref="1021432808"/>
<reference ref="795654564"/>
<reference ref="364321727"/>
<reference ref="874344225"/>
<reference ref="798848490"/>
</object>
<reference key="parent" ref="75732044"/>
</object>
@@ -16051,6 +16345,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="3387311"/>
<reference ref="316238356"/>
<reference ref="568040808"/>
<reference ref="684174978"/>
<reference ref="1021492145"/>
<reference ref="230348847"/>
</object>
<reference key="parent" ref="262523333"/>
</object>
@@ -17111,6 +17408,146 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="313793810"/>
<reference key="parent" ref="745399334"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5325</int>
<reference key="object" ref="140624317"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="592396050"/>
</object>
<reference key="parent" ref="1019983678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5326</int>
<reference key="object" ref="592396050"/>
<reference key="parent" ref="140624317"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5330</int>
<reference key="object" ref="1021432808"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="667043283"/>
</object>
<reference key="parent" ref="1019983678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5331</int>
<reference key="object" ref="667043283"/>
<reference key="parent" ref="1021432808"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5335</int>
<reference key="object" ref="1041271253"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="927506957"/>
</object>
<reference key="parent" ref="1019983678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5336</int>
<reference key="object" ref="927506957"/>
<reference key="parent" ref="1041271253"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5337</int>
<reference key="object" ref="364321727"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="749728820"/>
</object>
<reference key="parent" ref="1019983678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5338</int>
<reference key="object" ref="749728820"/>
<reference key="parent" ref="364321727"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5339</int>
<reference key="object" ref="795654564"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="357810368"/>
</object>
<reference key="parent" ref="1019983678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5340</int>
<reference key="object" ref="357810368"/>
<reference key="parent" ref="795654564"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5341</int>
<reference key="object" ref="874344225"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="740864788"/>
</object>
<reference key="parent" ref="1019983678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5342</int>
<reference key="object" ref="740864788"/>
<reference key="parent" ref="874344225"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5343</int>
<reference key="object" ref="798848490"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="254411488"/>
</object>
<reference key="parent" ref="1019983678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5344</int>
<reference key="object" ref="254411488"/>
<reference key="parent" ref="798848490"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5363</int>
<reference key="object" ref="684174978"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1023120314"/>
</object>
<reference key="parent" ref="678134053"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5364</int>
<reference key="object" ref="1021492145"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="980554129"/>
</object>
<reference key="parent" ref="678134053"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5365</int>
<reference key="object" ref="230348847"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="588607947"/>
</object>
<reference key="parent" ref="678134053"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5366</int>
<reference key="object" ref="588607947"/>
<reference key="parent" ref="230348847"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5367</int>
<reference key="object" ref="980554129"/>
<reference key="parent" ref="1021492145"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5368</int>
<reference key="object" ref="1023120314"/>
<reference key="parent" ref="684174978"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -18025,8 +18462,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>4977.IBPluginDependency</string>
<string>4977.ImportedFromIB2</string>
<string>4978.IBPluginDependency</string>
<string>4978.IBViewBoundsToFrameTransform</string>
<string>4979.IBPluginDependency</string>
<string>4979.IBViewBoundsToFrameTransform</string>
<string>4980.IBPluginDependency</string>
<string>4980.IBViewBoundsToFrameTransform</string>
<string>4981.IBPluginDependency</string>
<string>4982.IBPluginDependency</string>
<string>4983.IBPluginDependency</string>
@@ -18168,6 +18608,33 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>5319.IBViewBoundsToFrameTransform</string>
<string>5319.ImportedFromIB2</string>
<string>5320.IBPluginDependency</string>
<string>5325.IBPluginDependency</string>
<string>5325.IBViewBoundsToFrameTransform</string>
<string>5326.IBPluginDependency</string>
<string>5330.IBPluginDependency</string>
<string>5330.IBViewBoundsToFrameTransform</string>
<string>5331.IBPluginDependency</string>
<string>5335.IBPluginDependency</string>
<string>5335.IBViewBoundsToFrameTransform</string>
<string>5336.IBPluginDependency</string>
<string>5337.IBPluginDependency</string>
<string>5337.IBViewBoundsToFrameTransform</string>
<string>5338.IBPluginDependency</string>
<string>5339.IBPluginDependency</string>
<string>5339.IBViewBoundsToFrameTransform</string>
<string>5340.IBPluginDependency</string>
<string>5341.IBPluginDependency</string>
<string>5341.IBViewBoundsToFrameTransform</string>
<string>5342.IBPluginDependency</string>
<string>5343.IBPluginDependency</string>
<string>5343.IBViewBoundsToFrameTransform</string>
<string>5344.IBPluginDependency</string>
<string>5363.IBPluginDependency</string>
<string>5364.IBPluginDependency</string>
<string>5365.IBPluginDependency</string>
<string>5366.IBPluginDependency</string>
<string>5367.IBPluginDependency</string>
<string>5368.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -19087,16 +19554,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABD2AAAw1UAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABDjYAAwxoAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABD2AAAw2kAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABDjYAAwy4AAA</bytes>
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABD14AAw4AAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABDjQAAw0UAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -19257,8 +19724,17 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDh4AAw5KAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDhwAAw4YAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDqQAAw4YAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -19411,7 +19887,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABD2AAAw0EAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABDjYAAwrwAAA</bytes>
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -19438,6 +19914,47 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<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+AAABC2AAAwwwAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDj4AAw0AAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDZQAAwxwAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABC1gAAwxwAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDZAAAwwYAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDtYAAwwYAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -19456,7 +19973,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">5324</int>
<int key="maxID">5373</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -19799,6 +20316,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>blinkAllowed</string>
<string>blinkingCursor</string>
<string>blur</string>
<string>blurRadius</string>
<string>boldColor</string>
<string>bookmarkCommand</string>
<string>bookmarkCommandLabel</string>
@@ -19848,7 +20366,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>cursorTextColorLabel</string>
<string>cursorType</string>
<string>deleteSendsCtrlHButton</string>
<string>dimBackgroundWindows</string>
<string>dimInactiveSplitPanes</string>
<string>dimOnlyText</string>
<string>dimmingAmount</string>
<string>disableSmcupRmcup</string>
<string>disableWindowResizing</string>
<string>displayFontAccessoryView</string>
@@ -19995,6 +20516,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>NSButton</string>
<string>NSButton</string>
<string>NSButton</string>
<string>NSSlider</string>
<string>NSColorWell</string>
<string>NSTextField</string>
<string>NSTextField</string>
@@ -20047,6 +20569,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>NSButton</string>
<string>NSButton</string>
<string>NSButton</string>
<string>NSSlider</string>
<string>NSButton</string>
<string>NSButton</string>
<string>NSView</string>
<string>NSSlider</string>
<string>NSSlider</string>
@@ -20194,6 +20719,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>blinkAllowed</string>
<string>blinkingCursor</string>
<string>blur</string>
<string>blurRadius</string>
<string>boldColor</string>
<string>bookmarkCommand</string>
<string>bookmarkCommandLabel</string>
@@ -20243,7 +20769,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>cursorTextColorLabel</string>
<string>cursorType</string>
<string>deleteSendsCtrlHButton</string>
<string>dimBackgroundWindows</string>
<string>dimInactiveSplitPanes</string>
<string>dimOnlyText</string>
<string>dimmingAmount</string>
<string>disableSmcupRmcup</string>
<string>disableWindowResizing</string>
<string>displayFontAccessoryView</string>
@@ -20480,6 +21009,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="name">blur</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">blurRadius</string>
<string key="candidateClassName">NSSlider</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">boldColor</string>
<string key="candidateClassName">NSColorWell</string>
@@ -20676,10 +21209,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="name">deleteSendsCtrlHButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">dimBackgroundWindows</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<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">dimmingAmount</string>
<string key="candidateClassName">NSSlider</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">disableSmcupRmcup</string>
<string key="candidateClassName">NSButton</string>
FakeWindow.h
+ 2
− 1
View file @ 7d311093
@@ -26,6 +26,7 @@
// Changes the session has initiated that will be delayed and performed
// in -[rejoin:].
BOOL hasPendingBlurChange;
double pendingBlurRadius;
BOOL pendingBlur;
BOOL hasPendingClose;
BOOL hasPendingFitWindowToTab;
@@ -55,7 +56,7 @@
- (void)setLabelColor:(NSColor *)color forTabViewItem:tabViewItem;
- (void)setTabColor:(NSColor *)color forTabViewItem:tabViewItem;
- (NSColor*)tabColorForTabViewItem:(NSTabViewItem*)tabViewItem;
- (void)enableBlur;
- (void)enableBlur:(double)radius;
- (void)disableBlur;
- (BOOL)tempTitle;
- (PTYTabView *)tabView;
FakeWindow.m
+ 3
− 2
View file @ 7d311093
@@ -75,7 +75,7 @@
 
if (hasPendingBlurChange) {
if (pendingBlur) {
[aTerm enableBlur];
[aTerm enableBlur:pendingBlurRadius];
} else {
[aTerm disableBlur];
}
@@ -170,9 +170,10 @@
}
}
 
- (void)enableBlur
- (void)enableBlur:(double)radius
{
hasPendingBlurChange = YES;
pendingBlurRadius = radius;
pendingBlur = YES;
}
 
Headers/iTerm/PTYTextView.h
+ 8
− 1
View file @ 7d311093
@@ -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/PTYWindow.h
+ 2
− 1
View file @ 7d311093
@@ -47,6 +47,7 @@
@interface PTYWindow : NSWindow
{
int blurFilter;
double blurRadius_;
BOOL layoutDone;
 
// True if in OS 10.7 fullscreen mode.
@@ -66,7 +67,7 @@
- (void)smartLayout;
- (void)setLayoutDone;
 
- (void)enableBlur;
- (void)enableBlur:(double)radius;
- (void)disableBlur;
 
- (int)screenNumber;
Headers/iTerm/PreferencePanel.h
+ 16
− 0
View file @ 7d311093
@@ -176,6 +176,18 @@ typedef enum { CURSOR_UNDERLINE, CURSOR_VERTICAL, CURSOR_BOX } ITermCursorType;
IBOutlet NSButton* dimInactiveSplitPanes;
BOOL defaultDimInactiveSplitPanes;
 
// Dim background windows
IBOutlet NSButton* dimBackgroundWindows;
BOOL defaultDimBackgroundWindows;
// Dim text (and non-default background colors)
IBOutlet NSButton* dimOnlyText;
BOOL defaultDimOnlyText;
// Dimming amount
IBOutlet NSSlider* dimmingAmount;
float defaultDimmingAmount;
// Window border
IBOutlet NSButton* showWindowBorder;
BOOL defaultShowWindowBorder;
@@ -335,6 +347,7 @@ typedef enum { CURSOR_UNDERLINE, CURSOR_VERTICAL, CURSOR_BOX } ITermCursorType;
IBOutlet NSButton* useBrightBold;
IBOutlet NSSlider *transparency;
IBOutlet NSButton* blur;
IBOutlet NSSlider *blurRadius;
IBOutlet NSButton* asciiAntiAliased;
IBOutlet NSButton* nonasciiAntiAliased;
IBOutlet NSButton* backgroundImage;
@@ -502,6 +515,9 @@ typedef enum { BulkCopyColors, BulkCopyDisplay, BulkCopyWindow, BulkCopyTerminal
- (BOOL)showWindowBorder;
- (BOOL)lionStyleFullscreen;
- (BOOL)dimInactiveSplitPanes;
- (BOOL)dimBackgroundWindows;
- (BOOL)dimOnlyText;
- (float)dimmingAmount;
- (BOOL)checkTestRelease;
- (BOOL)legacySmartCursorColor;
- (float)legacyMinimumContrast;
Headers/iTerm/PseudoTerminal.h
+ 2
− 5
View file @ 7d311093
@@ -338,7 +338,7 @@
- (void)menuForEvent:(NSEvent *)theEvent menu:(NSMenu *)theMenu;
 
// setters
- (void)enableBlur;
- (void)enableBlur:(double)radius;
- (void)disableBlur;
 
// Set the text color for a tab control's name.
@@ -659,6 +659,7 @@
- (void)_drawFullScreenBlackBackground;
 
- (void)hideMenuBar;
- (void)showMenuBar;
 
// This is a half-baked function that tries to parse a command line into a
// command (returned in *cmd) and an array of arguments (returned in *path).
@@ -809,10 +810,6 @@
// Return all sessions in all tabs.
- (NSArray*)allSessions;
 
// Change visiblity of tabBarControl in fullscreen mode.
- (void)showFullScreenTabControl;
- (void)hideFullScreenTabControl;
- (void)_loadFindStringFromSharedPasteboard;
 
- (BOOL)_haveLeftBorder;
Headers/iTerm/iTerm.h
+ 2
− 1
View file @ 7d311093
@@ -36,7 +36,8 @@
#define OSX_TIGERORLATER (floor(NSAppKitVersionNumber) > 743)
#define OSX_LEOPARDORLATER (floor(NSAppKitVersionNumber) > 824)
 
BOOL IsLionOrLater();
BOOL IsLionOrLater(void);
BOOL IsLeopard(void);
 
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
static const int NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7;
Headers/iTerm/iTermController.h
+ 4
− 0
View file @ 7d311093
@@ -56,6 +56,10 @@ BOOL IsLionOrLater(void);
int keyWindowIndexMemo_;
BOOL itermWasActiveWhenHotkeyOpened;
BOOL rollingIn_;
// For restoring previously active app when exiting hotkey window
NSNumber *previouslyActiveAppPID_;
id runningApplicationClass_;
}
 
+ (iTermController*)sharedInstance;
ITAddressBookMgr.h
+ 1
− 0
View file @ 7d311093
@@ -107,6 +107,7 @@
#define KEY_USE_BRIGHT_BOLD @"Use Bright Bold"
#define KEY_TRANSPARENCY @"Transparency"
#define KEY_BLUR @"Blur"
#define KEY_BLUR_RADIUS @"Blur Radius"
#define KEY_ANTI_ALIASING @"Anti Aliasing" // DEPRECATED
#define KEY_ASCII_ANTI_ALIASED @"ASCII Anti Aliased"
#define KEY_NONASCII_ANTI_ALIASED @"Non-ASCII Anti Aliased"
PTYSession.m
+ 11
− 2
View file @ 7d311093
@@ -261,12 +261,12 @@ static NSString* SESSION_ARRANGEMENT_WORKING_DIRECTORY = @"Working Directory";
 
[aSession setPreferencesFromAddressBookEntry:theBookmark];
[[aSession SCREEN] setDisplay:[aSession TEXTVIEW]];
[aSession runCommandWithOldCwd:[arrangement objectForKey:SESSION_ARRANGEMENT_WORKING_DIRECTORY]];
[aSession setName:[theBookmark objectForKey:KEY_NAME]];
if ([[[[theTab realParentWindow] window] title] compare:@"Window"] == NSOrderedSame) {
[[theTab realParentWindow] setWindowTitle];
}
[aSession setTab:theTab];
[aSession runCommandWithOldCwd:[arrangement objectForKey:SESSION_ARRANGEMENT_WORKING_DIRECTORY]];
 
if (needDivorce) {
[aSession divorceAddressBookEntryFromPreferences];
@@ -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]]
@@ -487,8 +488,16 @@ static NSString* SESSION_ARRANGEMENT_WORKING_DIRECTORY = @"Working Directory";
[env setObject:[self encodingName] forKey:@"LC_CTYPE"];
}
 
if ([env objectForKey:PWD_ENVNAME] == nil)
if ([env objectForKey:PWD_ENVNAME] == nil) {
[env setObject:[PWD_ENVVALUE stringByExpandingTildeInPath] forKey:PWD_ENVNAME];
}
PseudoTerminal *pty = [tab_ realParentWindow];
NSString *itermId = [NSString stringWithFormat:@"w%dt%dp%d",
[pty number],
[tab_ realObjectCount] - 1,
[tab_ indexOfSessionView:[self view]]];
[env setObject:itermId forKey:@"ITERM_SESSION_ID"];
 
[SHELL launchWithPath:path
arguments:argv
PTYTab.h
+ 2
− 0
View file @ 7d311093
@@ -104,6 +104,7 @@ static const int MIN_SESSION_COLUMNS = 2;
- (void)setTabViewItem:(NSTabViewItem *)theTabViewItem;
- (void)previousSession;
- (void)nextSession;
- (int)indexOfSessionView:(SessionView*)sessionView;
 
- (void)setLockedSession:(PTYSession*)lockedSession;
- (PTYSession*)activeSession;
@@ -160,6 +161,7 @@ static const int MIN_SESSION_COLUMNS = 2;
- (BOOL)canSplitVertically:(BOOL)isVertical withSize:(NSSize)newSessionSize;
- (NSImage*)image:(BOOL)withSpaceForFrame;
- (bool)blur;
- (double)blurRadius;
- (void)recheckBlur;
 
- (NSSize)_minSessionSize:(SessionView*)sessionView;
PTYTab.m
+ 57
− 1
View file @ 7d311093
@@ -404,6 +404,11 @@ static const BOOL USE_THIN_SPLITTERS = YES;
}
}
 
- (int)indexOfSessionView:(SessionView*)sessionView
{
return [[self sessionViews] indexOfObject:sessionView];
}
- (id<WindowControllerInterface>)parentWindow
{
return parentWindow_;
@@ -705,6 +710,22 @@ static NSString* FormatRect(NSRect r) {
return sessions;
}
 
- (NSArray*)_recursiveSessionViews:(NSMutableArray*)sessionViews
atNode:(NSSplitView*)node
{
for (id subview in [node subviews]) {
if ([subview isKindOfClass:[NSSplitView class]]) {
[self _recursiveSessions:sessionViews atNode:(NSSplitView*)subview];
} else {
SessionView* sessionView = (SessionView*)subview;
if (sessionView) {
[sessionViews addObject:sessionView];
}
}
}
return sessionViews;
}
- (NSArray*)sessions
{
if (idMap_) {
@@ -719,6 +740,20 @@ static NSString* FormatRect(NSRect r) {
}
}
 
- (NSArray*)sessionViews
{
if (idMap_) {
NSArray* sessionViews = [idMap_ allValues];
NSMutableArray* result = [NSMutableArray arrayWithCapacity:[sessionViews count]];
for (SessionView* sessionView in sessionViews) {
[result addObject:sessionView];
}
return result;
} else {
return [self _recursiveSessionViews:[NSMutableArray arrayWithCapacity:1] atNode:root_];
}
}
- (BOOL)allSessionsExited
{
return [[self activeSession] exited];
@@ -1565,13 +1600,32 @@ static NSString* FormatRect(NSRect r) {
return y > n;
}
 
- (double)blurRadius
{
double sum = 0;
double count = 0;
NSArray* sessions = [self sessions];
for (PTYSession* session in sessions) {
if ([[[session addressBookEntry] objectForKey:KEY_BLUR] boolValue]) {
sum += [[session addressBookEntry] objectForKey:KEY_BLUR_RADIUS] ? [[[session addressBookEntry] objectForKey:KEY_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];
[parentWindow_ enableBlur:[self blurRadius]];
} else {
[parentWindow_ disableBlur];
}
@@ -1714,6 +1768,8 @@ static NSString* FormatRect(NSRect r) {
[theTab->tabViewItem_ setLabel:@"Restoring..."];
[newRoot release];
 
[theTab setObjectCount:[term numberOfTabs] + 1];
// Instantiate sessions in the skeleton view tree.
[theTab setActiveSession:[theTab _recursiveRestoreSessions:[arrangement objectForKey:TAB_ARRANGEMENT_ROOT]
atNode:theTab->root_
PTYTextView.m
+ 81
− 23
View file @ 7d311093
@@ -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;
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]];
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
PTYWindow.m
+ 5
− 4
View file @ 7d311093
@@ -80,13 +80,14 @@
}
 
 
- (void)enableBlur
- (void)enableBlur:(double)radius
{
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
// Only works in Leopard (or hopefully later)
if (!OSX_LEOPARDORLATER) return;
 
if (blurFilter) {
const double kEpsilon = 0.001;
if (blurFilter && fabs(blurRadius_ - radius) < kEpsilon) {
return;
}
 
@@ -99,11 +100,11 @@
return;
}
 
// should really set this from options:
NSDictionary *optionsDict = [NSDictionary dictionaryWithObject:[NSNumber numberWithFloat:2.0] forKey:@"inputRadius"];
NSDictionary *optionsDict = [NSDictionary dictionaryWithObject:[NSNumber numberWithFloat:radius] forKey:@"inputRadius"];
CGSSetCIFilterValuesFromDictionary(con, blurFilter, (CFDictionaryRef)optionsDict);
 
CGSAddWindowFilter(con, [self windowNumber], blurFilter, kCGWindowFilterDock);
blurRadius_ = radius;
#endif
}
 
PasteboardHistory.m
+ 9
− 2
View file @ 7d311093
@@ -60,7 +60,14 @@
{
static PasteboardHistory* instance;
if (!instance) {
instance = [[PasteboardHistory alloc] initWithMaxEntries:20];
int maxEntries = 20;
if ([[NSUserDefaults standardUserDefaults] objectForKey:@"MaxPasteHistoryEntries"]) {
maxEntries = [[NSUserDefaults standardUserDefaults] integerForKey:@"MaxPasteHistoryEntries"];
if (maxEntries < 0) {
maxEntries = 0;
}
}
instance = [[PasteboardHistory alloc] initWithMaxEntries:maxEntries];
}
return instance;
}
@@ -169,7 +176,7 @@
PasteboardEntry* entry = [PasteboardEntry entryWithString:value score:[[NSDate date] timeIntervalSince1970]];
entry->timestamp = [[NSDate alloc] init];
[entries_ addObject:entry];
if ([entries_ count] == maxEntries_) {
if ([entries_ count] > maxEntries_) {
[entries_ removeObjectAtIndex:0];
}
 
PreferencePanel.m
+ 38
− 0
View file @ 7d311093
@@ -529,6 +529,10 @@ static float versionNumber;
} else {
[lionStyleFullscreen setHidden:YES];
}
[blurRadius setContinuous:YES];
[transparency setContinuous:YES];
[dimmingAmount setContinuous:YES];
[minimumContrast setContinuous:YES];
}
 
- (void)handleWindowWillCloseNotification:(NSNotification *)notification
@@ -915,6 +919,9 @@ static float versionNumber;
defaultIrMemory = [prefs objectForKey:@"IRMemory"]?[[prefs objectForKey:@"IRMemory"] intValue] : 4;
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;
defaultDimmingAmount = [prefs objectForKey:@"SplitPaneDimmingAmount"] ? [[prefs objectForKey:@"SplitPaneDimmingAmount"] floatValue] : 0.4;
defaultShowWindowBorder = [[prefs objectForKey:@"UseBorder"] boolValue];
defaultLionStyleFullscreen = [prefs objectForKey:@"UseLionStyleFullscreen"] ? [[prefs objectForKey:@"UseLionStyleFullscreen"] boolValue] : YES;
 
@@ -1044,6 +1051,9 @@ static float versionNumber;
[prefs setInteger:defaultIrMemory forKey:@"IRMemory"];
[prefs setBool:defaultCheckTestRelease forKey:@"CheckTestRelease"];
[prefs setBool:defaultDimInactiveSplitPanes forKey:@"DimInactiveSplitPanes"];
[prefs setBool:defaultDimBackgroundWindows forKey:@"DimBackgroundWindows"];
[prefs setBool:defaultDimOnlyText forKey:@"DimOnlyText"];
[prefs setFloat:defaultDimmingAmount forKey:@"SplitPaneDimmingAmount"];
[prefs setBool:defaultShowWindowBorder forKey:@"UseBorder"];
[prefs setBool:defaultLionStyleFullscreen forKey:@"UseLionStyleFullscreen"];
 
@@ -1136,6 +1146,9 @@ static float versionNumber;
[irMemory setIntValue:defaultIrMemory];
[checkTestRelease setState:defaultCheckTestRelease?NSOnState:NSOffState];
[dimInactiveSplitPanes setState:defaultDimInactiveSplitPanes?NSOnState:NSOffState];
[dimBackgroundWindows setState:defaultDimBackgroundWindows?NSOnState:NSOffState];
[dimOnlyText setState:defaultDimOnlyText?NSOnState:NSOffState];
[dimmingAmount setFloatValue:defaultDimmingAmount];
[showWindowBorder setState:defaultShowWindowBorder?NSOnState:NSOffState];
[lionStyleFullscreen setState:defaultLionStyleFullscreen?NSOnState:NSOffState];
 
@@ -1223,6 +1236,7 @@ static float versionNumber;
[dict setObject:[NSNumber numberWithInt:WINDOW_TYPE_TOP] forKey:KEY_WINDOW_TYPE];
[dict setObject:[NSNumber numberWithInt:25] forKey:KEY_ROWS];
[dict setObject:[NSNumber numberWithFloat:0.3] forKey:KEY_TRANSPARENCY];
[dict setObject:[NSNumber numberWithFloat:2.0] forKey:KEY_BLUR_RADIUS];
[dict setObject:[NSNumber numberWithBool:YES] forKey:KEY_BLUR];
[dict setObject:[NSNumber numberWithInt:-1] forKey:KEY_SCREEN];
[dict setObject:[NSNumber numberWithInt:-1] forKey:KEY_SPACE];
@@ -1247,6 +1261,9 @@ static float versionNumber;
sender == advancedFontRendering ||
sender == strokeThickness ||
sender == dimInactiveSplitPanes ||
sender == dimBackgroundWindows ||
sender == dimOnlyText ||
sender == dimmingAmount ||
sender == showWindowBorder) {
defaultWindowStyle = [windowStyle indexOfSelectedItem];
defaultTabViewType=[tabPosition indexOfSelectedItem];
@@ -1260,6 +1277,9 @@ static float versionNumber;
defaultStrokeThickness = [strokeThickness floatValue];
defaultHideTab = ([hideTab state] == NSOnState);
defaultDimInactiveSplitPanes = ([dimInactiveSplitPanes state] == NSOnState);
defaultDimBackgroundWindows = ([dimBackgroundWindows state] == NSOnState);
defaultDimOnlyText = ([dimOnlyText state] == NSOnState);
defaultDimmingAmount = [dimmingAmount floatValue];
defaultShowWindowBorder = ([showWindowBorder state] == NSOnState);
defaultHideScrollbar = ([hideScrollbar state] == NSOnState);
[[NSNotificationCenter defaultCenter] postNotificationName:@"iTermRefreshTerminal"
@@ -1674,6 +1694,21 @@ static float versionNumber;
return defaultDimInactiveSplitPanes;
}
 
- (BOOL)dimBackgroundWindows
{
return defaultDimBackgroundWindows;
}
- (BOOL)dimOnlyText
{
return defaultDimOnlyText;
}
- (float)dimmingAmount
{
return defaultDimmingAmount;
}
- (BOOL)showWindowBorder
{
return defaultShowWindowBorder;
@@ -2119,6 +2154,7 @@ static float versionNumber;
}
 
[transparency setFloatValue:[[dict objectForKey:KEY_TRANSPARENCY] floatValue]];
[blurRadius setFloatValue:[dict objectForKey:KEY_BLUR_RADIUS] ? [[dict objectForKey:KEY_BLUR_RADIUS] floatValue] : 2.0];
[blur setState:[[dict objectForKey:KEY_BLUR] boolValue] ? NSOnState : NSOffState];
if ([dict objectForKey:KEY_ASCII_ANTI_ALIASED]) {
[asciiAntiAliased setState:[[dict objectForKey:KEY_ASCII_ANTI_ALIASED] boolValue] ? NSOnState : NSOffState];
@@ -2462,6 +2498,7 @@ static float versionNumber;
[newDict setObject:[NSNumber numberWithBool:([useBoldFont state]==NSOnState)] forKey:KEY_USE_BOLD_FONT];
[newDict setObject:[NSNumber numberWithBool:([useBrightBold state]==NSOnState)] forKey:KEY_USE_BRIGHT_BOLD];
[newDict setObject:[NSNumber numberWithFloat:[transparency floatValue]] forKey:KEY_TRANSPARENCY];
[newDict setObject:[NSNumber numberWithFloat:[blurRadius floatValue]] forKey:KEY_BLUR_RADIUS];
[newDict setObject:[NSNumber numberWithBool:([blur state]==NSOnState)] forKey:KEY_BLUR];
[newDict setObject:[NSNumber numberWithBool:([asciiAntiAliased state]==NSOnState)] forKey:KEY_ASCII_ANTI_ALIASED];
[newDict setObject:[NSNumber numberWithBool:([nonasciiAntiAliased state]==NSOnState)] forKey:KEY_NONASCII_ANTI_ALIASED];
@@ -3232,6 +3269,7 @@ static float versionNumber;
KEY_SCREEN,
KEY_SPACE,
KEY_TRANSPARENCY,
KEY_BLUR_RADIUS,
KEY_BLUR,
KEY_BACKGROUND_IMAGE_LOCATION,
KEY_SYNC_TITLE,
PseudoTerminal.m
+ 14
− 6
View file @ 7d311093
@@ -934,7 +934,7 @@ NSString *sessionsKey = @"sessions";
__FILE__, __LINE__, aNotification);
#endif
if ([[self currentTab] blur]) {
[self enableBlur];
[self enableBlur:[[self currentTab] blurRadius]];
} else {
[self disableBlur];
}
@@ -1060,10 +1060,11 @@ NSString *sessionsKey = @"sessions";
}
[[[self currentSession] TEXTVIEW] setNeedsDisplay:YES];
[self _loadFindStringFromSharedPasteboard];
// Start the timers back up
for (PTYSession* aSession in [self sessions]) {
[aSession updateDisplay];
[[aSession view] setBackgroundDimmed:NO];
}
}
 
@@ -1160,6 +1161,9 @@ NSString *sessionsKey = @"sessions";
// update the cursor
[[[self currentSession] TEXTVIEW] refresh];
[[[self currentSession] TEXTVIEW] setNeedsDisplay:YES];
for (PTYSession* aSession in [self sessions]) {
[[aSession view] setBackgroundDimmed:YES];
}
}
 
- (void)windowDidResignMain:(NSNotification *)aNotification
@@ -1754,12 +1758,12 @@ NSString *sessionsKey = @"sessions";
}
}
 
- (void)enableBlur
- (void)enableBlur:(double)radius
{
id window = [self window];
if (nil != window &&
[window respondsToSelector:@selector(enableBlur)]) {
[window enableBlur];
[window respondsToSelector:@selector(enableBlur:)]) {
[window enableBlur:radius];
}
}
 
@@ -1794,7 +1798,7 @@ NSString *sessionsKey = @"sessions";
 
[[self window] makeFirstResponder:[[[tabViewItem identifier] activeSession] TEXTVIEW]];
if ([[aSession tab] blur]) {
[self enableBlur];
[self enableBlur:[[aSession tab] blurRadius]];
} else {
[self disableBlur];
}
@@ -2986,6 +2990,10 @@ NSString *sessionsKey = @"sessions";
} else {
[[aSession view] setDimmed:NO];
}
[[aSession view] setBackgroundDimmed:![[self window] isKeyWindow]];
// In case dimming amount slider moved update the dimming amount.
[[aSession view] updateDim];
}
}
}
SessionView.h
+ 4
− 0
View file @ 7d311093
@@ -32,6 +32,7 @@
@interface SessionView : NSView {
PTYSession* session_;
BOOL dim_;
BOOL backgroundDimmed_;
 
float currentDimmingAmount_;
NSDate* previousUpdate_;
@@ -58,5 +59,8 @@
- (FindViewController*)findViewController;
- (int)viewId;
- (void)setViewId:(int)id;
- (void)setBackgroundDimmed:(BOOL)backgroundDimmed;
- (void)updateDim;
- (BOOL)backgroundDimmed;
 
@end
SessionView.m
+ 37
− 7
View file @ 7d311093
@@ -148,8 +148,26 @@ static NSDate* lastResizeDate_;
 
- (double)dimmedDimmingAmount
{
NSNumber* n = [[NSUserDefaults standardUserDefaults] objectForKey:@"SplitPaneDimmingAmount"];
return n ? [n doubleValue] : 0.15;
return [[PreferencePanel sharedInstance] dimmingAmount];
}
- (void)updateDim
{
int x = 0;
if (dim_) {
x++;
}
if (backgroundDimmed_) {
x++;
}
double scale[] = { 0, 1.0, 1.5 };
double amount = scale[x] * [self dimmedDimmingAmount];
// Cap amount within reasonable bounds. Before 1.1, dimming amount was only changed by
// twiddling the prefs file so it could have all kinds of crazy values.
amount = MIN(0.9, amount);
amount = MAX(0.1, amount);
[self _dimShadeToDimmingAmount:amount];
}
 
- (void)setDimmed:(BOOL)isDimmed
@@ -161,15 +179,27 @@ static NSDate* lastResizeDate_;
return;
}
dim_ = isDimmed;
if (isDimmed) {
currentDimmingAmount_ = 0;
[[session_ TEXTVIEW] setDimmingAmount:0];
[self _dimShadeToDimmingAmount:[self dimmedDimmingAmount]];
[self updateDim];
}
- (void)setBackgroundDimmed:(BOOL)backgroundDimmed
{
BOOL orig = backgroundDimmed_;
if ([[PreferencePanel sharedInstance] dimBackgroundWindows]) {
backgroundDimmed_ = backgroundDimmed;
} else {
[self _dimShadeToDimmingAmount:0];
backgroundDimmed_ = NO;
}
if (backgroundDimmed_ != orig) {
[self updateDim];
}
}
 
- (BOOL)backgroundDimmed
{
return backgroundDimmed_;
}
- (void)cancelTimers
{
shuttingDown_ = YES;
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment