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

Adhoc build 1.0.0.20140505_221034

parent 476a8cc8
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -1138,6 +1138,7 @@ typedef enum {
// This is run in PTYTask's thread. It parses the input here and then queues an async task to run
// in the main thread to execute the parsed tokens.
- (void)threadedReadTask:(char *)buffer length:(int)length {
NSLog(@"Read: %.*s", length, buffer);
// Pass the input stream to the parser.
[_terminal.parser putStreamData:buffer length:length];
Loading
Loading
@@ -1171,13 +1172,14 @@ typedef enum {
- (void)executeTokens:(const CVector *)vector bytesHandled:(int)length {
STOPWATCH_START(executing);
int n = CVectorCount(vector);
NSLog(@"Executing %d tokens...", n);
for (int i = 0; i < n; i++) {
if (_exited || !_terminal || (self.tmuxMode != TMUX_GATEWAY && [_shell hasMuteCoprocess])) {
break;
}
VT100Token *token = CVectorGetObject(vector, i);
DLog(@"Execute token %@ cursor=(%d, %d)", token, _screen.cursorX - 1, _screen.cursorY - 1);
NSLog(@"Execute token %@ cursor=(%d, %d)", token, _screen.cursorX - 1, _screen.cursorY - 1);
[_terminal executeToken:token];
}
Loading
Loading
Loading
Loading
@@ -6097,8 +6097,10 @@ NSString *kSessionsKVCKey = @"sessions";
return [[iTermDirectoriesModel sharedInstance] haveEntriesForHost:[[self currentSession] currentHost]];
} else if ([item action] == @selector(movePaneDividerDown:)) {
int height = [[[self currentSession] textview] lineHeight];
return [[self currentTab] canMoveCurrentSessionDividerBy:height
BOOL result = [[self currentTab] canMoveCurrentSessionDividerBy:height
horizontally:NO];
NSLog(@"Return %d", (int)result);
return result;
} else if ([item action] == @selector(movePaneDividerUp:)) {
int height = [[[self currentSession] textview] lineHeight];
return [[self currentTab] canMoveCurrentSessionDividerBy:-height
Loading
Loading
Loading
Loading
@@ -189,12 +189,12 @@
<string>MainMenu</string>
<key>NSPrincipalClass</key>
<string>iTermApplication</string>
<key>NSSupportsAutomaticGraphicsSwitching</key>
<true/>
<key>SUPublicDSAKeyFile</key>
<string>dsa_pub.pem</string>
<key>NSSupportsAutomaticGraphicsSwitching</key>
<true/>
<key>SUFeedURLForTesting</key>
<string>http://iterm2.com/appcasts/nightly.xml</string>
<string>http://iterm2.com/appcasts/testing.xml</string>
<key>SUFeedURLForFinal</key>
<string>http://iterm2.com/appcasts/final.xml</string>
</dict>
Loading
Loading
Loading
Loading
@@ -136,14 +136,18 @@ static const int kMaxDirectoriesToSavePerHost = 200;
}
 
- (void)addPath:(NSString *)path {
NSLog(@"addPath: %@", path);
NSArray *parts = [iTermDirectoryTree componentsInPath:path];
if (!parts.count) {
NSLog(@"Count is 0");
return;
}
NSLog(@"parts=%@", parts);
iTermDirectoryTreeNode *parent = _root;
parent.count = parent.count + 1;
for (int i = 0; i < parts.count; i++) {
NSString *part = parts[i];
NSLog(@"Handle part #%d: %@", i, part);
iTermDirectoryTreeNode *node = parent.children[part];
if (!node) {
node = [iTermDirectoryTreeNode nodeWithComponent:part];
Loading
Loading
@@ -152,6 +156,7 @@ static const int kMaxDirectoriesToSavePerHost = 200;
node.count = node.count + 1;
parent = node;
}
NSLog(@"addPath: returning");
}
 
- (void)removePath:(NSString *)path {
Loading
Loading
@@ -337,6 +342,7 @@ static const int kMaxDirectoriesToSavePerHost = 200;
- (void)recordUseOfPath:(NSString *)path
onHost:(VT100RemoteHost *)host
isChange:(BOOL)isChange {
NSLog(@"Record use of path: %@", path);
if (!isChange) {
return;
}
Loading
Loading
@@ -353,6 +359,7 @@ static const int kMaxDirectoriesToSavePerHost = 200;
entry = [[[iTermDirectoryEntry alloc] init] autorelease];
entry.path = path;
[array addObject:entry];
NSLog(@"Call addPath:");
[_tree addPath:path];
}
entry.useCount = entry.useCount + 1;
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment