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

Add option to send text to shell at startup. Fix some warnings.

parent af22c5d8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
English.lproj/PreferencePanel.xib
+ 152
− 17
View file @ 840e9846
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="4910"/>
<integer value="2104"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1643,14 +1643,14 @@
<object class="NSTabViewItem" id="1020441673">
<string key="NSIdentifier">1</string>
<object class="NSView" key="NSView" id="63410958">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder" ref="551361709"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="171273669">
<reference key="NSNextResponder" ref="63410958"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{14, 135}, {153, 17}}</string>
<string key="NSFrame">{{14, 133}, {153, 17}}</string>
<reference key="NSSuperview" ref="63410958"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="328718421">
@@ -1666,7 +1666,7 @@
<object class="NSTextField" id="410537212">
<reference key="NSNextResponder" ref="63410958"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{129, 166}, {287, 22}}</string>
<string key="NSFrame">{{129, 188}, {287, 22}}</string>
<reference key="NSSuperview" ref="63410958"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="917175437">
@@ -1680,10 +1680,27 @@
<reference key="NSTextColor" ref="301846970"/>
</object>
</object>
<object class="NSTextField" id="1021993704">
<reference key="NSNextResponder" ref="63410958"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{219, 161}, {197, 22}}</string>
<reference key="NSSuperview" ref="63410958"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="258816153">
<int key="NSCellFlags">-1803944383</int>
<int key="NSCellFlags2">4195328</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="966507434"/>
<reference key="NSControlView" ref="1021993704"/>
<bool key="NSDrawsBackground">YES</bool>
<reference key="NSBackgroundColor" ref="652475538"/>
<reference key="NSTextColor" ref="301846970"/>
</object>
</object>
<object class="NSTextField" id="915947986">
<reference key="NSNextResponder" ref="63410958"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{14, 193}, {82, 34}}</string>
<string key="NSFrame">{{14, 215}, {82, 34}}</string>
<reference key="NSSuperview" ref="63410958"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="467256549">
@@ -2262,7 +2279,7 @@
<object class="NSMatrix" id="502895677">
<reference key="NSNextResponder" ref="63410958"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{29, 167}, {92, 38}}</string>
<string key="NSFrame">{{29, 189}, {92, 38}}</string>
<reference key="NSSuperview" ref="63410958"/>
<bool key="NSEnabled">YES</bool>
<int key="NSNumRows">2</int>
@@ -2459,7 +2476,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSMatrix" id="306700320">
<reference key="NSNextResponder" ref="63410958"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{29, 69}, {220, 58}}</string>
<string key="NSFrame">{{29, 67}, {220, 58}}</string>
<reference key="NSSuperview" ref="63410958"/>
<bool key="NSEnabled">YES</bool>
<int key="NSNumRows">3</int>
@@ -2688,7 +2705,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>NSStringPboardType</string>
</object>
</object>
<string key="NSFrame">{{129, 235}, {287, 39}}</string>
<string key="NSFrame">{{129, 252}, {287, 22}}</string>
<reference key="NSSuperview" ref="63410958"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="889049788">
@@ -2709,7 +2726,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="626292601">
<reference key="NSNextResponder" ref="63410958"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{129, 68}, {287, 22}}</string>
<string key="NSFrame">{{129, 66}, {287, 22}}</string>
<reference key="NSSuperview" ref="63410958"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="763353737">
@@ -2817,8 +2834,25 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSTextField" id="145854266">
<reference key="NSNextResponder" ref="63410958"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{30, 163}, {184, 17}}</string>
<reference key="NSSuperview" ref="63410958"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="322872359">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Send text to shell at startup:</string>
<reference key="NSSupport" ref="966507434"/>
<reference key="NSControlView" ref="145854266"/>
<reference key="NSBackgroundColor" ref="303715562"/>
<reference key="NSTextColor" ref="1014689419"/>
</object>
</object>
</object>
<string key="NSFrame">{{10, 33}, {433, 353}}</string>
<reference key="NSSuperview" ref="551361709"/>
</object>
<string key="NSLabel">General</string>
<reference key="NSColor" ref="303715562"/>
@@ -4179,7 +4213,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTabViewItem" id="262523333">
<string key="NSIdentifier">Item 5</string>
<object class="NSView" key="NSView" id="678134053">
<reference key="NSNextResponder" ref="551361709"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -4968,7 +5002,6 @@ 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"/>
@@ -6124,14 +6157,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="NSTabView" ref="551361709"/>
</object>
</object>
<reference key="NSSelectedTabViewItem" ref="262523333"/>
<reference key="NSSelectedTabViewItem" ref="1020441673"/>
<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="678134053"/>
<reference ref="63410958"/>
</object>
</object>
<object class="NSButton" id="1072403251">
@@ -12445,6 +12478,46 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">5407</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">bookmarkSettingChanged:</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="1021993704"/>
</object>
<int key="connectionID">5412</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="1021993704"/>
<reference key="destination" ref="306700320"/>
</object>
<int key="connectionID">5413</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">initialText</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="1021993704"/>
</object>
<int key="connectionID">5414</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">initialTextLabel</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="145854266"/>
</object>
<int key="connectionID">5415</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="1021993704"/>
<reference key="destination" ref="155244235"/>
</object>
<int key="connectionID">5416</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -12883,6 +12956,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="836094083"/>
<reference ref="365100074"/>
<reference ref="511770894"/>
<reference ref="145854266"/>
<reference ref="1021993704"/>
</object>
<reference key="parent" ref="1020441673"/>
</object>
@@ -17822,6 +17897,34 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="319417609"/>
<reference key="parent" ref="511639492"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5408</int>
<reference key="object" ref="145854266"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="322872359"/>
</object>
<reference key="parent" ref="63410958"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5409</int>
<reference key="object" ref="322872359"/>
<reference key="parent" ref="145854266"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5410</int>
<reference key="object" ref="1021993704"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="258816153"/>
</object>
<reference key="parent" ref="63410958"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5411</int>
<reference key="object" ref="258816153"/>
<reference key="parent" ref="1021993704"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -17897,6 +18000,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>2129.IBPluginDependency</string>
<string>2129.ImportedFromIB2</string>
<string>2131.IBPluginDependency</string>
<string>2131.IBViewBoundsToFrameTransform</string>
<string>2131.ImportedFromIB2</string>
<string>2132.IBPluginDependency</string>
<string>2132.ImportedFromIB2</string>
@@ -18926,14 +19030,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>5403.IBPluginDependency</string>
<string>5403.IBViewBoundsToFrameTransform</string>
<string>5404.IBPluginDependency</string>
<string>5408.IBPluginDependency</string>
<string>5409.IBPluginDependency</string>
<string>5410.IBPluginDependency</string>
<string>5410.IBViewBoundsToFrameTransform</string>
<string>5410.ImportedFromIB2</string>
<string>5411.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{233, 117}, {800, 411}}</string>
<string>{{193, 290}, {800, 411}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{233, 117}, {800, 411}}</string>
<string>{{193, 290}, {800, 411}}</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{227, 537}, {616, 0}}</string>
@@ -19026,12 +19136,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDAQAAw0sAAA</bytes>
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDAQAAw6QAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABDFQAAw4gAAA</bytes>
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -20273,6 +20386,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABC2AAAwqoAAA</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>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDWwAAwzUAAA</bytes>
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -20291,7 +20412,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">5407</int>
<int key="maxID">5416</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -20721,6 +20842,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>hotkeyLabel</string>
<string>hotkeyTogglesWindow</string>
<string>idleCode</string>
<string>initialText</string>
<string>initialTextLabel</string>
<string>instantReplay</string>
<string>irMemory</string>
<string>jobName</string>
@@ -20924,6 +21047,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>NSTextField</string>
<string>NSButton</string>
<string>NSTextField</string>
<string>NSTextField</string>
<string>NSTextField</string>
<string>NSButton</string>
<string>NSTextField</string>
<string>NSButton</string>
@@ -21130,6 +21255,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>hotkeyLabel</string>
<string>hotkeyTogglesWindow</string>
<string>idleCode</string>
<string>initialText</string>
<string>initialTextLabel</string>
<string>instantReplay</string>
<string>irMemory</string>
<string>jobName</string>
@@ -21684,6 +21811,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="name">idleCode</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">initialText</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">initialTextLabel</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">instantReplay</string>
<string key="candidateClassName">NSButton</string>
Headers/iTerm/PreferencePanel.h
+ 2
− 0
View file @ 840e9846
@@ -294,12 +294,14 @@ typedef enum { CURSOR_UNDERLINE, CURSOR_VERTICAL, CURSOR_BOX } ITermCursorType;
IBOutlet NSPopUpButton *bookmarkShortcutKey;
IBOutlet NSMatrix *bookmarkCommandType;
IBOutlet NSTextField *bookmarkCommand;
IBOutlet NSTextField *initialText;
IBOutlet NSMatrix *bookmarkDirectoryType;
IBOutlet NSTextField *bookmarkDirectory;
IBOutlet NSTextField *bookmarkShortcutKeyLabel;
IBOutlet NSTextField *bookmarkShortcutKeyModifiersLabel;
IBOutlet NSTextField *bookmarkTagsLabel;
IBOutlet NSTextField *bookmarkCommandLabel;
IBOutlet NSTextField *initialTextLabel;
IBOutlet NSTextField *bookmarkDirectoryLabel;
IBOutlet NSTextField *bookmarkUrlSchemesHeaderLabel;
IBOutlet NSTextField *bookmarkUrlSchemesLabel;
ITAddressBookMgr.h
+ 1
− 0
View file @ 840e9846
@@ -42,6 +42,7 @@
#define KEY_DESCRIPTION @"Description"
#define KEY_CUSTOM_COMMAND @"Custom Command"
#define KEY_COMMAND @"Command"
#define KEY_INITIAL_TEXT @"Initial Text"
#define KEY_CUSTOM_DIRECTORY @"Custom Directory" // values are Yes, No, Recycle
#define KEY_WORKING_DIRECTORY @"Working Directory"
#define KEY_TERMINAL_PROFILE @"Terminal Profile"
PTYSession.m
+ 6
− 2
View file @ 840e9846
@@ -506,7 +506,11 @@ static NSString* SESSION_ARRANGEMENT_WORKING_DIRECTORY = @"Working Directory";
height:[SCREEN height]
isUTF8:isUTF8
asLoginSession:asLoginSession];
NSString *initialText = [addressBookEntry objectForKey:KEY_INITIAL_TEXT];
if ([initialText length]) {
[SHELL writeTask:[initialText dataUsingEncoding:[self encoding]]];
[SHELL writeTask:[@"\n" dataUsingEncoding:[self encoding]]];
}
}
 
