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

Finish up find cursor code.

parent 5f1a8f17
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
English.lproj/MainMenu.xib
+ 398
− 465
View file @ 5c9c3633
@@ -12,7 +12,7 @@
@@ -12,7 +12,7 @@
</object> </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="1281"/> <integer value="803"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
@@ -215,291 +215,6 @@
@@ -215,291 +215,6 @@
<string key="NSName">_NSAppleMenu</string> <string key="NSName">_NSAppleMenu</string>
</object> </object>
</object> </object>
<object class="NSMenuItem" id="1015666104">
<reference key="NSMenu" ref="748181631"/>
<string key="NSTitle">Shell</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="360861402">
<string key="NSTitle">Shell</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="39047848">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">New Tab</string>
<string key="NSKeyEquiv">t</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="205523462">
<reference key="NSMenu" ref="360861402"/>
<bool key="NSIsAlternate">YES</bool>
<string key="NSTitle">New Window</string>
<string key="NSKeyEquiv">n</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="3000">
<reference key="NSMenu" ref="360861402"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="250043371">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Split Vertically</string>
<string key="NSKeyEquiv">d</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="931862216">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Split Horizontally</string>
<string key="NSKeyEquiv">D</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="53503266">
<reference key="NSMenu" ref="360861402"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="850887095">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Save Selected Text...</string>
<string key="NSKeyEquiv">s</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="461490733">
<reference key="NSMenu" ref="360861402"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="619695518">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Close</string>
<string key="NSKeyEquiv">w</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="319026797">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Close Terminal Window</string>
<string key="NSKeyEquiv">W</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="549350617">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Close All Panes in Tab</string>
<string key="NSKeyEquiv">w</string>
<int key="NSKeyEquivModMask">1572864</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="489280877">
<reference key="NSMenu" ref="360861402"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="393004483">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Send Input To...</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="536673199">
<string key="NSTitle">Send Input To...</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="592873546">
<reference key="NSMenu" ref="536673199"/>
<string key="NSTitle">Send Input to Current Session Only</string>
<string key="NSKeyEquiv">I</string>
<int key="NSKeyEquivModMask">1572864</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="181582496">
<reference key="NSMenu" ref="536673199"/>
<string key="NSTitle">Send Input to All Panes in All Tabs</string>
<string key="NSKeyEquiv">I</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="41827785">
<reference key="NSMenu" ref="536673199"/>
<string key="NSTitle">Send Input to All Panes in Current Tab</string>
<string key="NSKeyEquiv">i</string>
<int key="NSKeyEquivModMask">1572864</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
</object>
</object>
</object>
<object class="NSMenuItem" id="983811310">
<reference key="NSMenu" ref="360861402"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="160455559">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Page Setup...</string>
<string key="NSKeyEquiv">P</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="419480288">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Print</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="604196418">
<string key="NSTitle">Print</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="146270570">
<reference key="NSMenu" ref="604196418"/>
<string key="NSTitle">Screen</string>
<string key="NSKeyEquiv">p</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="942932447">
<reference key="NSMenu" ref="604196418"/>
<string key="NSTitle">Selection</string>
<string key="NSKeyEquiv">p</string>
<int key="NSKeyEquivModMask">1572864</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
<int key="NSTag">1</int>
</object>
<object class="NSMenuItem" id="333391578">
<reference key="NSMenu" ref="604196418"/>
<string key="NSTitle">Buffer</string>
<string key="NSKeyEquiv">P</string>
<int key="NSKeyEquivModMask">1572864</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
<int key="NSTag">2</int>
</object>
</object>
</object>
</object>
<object class="NSMenuItem" id="847974457">
<reference key="NSMenu" ref="360861402"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="946837091">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Log</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="345214594">
<string key="NSTitle">Log</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="381797437">
<reference key="NSMenu" ref="345214594"/>
<string key="NSTitle">Start</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="443454057">
<reference key="NSMenu" ref="345214594"/>
<string key="NSTitle">Stop</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
</object>
<bool key="NSNoAutoenable">YES</bool>
</object>
</object>
</object>
</object>
</object>
<object class="NSMenuItem" id="800408560"> <object class="NSMenuItem" id="800408560">
<reference key="NSMenu" ref="748181631"/> <reference key="NSMenu" ref="748181631"/>
<string key="NSTitle">Edit</string> <string key="NSTitle">Edit</string>
@@ -725,8 +440,267 @@
@@ -725,8 +440,267 @@
</object> </object>
</object> </object>
</object> </object>
<object class="NSMenuItem" id="396763502"> <object class="NSMenuItem" id="396763502">
<reference key="NSMenu" ref="1015598466"/> <reference key="NSMenu" ref="1015598466"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
<object class="NSMenu" key="NSSubmenu" id="668189017">
<string key="NSTitle"/>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="1004686729">
<reference key="NSMenu" ref="668189017"/>
<string key="NSTitle">Item 1</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="764185583">
<reference key="NSMenu" ref="668189017"/>
<string key="NSTitle">Item 2</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="589543954">
<reference key="NSMenu" ref="668189017"/>
<string key="NSTitle">Item 3</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
</object>
</object>
</object>
<object class="NSMenuItem" id="717381369">
<reference key="NSMenu" ref="1015598466"/>
<string key="NSTitle">Set Mark</string>
<string key="NSKeyEquiv">M</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="324976430">
<reference key="NSMenu" ref="1015598466"/>
<string key="NSTitle">Jump to Mark</string>
<string key="NSKeyEquiv">J</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="839868777">
<reference key="NSMenu" ref="1015598466"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
<object class="NSMenu" key="NSSubmenu" id="931432501">
<string key="NSTitle"/>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="423028588">
<reference key="NSMenu" ref="931432501"/>
<string key="NSTitle">Item 1</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="663144134">
<reference key="NSMenu" ref="931432501"/>
<string key="NSTitle">Item 2</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="15570126">
<reference key="NSMenu" ref="931432501"/>
<string key="NSTitle">Item 3</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
</object>
</object>
</object>
<object class="NSMenuItem" id="982352882">
<reference key="NSMenu" ref="1015598466"/>
<string key="NSTitle">Clear Buffer</string>
<string key="NSKeyEquiv">k</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="1042837434">
<reference key="NSMenu" ref="1015598466"/>
<string key="NSTitle">Clear Scrollback Buffer</string>
<string key="NSKeyEquiv">K</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="187002953">
<reference key="NSMenu" ref="1015598466"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="557491076">
<reference key="NSMenu" ref="1015598466"/>
<string key="NSTitle">Reset</string>
<string key="NSKeyEquiv">r</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
</object>
</object>
</object>
<object class="NSMenuItem" id="1015666104">
<reference key="NSMenu" ref="748181631"/>
<string key="NSTitle">Shell</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="360861402">
<string key="NSTitle">Shell</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="39047848">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">New Tab</string>
<string key="NSKeyEquiv">t</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="205523462">
<reference key="NSMenu" ref="360861402"/>
<bool key="NSIsAlternate">YES</bool>
<string key="NSTitle">New Window</string>
<string key="NSKeyEquiv">n</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="3000">
<reference key="NSMenu" ref="360861402"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="250043371">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Split Vertically</string>
<string key="NSKeyEquiv">d</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="931862216">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Split Horizontally</string>
<string key="NSKeyEquiv">D</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="53503266">
<reference key="NSMenu" ref="360861402"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="850887095">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Save Selected Text...</string>
<string key="NSKeyEquiv">s</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="461490733">
<reference key="NSMenu" ref="360861402"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="619695518">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Close</string>
<string key="NSKeyEquiv">w</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="319026797">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Close Terminal Window</string>
<string key="NSKeyEquiv">W</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="549350617">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Close All Panes in Tab</string>
<string key="NSKeyEquiv">w</string>
<int key="NSKeyEquivModMask">1572864</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="489280877">
<reference key="NSMenu" ref="360861402"/>
<bool key="NSIsDisabled">YES</bool> <bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool> <bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/> <string key="NSTitle"/>
@@ -735,30 +709,42 @@
@@ -735,30 +709,42 @@
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/> <reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/> <reference key="NSMixedImage" ref="326707852"/>
<object class="NSMenu" key="NSSubmenu" id="668189017"> </object>
<string key="NSTitle"/> <object class="NSMenuItem" id="393004483">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Send Input To...</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="536673199">
<string key="NSTitle">Send Input To...</string>
<object class="NSMutableArray" key="NSMenuItems"> <object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="1004686729"> <object class="NSMenuItem" id="592873546">
<reference key="NSMenu" ref="668189017"/> <reference key="NSMenu" ref="536673199"/>
<string key="NSTitle">Item 1</string> <string key="NSTitle">Send Input to Current Session Only</string>
<string key="NSKeyEquiv"/> <string key="NSKeyEquiv">I</string>
<int key="NSKeyEquivModMask">1572864</int>
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/> <reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/> <reference key="NSMixedImage" ref="326707852"/>
</object> </object>
<object class="NSMenuItem" id="764185583"> <object class="NSMenuItem" id="181582496">
<reference key="NSMenu" ref="668189017"/> <reference key="NSMenu" ref="536673199"/>
<string key="NSTitle">Item 2</string> <string key="NSTitle">Send Input to All Panes in All Tabs</string>
<string key="NSKeyEquiv"/> <string key="NSKeyEquiv">I</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/> <reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/> <reference key="NSMixedImage" ref="326707852"/>
</object> </object>
<object class="NSMenuItem" id="589543954"> <object class="NSMenuItem" id="41827785">
<reference key="NSMenu" ref="668189017"/> <reference key="NSMenu" ref="536673199"/>
<string key="NSTitle">Item 3</string> <string key="NSTitle">Send Input to All Panes in Current Tab</string>
<string key="NSKeyEquiv"/> <string key="NSKeyEquiv">i</string>
<int key="NSKeyEquivModMask">1572864</int>
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/> <reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/> <reference key="NSMixedImage" ref="326707852"/>
@@ -766,85 +752,73 @@
@@ -766,85 +752,73 @@
</object> </object>
</object> </object>
</object> </object>
<object class="NSMenuItem" id="717381369"> <object class="NSMenuItem" id="983811310">
<reference key="NSMenu" ref="1015598466"/> <reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Set Mark</string> <bool key="NSIsDisabled">YES</bool>
<string key="NSKeyEquiv">M</string> <bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int> <int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/> <reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/> <reference key="NSMixedImage" ref="326707852"/>
</object> </object>
<object class="NSMenuItem" id="324976430"> <object class="NSMenuItem" id="160455559">
<reference key="NSMenu" ref="1015598466"/> <reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Jump to Mark</string> <string key="NSTitle">Page Setup...</string>
<string key="NSKeyEquiv">J</string> <string key="NSKeyEquiv">P</string>
<int key="NSKeyEquivModMask">1048576</int> <int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/> <reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/> <reference key="NSMixedImage" ref="326707852"/>
</object> </object>
<object class="NSMenuItem" id="839868777"> <object class="NSMenuItem" id="419480288">
<reference key="NSMenu" ref="1015598466"/> <reference key="NSMenu" ref="360861402"/>
<bool key="NSIsDisabled">YES</bool> <string key="NSTitle">Print</string>
<bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/>
<string key="NSKeyEquiv"/> <string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int> <int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/> <reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/> <reference key="NSMixedImage" ref="326707852"/>
<object class="NSMenu" key="NSSubmenu" id="931432501"> <string key="NSAction">submenuAction:</string>
<string key="NSTitle"/> <object class="NSMenu" key="NSSubmenu" id="604196418">
<string key="NSTitle">Print</string>
<object class="NSMutableArray" key="NSMenuItems"> <object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="423028588"> <object class="NSMenuItem" id="146270570">
<reference key="NSMenu" ref="931432501"/> <reference key="NSMenu" ref="604196418"/>
<string key="NSTitle">Item 1</string> <string key="NSTitle">Screen</string>
<string key="NSKeyEquiv"/> <string key="NSKeyEquiv">p</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/> <reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/> <reference key="NSMixedImage" ref="326707852"/>
</object> </object>
<object class="NSMenuItem" id="663144134"> <object class="NSMenuItem" id="942932447">
<reference key="NSMenu" ref="931432501"/> <reference key="NSMenu" ref="604196418"/>
<string key="NSTitle">Item 2</string> <string key="NSTitle">Selection</string>
<string key="NSKeyEquiv"/> <string key="NSKeyEquiv">p</string>
<int key="NSKeyEquivModMask">1572864</int>
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/> <reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/> <reference key="NSMixedImage" ref="326707852"/>
<int key="NSTag">1</int>
</object> </object>
<object class="NSMenuItem" id="15570126"> <object class="NSMenuItem" id="333391578">
<reference key="NSMenu" ref="931432501"/> <reference key="NSMenu" ref="604196418"/>
<string key="NSTitle">Item 3</string> <string key="NSTitle">Buffer</string>
<string key="NSKeyEquiv"/> <string key="NSKeyEquiv">P</string>
<int key="NSKeyEquivModMask">1572864</int>
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/> <reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/> <reference key="NSMixedImage" ref="326707852"/>
<int key="NSTag">2</int>
</object> </object>
</object> </object>
</object> </object>
</object> </object>
<object class="NSMenuItem" id="982352882"> <object class="NSMenuItem" id="847974457">
<reference key="NSMenu" ref="1015598466"/> <reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Clear Buffer</string>
<string key="NSKeyEquiv">k</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="1042837434">
<reference key="NSMenu" ref="1015598466"/>
<string key="NSTitle">Clear Scrollback Buffer</string>
<string key="NSKeyEquiv">K</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="187002953">
<reference key="NSMenu" ref="1015598466"/>
<bool key="NSIsDisabled">YES</bool> <bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool> <bool key="NSIsSeparator">YES</bool>
<string key="NSTitle"/> <string key="NSTitle"/>
@@ -854,14 +828,40 @@
@@ -854,14 +828,40 @@
<reference key="NSOnImage" ref="643967552"/> <reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/> <reference key="NSMixedImage" ref="326707852"/>
</object> </object>
<object class="NSMenuItem" id="557491076"> <object class="NSMenuItem" id="946837091">
<reference key="NSMenu" ref="1015598466"/> <reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">Reset</string> <string key="NSTitle">Log</string>
<string key="NSKeyEquiv">r</string> <string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int> <int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/> <reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/> <reference key="NSMixedImage" ref="326707852"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="345214594">
<string key="NSTitle">Log</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="381797437">
<reference key="NSMenu" ref="345214594"/>
<string key="NSTitle">Start</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="443454057">
<reference key="NSMenu" ref="345214594"/>
<string key="NSTitle">Stop</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
</object>
<bool key="NSNoAutoenable">YES</bool>
</object>
</object> </object>
</object> </object>
</object> </object>
@@ -915,6 +915,15 @@
@@ -915,6 +915,15 @@
<reference key="NSOnImage" ref="643967552"/> <reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/> <reference key="NSMixedImage" ref="326707852"/>
</object> </object>
<object class="NSMenuItem" id="672316615">
<reference key="NSMenu" ref="203853260"/>
<string key="NSTitle">Find Cursor</string>
<string key="NSKeyEquiv">/</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
<object class="NSMenuItem" id="640505350"> <object class="NSMenuItem" id="640505350">
<reference key="NSMenu" ref="203853260"/> <reference key="NSMenu" ref="203853260"/>
<bool key="NSIsDisabled">YES</bool> <bool key="NSIsDisabled">YES</bool>
@@ -2866,6 +2875,14 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -2866,6 +2875,14 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
</object> </object>
<int key="connectionID">1285</int> <int key="connectionID">1285</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">findCursor:</string>
<reference key="source" ref="620772211"/>
<reference key="destination" ref="672316615"/>
</object>
<int key="connectionID">1288</int>
</object>
</object> </object>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects"> <object class="NSArray" key="orderedObjects">
@@ -2903,11 +2920,11 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -2903,11 +2920,11 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="914464345"/> <reference ref="914464345"/>
<reference ref="664501322"/> <reference ref="664501322"/>
<reference ref="1015666104"/>
<reference ref="403022325"/> <reference ref="403022325"/>
<reference ref="800408560"/> <reference ref="800408560"/>
<reference ref="582480416"/> <reference ref="582480416"/>
<reference ref="549291896"/> <reference ref="549291896"/>
<reference ref="1015666104"/>
</object> </object>
<reference key="parent" ref="0"/> <reference key="parent" ref="0"/>
<string key="objectName">MainMenu</string> <string key="objectName">MainMenu</string>
@@ -3504,6 +3521,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -3504,6 +3521,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
<reference ref="870427594"/> <reference ref="870427594"/>
<reference ref="640505350"/> <reference ref="640505350"/>
<reference ref="675837179"/> <reference ref="675837179"/>
<reference ref="672316615"/>
</object> </object>
<reference key="parent" ref="549291896"/> <reference key="parent" ref="549291896"/>
</object> </object>
@@ -4019,6 +4037,11 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -4019,6 +4037,11 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
</object> </object>
<reference key="parent" ref="500971307"/> <reference key="parent" ref="500971307"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">1286</int>
<reference key="object" ref="672316615"/>
<reference key="parent" ref="203853260"/>
</object>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="flattenedProperties"> <object class="NSMutableDictionary" key="flattenedProperties">
@@ -4089,6 +4112,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -4089,6 +4112,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
<string>1280.IBPluginDependency</string> <string>1280.IBPluginDependency</string>
<string>1281.IBEditorWindowLastContentRect</string> <string>1281.IBEditorWindowLastContentRect</string>
<string>1281.IBPluginDependency</string> <string>1281.IBPluginDependency</string>
<string>1286.IBPluginDependency</string>
<string>129.IBPluginDependency</string> <string>129.IBPluginDependency</string>
<string>130.IBPluginDependency</string> <string>130.IBPluginDependency</string>
<string>131.IBPluginDependency</string> <string>131.IBPluginDependency</string>
@@ -4130,6 +4154,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -4130,6 +4154,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
<string>5.IBPluginDependency</string> <string>5.IBPluginDependency</string>
<string>510.IBPluginDependency</string> <string>510.IBPluginDependency</string>
<string>56.IBPluginDependency</string> <string>56.IBPluginDependency</string>
<string>57.IBEditorWindowLastContentRect</string>
<string>57.IBPluginDependency</string> <string>57.IBPluginDependency</string>
<string>591.IBPluginDependency</string> <string>591.IBPluginDependency</string>
<string>592.IBEditorWindowLastContentRect</string> <string>592.IBEditorWindowLastContentRect</string>
@@ -4232,7 +4257,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -4232,7 +4257,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
<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>{{378, 652}, {397, 83}}</string> <string>{{327, 652}, {397, 83}}</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>
@@ -4277,7 +4302,8 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -4277,7 +4302,8 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
<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>{{594, 612}, {83, 23}}</string> <string>{{594, 629}, {64, 6}}</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> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4291,7 +4317,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -4291,7 +4317,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
<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>{{133, 482}, {245, 343}}</string> <string>{{82, 482}, {245, 343}}</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>
@@ -4320,6 +4346,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -4320,6 +4346,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
<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>{{12, 572}, {245, 253}}</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>{{227, 742}, {291, 83}}</string> <string>{{227, 742}, {291, 83}}</string>
@@ -4336,7 +4363,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -4336,7 +4363,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
<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>{{378, 532}, {238, 103}}</string> <string>{{327, 532}, {238, 103}}</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>
@@ -4347,13 +4374,13 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -4347,13 +4374,13 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
<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>{{177, 582}, {257, 243}}</string> <string>{{177, 562}, {257, 263}}</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>
<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>{{82, 522}, {250, 303}}</string> <string>{{126, 522}, {250, 303}}</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>
@@ -4420,19 +4447,11 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -4420,19 +4447,11 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
</object> </object>
</object> </object>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">1285</int> <int key="maxID">1288</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">BottomBarView</string>
<string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="220486561">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Headers/iTerm/PseudoTerminal.h</string>
</object>
</object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">FakeWindow</string> <string key="className">FakeWindow</string>
<string key="superclassName">NSObject</string> <string key="superclassName">NSObject</string>
@@ -4991,6 +5010,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -4991,6 +5010,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
<string>editCurrentSession:</string> <string>editCurrentSession:</string>
<string>enableSendInputToAllPanes:</string> <string>enableSendInputToAllPanes:</string>
<string>enableSendInputToAllTabs:</string> <string>enableSendInputToAllTabs:</string>
<string>findCursor:</string>
<string>irButton:</string> <string>irButton:</string>
<string>irNext:</string> <string>irNext:</string>
<string>irPrev:</string> <string>irPrev:</string>
@@ -5073,6 +5093,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -5073,6 +5093,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="actionInfosByName"> <object class="NSMutableDictionary" key="actionInfosByName">
@@ -5090,6 +5111,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -5090,6 +5111,7 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
<string>editCurrentSession:</string> <string>editCurrentSession:</string>
<string>enableSendInputToAllPanes:</string> <string>enableSendInputToAllPanes:</string>
<string>enableSendInputToAllTabs:</string> <string>enableSendInputToAllTabs:</string>
<string>findCursor:</string>
<string>irButton:</string> <string>irButton:</string>
<string>irNext:</string> <string>irNext:</string>
<string>irPrev:</string> <string>irPrev:</string>
@@ -5171,6 +5193,10 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -5171,6 +5193,10 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
<string key="name">enableSendInputToAllTabs:</string> <string key="name">enableSendInputToAllTabs:</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBActionInfo">
<string key="name">findCursor:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo"> <object class="IBActionInfo">
<string key="name">irButton:</string> <string key="name">irButton:</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
@@ -5309,95 +5335,10 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -5309,95 +5335,10 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
</object> </object>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="outlets"> <object class="IBClassDescriptionSource" key="sourceIdentifier">
<bool key="EncodedWithXMLCoder">YES</bool> <string key="majorKey">IBProjectSource</string>
<object class="NSArray" key="dict.sortedKeys"> <string key="minorKey">Headers/iTerm/PseudoTerminal.h</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<string>commandField</string>
<string>currentTime</string>
<string>earliestTime</string>
<string>instantReplaySubview</string>
<string>irSlider</string>
<string>latestTime</string>
<string>parameterName</string>
<string>parameterPanel</string>
<string>parameterPrompt</string>
<string>parameterValue</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>NSTextField</string>
<string>NSTextField</string>
<string>BottomBarView</string>
<string>NSSlider</string>
<string>NSTextField</string>
<string>NSTextField</string>
<string>NSPanel</string>
<string>NSTextField</string>
<string>NSTextField</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>commandField</string>
<string>currentTime</string>
<string>earliestTime</string>
<string>instantReplaySubview</string>
<string>irSlider</string>
<string>latestTime</string>
<string>parameterName</string>
<string>parameterPanel</string>
<string>parameterPrompt</string>
<string>parameterValue</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">commandField</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">currentTime</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">earliestTime</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">instantReplaySubview</string>
<string key="candidateClassName">BottomBarView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">irSlider</string>
<string key="candidateClassName">NSSlider</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">latestTime</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">parameterName</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">parameterPanel</string>
<string key="candidateClassName">NSPanel</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">parameterPrompt</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">parameterValue</string>
<string key="candidateClassName">NSTextField</string>
</object>
</object>
</object> </object>
<reference key="sourceIdentifier" ref="220486561"/>
</object> </object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">iTermAboutWindow</string> <string key="className">iTermAboutWindow</string>
@@ -6362,14 +6303,6 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
@@ -6362,14 +6303,6 @@ dy5hbmR5bWF0dXNjaGFrLm9yZy9wYWdlcy9zcGFya2xlCgoKCgoKCgoKCgoKCgoKCg</bytes>
<string key="minorKey">AppKit.framework/Headers/NSScroller.h</string> <string key="minorKey">AppKit.framework/Headers/NSScroller.h</string>
</object> </object>
</object> </object>
<object class="IBPartialClassDescription">
<string key="className">NSSlider</string>
<string key="superclassName">NSControl</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSSlider.h</string>
</object>
</object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">NSTableView</string> <string key="className">NSTableView</string>
<string key="superclassName">NSControl</string> <string key="superclassName">NSControl</string>
Headers/iTerm/PTYScrollView.h
+ 0
− 1
View file @ 5c9c3633
@@ -69,6 +69,5 @@
@@ -69,6 +69,5 @@
- (void)drawBackgroundImageRect:(NSRect)rect toPoint:(NSPoint)dest useTransparency:(BOOL)useTransparency; - (void)drawBackgroundImageRect:(NSRect)rect toPoint:(NSPoint)dest useTransparency:(BOOL)useTransparency;
- (float)transparency; - (float)transparency;
- (void)setTransparency: (float) theTransparency; - (void)setTransparency: (float) theTransparency;
- (void)bugfixSetHasVerticalScroller:(BOOL)flag;
   
@end @end
Headers/iTerm/PTYTextView.h
+ 10
− 2
View file @ 5c9c3633
@@ -41,6 +41,8 @@
@@ -41,6 +41,8 @@
   
@class VT100Screen; @class VT100Screen;
   
// Amount of time to highlight the cursor after beginFindCursor:YES
static const double kFindCursorHoldTime = 1;
enum { SELECT_CHAR, SELECT_WORD, SELECT_LINE, SELECT_SMART, SELECT_BOX }; enum { SELECT_CHAR, SELECT_WORD, SELECT_LINE, SELECT_SMART, SELECT_BOX };
   
// A collection of data about a font. // A collection of data about a font.
@@ -56,11 +58,9 @@ typedef struct PTYFontInfo PTYFontInfo;
@@ -56,11 +58,9 @@ typedef struct PTYFontInfo PTYFontInfo;
   
@interface FindCursorView : NSView { @interface FindCursorView : NSView {
NSPoint cursor; NSPoint cursor;
double phase;
} }
   
@property (nonatomic, assign) NSPoint cursor; @property (nonatomic, assign) NSPoint cursor;
@property (nonatomic, assign) double phase;
   
@end @end
   
@@ -272,6 +272,9 @@ typedef struct PTYFontInfo PTYFontInfo;
@@ -272,6 +272,9 @@ typedef struct PTYFontInfo PTYFontInfo;
NSWindow *findCursorWindow_; NSWindow *findCursorWindow_;
FindCursorView *findCursorView_; FindCursorView *findCursorView_;
NSTimer *findCursorTeardownTimer_; NSTimer *findCursorTeardownTimer_;
NSTimer *findCursorBlinkTimer_;
BOOL autoHideFindCursor_;
NSPoint imeCursorLastPos_;
} }
   
+ (NSCursor *)textViewCursor; + (NSCursor *)textViewCursor;
@@ -477,6 +480,11 @@ typedef struct PTYFontInfo PTYFontInfo;
@@ -477,6 +480,11 @@ typedef struct PTYFontInfo PTYFontInfo;
   
- (void)clearMatches; - (void)clearMatches;
   
- (void)placeFindCursorOnAutoHide;
- (BOOL)isFindingCursor;
- (void)beginFindCursor:(BOOL)hold;
- (void)endFindCursor;
// Clear working directories for when buffer is cleared // Clear working directories for when buffer is cleared
- (void)clearWorkingDirectories; - (void)clearWorkingDirectories;
- (NSString *)getWordForX:(int)x - (NSString *)getWordForX:(int)x
Headers/iTerm/PseudoTerminal.h
+ 3
− 0
View file @ 5c9c3633
@@ -211,6 +211,7 @@ typedef enum {
@@ -211,6 +211,7 @@ typedef enum {
BOOL temporarilyShowingTabs_; BOOL temporarilyShowingTabs_;
   
NSMutableSet *broadcastViewIds_; NSMutableSet *broadcastViewIds_;
NSTimeInterval findCursorStartTime_;
} }
   
+ (void)drawArrangementPreview:(NSDictionary*)terminalArrangement + (void)drawArrangementPreview:(NSDictionary*)terminalArrangement
@@ -275,6 +276,8 @@ typedef enum {
@@ -275,6 +276,8 @@ typedef enum {
   
- (void)toggleFullScreenTabBar; - (void)toggleFullScreenTabBar;
   
- (IBAction)findCursor:(id)sender;
// Close the active session. // Close the active session.
- (IBAction)closeCurrentSession:(id)sender; - (IBAction)closeCurrentSession:(id)sender;
- (void)closeSessionWithConfirmation:(PTYSession *)aSession; - (void)closeSessionWithConfirmation:(PTYSession *)aSession;
PTYTextView.m
+ 118
− 48
View file @ 5c9c3633
@@ -67,44 +67,29 @@ static const int MAX_WORKING_DIR_COUNT = 50;
@@ -67,44 +67,29 @@ static const int MAX_WORKING_DIR_COUNT = 50;
@implementation FindCursorView @implementation FindCursorView
   
@synthesize cursor; @synthesize cursor;
@synthesize phase;
   
- (void)drawRect:(NSRect)dirtyRect - (void)drawRect:(NSRect)dirtyRect
{ {
NSLog(@"rect %@", [NSValue valueWithRect:dirtyRect]); const double initialAlpha = 0.7;
[[NSColor colorWithDeviceWhite:0.5 alpha:0.7] set]; [[NSColor colorWithDeviceWhite:0.5 alpha:initialAlpha] set];
NSRectFill(dirtyRect); NSRectFill(dirtyRect);
NSRect frame = [self frame];
double x = cursor.x; double x = cursor.x;
double y = cursor.y; double y = cursor.y;
   
double focusRadius = 40; const double numSteps = 2;
[[NSGraphicsContext currentContext] setCompositingOperation:NSCompositeCopy]; const double finalRadius = 30;
NSBezierPath *circle = [NSBezierPath bezierPathWithOvalInRect:NSMakeRect(x - focusRadius, y - focusRadius, focusRadius*2, focusRadius*2)]; const double stepSize = 2;
[[NSColor colorWithDeviceWhite:1 alpha:0] set]; const double initialRadius = finalRadius + numSteps * stepSize;
[circle fill]; double a = initialAlpha;
for (double focusRadius = initialRadius; a > 0 && focusRadius >= initialRadius - numSteps * stepSize; focusRadius -= stepSize) {
#if 0 [[NSGraphicsContext currentContext] setCompositingOperation:NSCompositeCopy];
[[NSGraphicsContext currentContext] setCompositingOperation:NSCompositeSourceOver]; NSBezierPath *circle = [NSBezierPath bezierPathWithOvalInRect:NSMakeRect(x - focusRadius, y - focusRadius, focusRadius*2, focusRadius*2)];
[[NSColor colorWithDeviceWhite:1 alpha:sin(M_PI * (1 - phase))] set]; a -= initialAlpha / numSteps;
NSRectFill(NSMakeRect(0, y-2, frame.size.width, 4)); a = MAX(0, a);
NSRectFill(NSMakeRect(x-2, frame.origin.y, 4, frame.size.height)); [[NSColor colorWithDeviceWhite:0.5 alpha:a] set];
[circle fill];
[[NSColor colorWithDeviceWhite:0 alpha:sin(M_PI * (1 - phase))] set]; }
NSRectFill(NSMakeRect(0, y-1, frame.size.width, 2));
NSRectFill(NSMakeRect(x-1, frame.origin.y, 2, frame.size.height));
#endif
/*
double xRadius = MAX(x, frame.size.width - x) * phase;
double yRadius = MAX(y, frame.size.height - y) * phase;
double radius = MAX(xRadius, yRadius);
NSRect rect = NSMakeRect(x - radius, y - radius, radius * 2, radius * 2);
circle = [NSBezierPath bezierPathWithOvalInRect:rect];
[[NSColor redColor] set];
[circle setLineWidth:4];
[circle stroke];
*/
} }
@end @end
   
@@ -4239,12 +4224,27 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
@@ -4239,12 +4224,27 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
[self setNeedsDisplay:YES]; [self setNeedsDisplay:YES];
} }
   
- (void)createFullScreenWindow - (NSPoint)globalCursorLocation
{
NSRect frame = [self visibleRect];
double x = MARGIN + charWidth * ([dataSource cursorX] - 1) + charWidth/2;
double y = frame.origin.y + VMARGIN + lineHeight * ([dataSource cursorY] - 1) + lineHeight/2;
if ([self hasMarkedText]) {
x = imeCursorLastPos_.x + 1;
y = imeCursorLastPos_.y + lineHeight / 2;
}
NSPoint p = NSMakePoint(x, y);
p = [self convertPoint:p toView:nil];
p = [[self window] convertBaseToScreen:p];
return p;
}
- (void)createFindCursorWindow
{ {
findCursorWindow_ = [[NSWindow alloc] initWithContentRect:[[[self window] screen] frame] findCursorWindow_ = [[NSWindow alloc] initWithContentRect:[[[self window] screen] frame]
styleMask:NSBorderlessWindowMask styleMask:NSBorderlessWindowMask
backing:NSBackingStoreBuffered backing:NSBackingStoreBuffered
defer:NO defer:YES
screen:[[self window] screen]]; screen:[[self window] screen]];
[findCursorWindow_ setOpaque:NO]; [findCursorWindow_ setOpaque:NO];
[findCursorWindow_ makeKeyAndOrderFront:nil]; [findCursorWindow_ makeKeyAndOrderFront:nil];
@@ -4252,37 +4252,79 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
@@ -4252,37 +4252,79 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
[findCursorWindow_ setAlphaValue:0]; [findCursorWindow_ setAlphaValue:0];
[[NSAnimationContext currentContext] setDuration:0.5]; [[NSAnimationContext currentContext] setDuration:0.5];
[[findCursorWindow_ animator] setAlphaValue:1]; [[findCursorWindow_ animator] setAlphaValue:1];
NSRect frame = [self visibleRect]; NSPoint p = [self globalCursorLocation];
double x = MARGIN + charWidth * ([dataSource cursorX] - 1) + charWidth/2;
double y = frame.origin.y + VMARGIN + lineHeight * ([dataSource cursorY] - 1) + lineHeight/2;
NSPoint p = NSMakePoint(x, y);
p = [self convertPoint:p toView:nil];
p = [[self window] convertBaseToScreen:p];
   
findCursorView_ = [[FindCursorView alloc] initWithFrame:NSMakeRect(0, 0, [[self window] frame].size.width, [[self window] frame].size.height)]; findCursorView_ = [[FindCursorView alloc] initWithFrame:NSMakeRect(0, 0, [[self window] frame].size.width, [[self window] frame].size.height)];
findCursorView_.cursor = p; findCursorView_.cursor = p;
findCursorView_.phase = 1;
[findCursorWindow_ setContentView:findCursorView_]; [findCursorWindow_ setContentView:findCursorView_];
[findCursorView_ release]; [findCursorView_ release];
findCursorBlinkTimer_ = [NSTimer scheduledTimerWithTimeInterval:0.1
target:self
selector:@selector(invalidateCursor)
userInfo:nil
repeats:YES];
} }
   
