Use set-control-client-attr ready instead of start-control. Use dump-state for...

Use set-control-client-attr ready instead of start-control. Use dump-state for history. Remove -C arg from list-windows and use -F format instead

PTYSession.m

@@ -60,6 +60,7 @@
 #define DEBUG_KEYDOWNDUMP     0
 #define ASK_ABOUT_OUTDATED_FORMAT @"AskAboutOutdatedKeyMappingForGuid%@"
+//#define TMUX_VERBOSE_LOGGING
 #ifdef TMUX_VERBOSE_LOGGING
 #define TmuxLog NSLog
 #else

TSVParser.h

@@ -23,12 +23,12 @@
 @interface TSVParser : NSObject
-+ (TSVDocument *)documentFromString:(NSString *)string;
++ (TSVDocument *)documentFromString:(NSString *)string withFields:(NSArray *)fields;
 @end
 @interface NSString (TSV)
-- (TSVDocument *)tsvDocument;
+- (TSVDocument *)tsvDocumentWithFields:(NSArray *)fields;
 @end
\ No newline at end of file

TSVParser.m

@@ -52,16 +52,15 @@
 @implementation TSVParser
-+ (TSVDocument *)documentFromString:(NSString *)string
++ (TSVDocument *)documentFromString:(NSString *)string withFields:(NSArray *)fields
 {
     NSArray *lines = [string componentsSeparatedByString:@"\n"];
     if ([lines count] == 0) {
         return nil;
     }
     TSVDocument *doc = [[[TSVDocument alloc] init] autorelease];
-    NSString *header = [lines objectAtIndex:0];
-    doc.columns = [[[header componentsSeparatedByString:@"\t"] mutableCopy] autorelease];
-    for (int i = 1; i < lines.count; i++) {
+    doc.columns = [[fields copy] autorelease];
+    for (int i = 0; i < lines.count; i++) {
         NSString *row = [lines objectAtIndex:i];
         [doc.records addObject:[row componentsSeparatedByString:@"\t"]];
     }
@@ -72,9 +71,9 @@
 @implementation NSString (TSV)
-- (TSVDocument *)tsvDocument
+- (TSVDocument *)tsvDocumentWithFields:(NSArray *)fields
 {
-    return [TSVParser documentFromString:self];
+    return [TSVParser documentFromString:self withFields:fields];
 }
 @end
\ No newline at end of file

TmuxController.m

@@ -16,6 +16,12 @@
 #import "PTYTab.h"
 #import "RegexKitLite.h"
+static NSString *kListWindowsFormat = @"\"#{session_name}\t#{window_id}\t"
+    "#{window_name}\t"
+    "#{window_width}\t#{window_height}\t"
+    "#{window_layout_ex}\t"
+    "#{?window_active,1,0}\"";
+
 @interface TmuxController (Private)
 - (void)retainWindow:(int)window withTab:(PTYTab *)tab;
@@ -76,9 +82,17 @@
     [windowOpener updateLayoutInTab:tab];
 }
+- (NSArray *)listWindowFields
+{
+    return [NSArray arrayWithObjects:@"session_name", @"window_id",
+            @"window_name", @"window_width", @"window_height",
+            @"window_layout", @"window_active", nil];
+
+}
+
 - (void)initialListWindowsResponse:(NSString *)response
 {
-    TSVDocument *doc = [response tsvDocument];
+    TSVDocument *doc = [response tsvDocumentWithFields:[self listWindowFields]];
     if (!doc) {
         [gateway_ abortWithErrorMessage:[NSString stringWithFormat:@"Bad response for initial list windows request: %@", response]];
         return;
@@ -94,7 +108,7 @@
 - (void)openWindowsInitial
 {
-    [gateway_ sendCommand:@"list-windows -C"
+    [gateway_ sendCommand:[NSString stringWithFormat:@"list-windows -F %@", kListWindowsFormat]
            responseTarget:self
          responseSelector:@selector(initialListWindowsResponse:)];
 }
@@ -265,7 +279,7 @@
 - (void)openWindowWithId:(int)windowId
 {
     // Get the window's basic info to prep the creation of a TmuxWindowOpener.
-    [gateway_ sendCommand:[NSString stringWithFormat:@"list-windows -C -I %d", windowId]
+    [gateway_ sendCommand:[NSString stringWithFormat:@"list-windows -F %@ -I %d", kListWindowsFormat, windowId]
            responseTarget:self
          responseSelector:@selector(listedWindowsToOpenOne:forWindowId:)
            responseObject:[NSNumber numberWithInt:windowId]];
@@ -305,7 +319,7 @@
 - (void)listedWindowsToOpenOne:(NSString *)response forWindowId:(NSNumber *)windowId
 {
-    TSVDocument *doc = [response tsvDocument];
+    TSVDocument *doc = [response tsvDocumentWithFields:[self listWindowFields]];
     if (!doc) {
         [gateway_ abortWithErrorMessage:[NSString stringWithFormat:@"Bad response for list windows request: %@",
                                          response]];

TmuxGateway.m

@@ -10,6 +10,7 @@
 #import "TmuxController.h"
 #import "iTermApplicationDelegate.h"
+//#define TMUX_VERBOSE_LOGGING
 #ifdef TMUX_VERBOSE_LOGGING
 #define TmuxLog NSLog
 #else

TmuxWindowOpener.m

@@ -88,10 +88,10 @@
                                                  callingSelector:@selector(appendRequestsForNode:toArray:)
                                                         onTarget:self
                                                       withObject:cmdList];
+    // append start-control
     if (initial) {
         [cmdList addObject:[self dictForStartControlCommand]];
     }
-    // append start-control
     [gateway_ sendCommandList:cmdList];
 }
@@ -143,7 +143,8 @@
 - (NSDictionary *)dictForStartControlCommand
 {
     ++pendingRequests_;
-    return [gateway_ dictionaryForCommand:@"start-control"
+    NSString *command = @"set-control-client-attr ready";
+    return [gateway_ dictionaryForCommand:command
                            responseTarget:self
                          responseSelector:@selector(requestDidComplete)
                            responseObject:nil];
@@ -170,7 +171,7 @@
 - (NSDictionary *)dictForDumpStateForWindowPane:(NSNumber *)wp
 {
     ++pendingRequests_;
-    NSString *command = [NSString stringWithFormat:@"dump-state -t %%%d", [wp intValue]];
+    NSString *command = [NSString stringWithFormat:@"dump-state -e -t %%%d", [wp intValue]];
     return [gateway_ dictionaryForCommand:command
                            responseTarget:self
                          responseSelector:@selector(dumpStateResponse:pane:)
@@ -181,7 +182,7 @@
                         alt:(BOOL)alternate
 {
     ++pendingRequests_;
-    NSString *command = [NSString stringWithFormat:@"dump-history %@-t %%%d -l 1000",
+    NSString *command = [NSString stringWithFormat:@"dump-state -h %@-t %%%d -l 1000",
                          (alternate ? @"-a " : @""), [wp intValue]];
     return [gateway_ dictionaryForCommand:command
                            responseTarget:self