- (void)_maybeWarnAboutShortLivedSessions
@@ -929,7 +933,7 @@ static NSString* SESSION_ARRANGEMENT_WORKING_DIRECTORY = @"Working Directory";
 
unsigned short keycode = [event keyCode];
if (debugKeyDown) {
NSLog([NSString stringWithFormat:@"event:%@ (%x+%x)[%@][%@]:%x(%c) <%d>", event,modflag,keycode,keystr,unmodkeystr,unicode,unicode,(modflag & NSNumericPadKeyMask)]);
NSLog(@"event:%@ (%x+%x)[%@][%@]:%x(%c) <%d>", event,modflag,keycode,keystr,unmodkeystr,unicode,unicode,(modflag & NSNumericPadKeyMask));
}
DebugLog([NSString stringWithFormat:@"event:%@ (%x+%x)[%@][%@]:%x(%c) <%d>", event,modflag,keycode,keystr,unmodkeystr,unicode,unicode,(modflag & NSNumericPadKeyMask)]);
 
PTYTask.m
+ 1
− 1
View file @ 840e9846
@@ -527,7 +527,7 @@ static void reapchild(int n)
return;
}
 
tty = [[NSString stringWithCString:theTtyname] retain];
tty = [[NSString stringWithUTF8String:theTtyname] retain];
NSParameterAssert(tty != nil);
 