- (void)beginFindCursor - (void)invalidateCursor
{ {
if (!findCursorView_ || findCursorView_.phase) { [self setNeedsDisplay:YES];
[self createFullScreenWindow]; }
- (void)beginFindCursor:(BOOL)hold
{
[self showCursor];
if (!findCursorView_) {
[self createFindCursorWindow];
} else { } else {
[findCursorWindow_ setAlphaValue:1]; [findCursorWindow_ setAlphaValue:1];
[findCursorTeardownTimer_ invalidate]; }
[findCursorTeardownTimer_ invalidate];
autoHideFindCursor_ = NO;
if (hold) {
findCursorTeardownTimer_ = [NSTimer scheduledTimerWithTimeInterval:kFindCursorHoldTime
target:self
selector:@selector(startCloseFindCursorWindow)
userInfo:nil
repeats:NO];
} else {
findCursorTeardownTimer_ = nil;
}
}
- (void)placeFindCursorOnAutoHide
{
autoHideFindCursor_ = YES;
}
- (BOOL)isFindingCursor
{
return findCursorView_ != nil;
}
- (void)startCloseFindCursorWindow
{
findCursorTeardownTimer_ = nil;
if (autoHideFindCursor_ && [self isFindingCursor]) {
[self endFindCursor];
} }
} }
   