fcntl(fd,F_SETFL,O_NONBLOCK);
PreferencePanel.m
+ 16
− 0
View file @ 840e9846
@@ -175,11 +175,13 @@ static float versionNumber;
[bookmarkShortcutKeyModifiersLabel setHidden:YES];
[bookmarkTagsLabel setHidden:YES];
[bookmarkCommandLabel setHidden:YES];
[initialTextLabel setHidden:YES];
[bookmarkDirectoryLabel setHidden:YES];
[bookmarkShortcutKey setHidden:YES];
[tags setHidden:YES];
[bookmarkCommandType setHidden:YES];
[bookmarkCommand setHidden:YES];
[initialText setHidden:YES];
[bookmarkDirectoryType setHidden:YES];
[bookmarkDirectory setHidden:YES];
[bookmarkUrlSchemes setHidden:YES];
@@ -529,6 +531,7 @@ static float versionNumber;
} else {
[lionStyleFullscreen setHidden:YES];
}
[initialText setContinuous:YES];
[blurRadius setContinuous:YES];
[transparency setContinuous:YES];
[dimmingAmount setContinuous:YES];
@@ -2045,12 +2048,17 @@ static float versionNumber;
NSString* name;
NSString* shortcut;
NSString* command;
NSString* text;
NSString* dir;
NSString* customCommand;
NSString* customDir;
name = [dict objectForKey:KEY_NAME];
shortcut = [dict objectForKey:KEY_SHORTCUT];
command = [dict objectForKey:KEY_COMMAND];
text = [dict objectForKey:KEY_INITIAL_TEXT];
if (!text) {
text = @"";
}
dir = [dict objectForKey:KEY_WORKING_DIRECTORY];
customCommand = [dict objectForKey:KEY_CUSTOM_COMMAND];
customDir = [dict objectForKey:KEY_CUSTOM_DIRECTORY];
@@ -2067,6 +2075,7 @@ static float versionNumber;
[bookmarkCommandType selectCellWithTag:1];
}
[bookmarkCommand setStringValue:command];
[initialText setStringValue:text];
 