- (void)closeFindCursorWindow
{
[findCursorWindow_ close];
[findCursorBlinkTimer_ invalidate];
findCursorBlinkTimer_ = nil;
findCursorTeardownTimer_ = nil;
}
- (void)endFindCursor - (void)endFindCursor
{ {
[[findCursorWindow_ animator] setAlphaValue:0]; [[findCursorWindow_ animator] setAlphaValue:0];
[findCursorTeardownTimer_ invalidate];
findCursorTeardownTimer_ = [NSTimer scheduledTimerWithTimeInterval:[[NSAnimationContext currentContext] duration] findCursorTeardownTimer_ = [NSTimer scheduledTimerWithTimeInterval:[[NSAnimationContext currentContext] duration]
target:findCursorWindow_ target:self
selector:@selector(close) selector:@selector(closeFindCursorWindow)
userInfo:nil userInfo:nil
repeats:NO]; repeats:NO];
findCursorWindow_ = nil; findCursorWindow_ = nil;
@@ -5717,6 +5759,14 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
@@ -5717,6 +5759,14 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
cursorY, cursorY,
2.0, 2.0,
cursorHeight); cursorHeight);
imeCursorLastPos_ = cursorFrame.origin;
if ([self isFindingCursor]) {
NSPoint cp = [self globalCursorLocation];
if (!NSEqualPoints(findCursorView_.cursor, cp)) {
findCursorView_.cursor = cp;
[findCursorView_ setNeedsDisplay:YES];
}
}
[[self _dimmedColorFrom:[NSColor colorWithCalibratedRed:1 green:1 blue:0 alpha:1]] set]; [[self _dimmedColorFrom:[NSColor colorWithCalibratedRed:1 green:1 blue:0 alpha:1]] set];
NSRectFill(cursorFrame); NSRectFill(cursorFrame);
   
@@ -5811,6 +5861,17 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
@@ -5811,6 +5861,17 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
return bestValue; return bestValue;
} }
   
- (NSColor *)_randomColor
{
double r = arc4random() % 256;
double g = arc4random() % 256;
double b = arc4random() % 256;
return [NSColor colorWithDeviceRed:r/255.0
green:g/255.0
blue:b/255.0
alpha:1];
}
- (void)_drawCursorTo:(NSPoint*)toOrigin - (void)_drawCursorTo:(NSPoint*)toOrigin
{ {
int WIDTH, HEIGHT; int WIDTH, HEIGHT;
@@ -5889,7 +5950,13 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
@@ -5889,7 +5950,13 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
curX = floor(x1 * charWidth + MARGIN); curX = floor(x1 * charWidth + MARGIN);
curY = toOrigin ? toOrigin->y + (yStart + 1) * lineHeight - cursorHeight : curY = toOrigin ? toOrigin->y + (yStart + 1) * lineHeight - cursorHeight :
(yStart + [dataSource numberOfLines] - HEIGHT + 1) * lineHeight - cursorHeight; (yStart + [dataSource numberOfLines] - HEIGHT + 1) * lineHeight - cursorHeight;
if (!toOrigin && [self isFindingCursor]) {
NSPoint cp = [self globalCursorLocation];
if (!NSEqualPoints(findCursorView_.cursor, cp)) {
findCursorView_.cursor = cp;
[findCursorView_ setNeedsDisplay:YES];
}
}
NSColor *bgColor; NSColor *bgColor;
if (colorInvertedCursor) { if (colorInvertedCursor) {
if (reversed) { if (reversed) {
@@ -5930,6 +5997,9 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
@@ -5930,6 +5997,9 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
bgColor = [self defaultCursorColor]; bgColor = [self defaultCursorColor];
[[bgColor colorWithAlphaComponent:alpha] set]; [[bgColor colorWithAlphaComponent:alpha] set];
} }
if ([self isFindingCursor]) {
[[self _randomColor] set];
}
   
BOOL frameOnly; BOOL frameOnly;
switch (cursorType_) { switch (cursorType_) {
PseudoTerminal.m
+ 29
− 4
View file @ 5c9c3633
@@ -610,13 +610,19 @@ NSString *sessionsKey = @"sessions";
@@ -610,13 +610,19 @@ NSString *sessionsKey = @"sessions";
} }
} }
   
- (IBAction)findCursor:(id)sender
{
[[[self currentSession] TEXTVIEW] beginFindCursor:YES];
if (!(GetCurrentKeyModifiers() & cmdKey)) {
[[[self currentSession] TEXTVIEW] placeFindCursorOnAutoHide];
}
findCursorStartTime_ = [[NSDate date] timeIntervalSince1970];
}
// Save the current scroll position // Save the current scroll position
- (IBAction)saveScrollPosition:(id)sender - (IBAction)saveScrollPosition:(id)sender
{ {
[[[self currentSession] TEXTVIEW] beginFindCursor];
#if 0
[[self currentSession] saveScrollPosition]; [[self currentSession] saveScrollPosition];
#endif
} }
   
// Jump to the saved scroll position // Jump to the saved scroll position
@@ -1294,6 +1300,12 @@ NSString *sessionsKey = @"sessions";
@@ -1294,6 +1300,12 @@ NSString *sessionsKey = @"sessions";
   
- (void)windowDidResignKey:(NSNotification *)aNotification - (void)windowDidResignKey:(NSNotification *)aNotification
{ {
for (PTYSession *aSession in [self sessions]) {
if ([[aSession TEXTVIEW] isFindingCursor]) {
[[aSession TEXTVIEW] endFindCursor];
}
}
PtyLog(@"PseudoTerminal windowDidResignKey"); PtyLog(@"PseudoTerminal windowDidResignKey");
if ([[self window] alphaValue] > 0 && if ([[self window] alphaValue] > 0 &&
[self isHotKeyWindow] && [self isHotKeyWindow] &&
@@ -3631,6 +3643,20 @@ NSString *sessionsKey = @"sessions";
@@ -3631,6 +3643,20 @@ NSString *sessionsKey = @"sessions";
   
- (void)flagsChanged:(NSEvent *)theEvent - (void)flagsChanged:(NSEvent *)theEvent
{ {
NSUInteger modifierFlags = [theEvent modifierFlags];
if (!(modifierFlags & NSCommandKeyMask) &&
[[[self currentSession] TEXTVIEW] isFindingCursor]) {
// The cmd key was let up while finding the cursor
if ([[NSDate date] timeIntervalSinceDate:[NSDate dateWithTimeIntervalSince1970:findCursorStartTime_]] > kFindCursorHoldTime) {
// The time for it to hide automatically has passed, so just hide it
[[[self currentSession] TEXTVIEW] endFindCursor];
} else {
// Hide it after the minimum time
[[[self currentSession] TEXTVIEW] placeFindCursorOnAutoHide];
}
}
if (!_fullScreen) { if (!_fullScreen) {
return; return;
} }
@@ -3638,7 +3664,6 @@ NSString *sessionsKey = @"sessions";
@@ -3638,7 +3664,6 @@ NSString *sessionsKey = @"sessions";
// Being shown non-temporarily // Being shown non-temporarily
return; return;
} }
NSUInteger modifierFlags = [theEvent modifierFlags];
if ((modifierFlags & NSDeviceIndependentModifierFlagsMask) == NSCommandKeyMask && // you pressed exactly cmd if ((modifierFlags & NSDeviceIndependentModifierFlagsMask) == NSCommandKeyMask && // you pressed exactly cmd
([tabBarBackground isHidden] || [tabBarBackground alphaValue] == 0) && // the tab bar is not visible ([tabBarBackground isHidden] || [tabBarBackground alphaValue] == 0) && // the tab bar is not visible
fullScreenTabviewTimer_ == nil) { // not in the middle of doing this already fullScreenTabviewTimer_ == nil) { // not in the middle of doing this already
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