if ([customDir isEqualToString:@"Yes"]) {
[bookmarkDirectoryType selectCellWithTag:0];
@@ -2401,6 +2410,10 @@ static float versionNumber;
NSString* name = [bookmarkName stringValue];
NSString* shortcut = [self shortcutKeyForTag:[[bookmarkShortcutKey selectedItem] tag]];
NSString* command = [bookmarkCommand stringValue];
NSString *text = [initialText stringValue];
if (!text) {
text = @"";
}
NSString* dir = [bookmarkDirectory stringValue];
 
NSString* customCommand = [[bookmarkCommandType selectedCell] tag] == 0 ? @"Yes" : @"No";
@@ -2464,6 +2477,7 @@ static float versionNumber;
[newDict setObject:shortcut forKey:KEY_SHORTCUT];
}
[newDict setObject:command forKey:KEY_COMMAND];
[newDict setObject:text forKey:KEY_INITIAL_TEXT];
[newDict setObject:dir forKey:KEY_WORKING_DIRECTORY];
[newDict setObject:customCommand forKey:KEY_CUSTOM_COMMAND];
[newDict setObject:customDir forKey:KEY_CUSTOM_DIRECTORY];
@@ -2760,6 +2774,7 @@ static float versionNumber;
obj == rowsField ||
obj == scrollbackLines ||
obj == terminalType ||
obj == initialText ||
obj == idleCode) {
[self bookmarkSettingChanged:nil];
} else if (obj == tagFilter) {
@@ -3038,6 +3053,7 @@ static float versionNumber;
[newDict removeObjectForKey:KEY_BONJOUR_SERVICE];
[newDict removeObjectForKey:KEY_BONJOUR_SERVICE_ADDRESS];
[newDict setObject:@"" forKey:KEY_COMMAND];
[newDict setObject:@"" forKey:KEY_INITIAL_TEXT];
[newDict setObject:@"No" forKey:KEY_CUSTOM_COMMAND];
[newDict setObject:@"" forKey:KEY_WORKING_DIRECTORY];
[newDict setObject:@"No" forKey:KEY_CUSTOM_DIRECTORY];
iTermApplicationDelegate.m
+ 3
− 3
View file @ 840e9846
@@ -792,12 +792,12 @@ void DebugLog(NSString* value)
{
BOOL sessions = NO;
BOOL panes = NO;
BOOL normal = NO;
BOOL noBroadcast = NO;
PseudoTerminal *frontTerminal;
frontTerminal = [[iTermController sharedInstance] currentTerminal];
switch ([frontTerminal broadcastMode]) {
case BROADCAST_OFF:
normal = YES;
noBroadcast = YES;
break;
 
case BROADCAST_TO_ALL_TABS:
@@ -813,7 +813,7 @@ void DebugLog(NSString* value)
}
[sendInputToAllSessions setState:sessions];
[sendInputToAllPanes setState:panes];
[sendInputNormally setState:normal];
[sendInputNormally setState:noBroadcast];
}
 
- (void) nonTerminalWindowBecameKey: (NSNotification *) aNotification
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