Fill out cursor column tracking API.

Author: Andrew Helsley

iTerm2XCTests/VT100GridTest.m

@@ -53,6 +53,9 @@ - (screen_char_t)gridBackgroundColorCode {
 - (void)gridCursorDidChangeLine {
 }
 
+- (void)gridCursorDidChangeCol {
+}
+
 - (iTermUnicodeNormalization)gridUnicodeNormalizationForm {
     return iTermUnicodeNormalizationNone;
 }

sources/PTYSession.m

@@ -8313,6 +8313,7 @@ - (void)screenDidReset {
                                                              inProfile:_profile];
     [_textview setNeedsDisplay:YES];
     _screen.trackCursorLineMovement = NO;
+    _screen.trackCursorColMovement = NO;
 }
 
 - (void)screenDidAppendStringToCurrentLine:(NSString *)string {

sources/VT100Grid.h

@@ -21,6 +21,7 @@
 - (iTermUnicodeNormalization)gridUnicodeNormalizationForm;
 - (void)gridCursorDidMove;
 - (void)gridCursorDidChangeLine;
+- (void)gridCursorDidChangeCol;
 @end
 
 @interface VT100Grid : NSObject<NSCopying>

sources/VT100Grid.m

@@ -183,6 +183,7 @@ - (void)setCursorX:(int)cursorX {
     int newX = MIN(size_.width, MAX(0, cursorX));
     if (newX != cursor_.x) {
         cursor_.x = newX;
+        [delegate_ gridCursorDidChangeCol];
         [delegate_ gridCursorDidMove];
     }
 }

sources/VT100Screen.h

@@ -58,6 +58,7 @@ extern int kVT100ScreenMinRows;
 @property(nonatomic, assign) BOOL saveToScrollbackInAlternateScreen;
 @property(nonatomic, retain) DVR *dvr;
 @property(nonatomic, assign) BOOL trackCursorLineMovement;
+@property(nonatomic, assign) BOOL trackCursorColMovement;
 @property(nonatomic, assign) BOOL appendToScrollbackWithStatusBar;
 @property(nonatomic, readonly) VT100GridAbsCoordRange lastCommandOutputRange;
 @property(nonatomic, assign) iTermUnicodeNormalization normalization;

sources/VT100Screen.m

@@ -52,6 +52,7 @@
 NSString *const kScreenStateNextCommandOutputStartKey = @"Output Start";
 NSString *const kScreenStateCursorVisibleKey = @"Cursor Visible";
 NSString *const kScreenStateTrackCursorLineMovementKey = @"Track Cursor Line";
+NSString *const kScreenStateTrackCursorColMovementKey = @"Track Cursor Col";
 NSString *const kScreenStateLastCommandOutputRangeKey = @"Last Command Output Range";
 NSString *const kScreenStateShellIntegrationInstalledKey = @"Shell Integration Installed";
 NSString *const kScreenStateLastCommandMarkKey = @"Last Command Mark";
@@ -5307,6 +5308,12 @@ - (void)gridCursorDidChangeLine {
     }
 }
 
+- (void)gridCursorDidChangeCol {
+    if (_trackCursorColMovement) {
+        [delegate_ screenCursorDidMoveToCol:currentGrid_.cursorX];
+    }
+}
+
 - (iTermUnicodeNormalization)gridUnicodeNormalizationForm {
     return _normalization;
 }
@@ -5364,6 +5371,7 @@ - (NSDictionary *)contentsDictionary {
             kScreenStateNextCommandOutputStartKey: [NSDictionary dictionaryWithGridAbsCoord:_startOfRunningCommandOutput],
             kScreenStateCursorVisibleKey: @(_cursorVisible),
             kScreenStateTrackCursorLineMovementKey: @(_trackCursorLineMovement),
+            kScreenStateTrackCursorColMovementKey: @(_trackCursorColMovement),
             kScreenStateLastCommandOutputRangeKey: [NSDictionary dictionaryWithGridAbsCoordRange:_lastCommandOutputRange],
             kScreenStateShellIntegrationInstalledKey: @(_shellIntegrationInstalled),
             kScreenStateLastCommandMarkKey: _lastCommandMark.guid ?: [NSNull null],
@@ -5478,6 +5486,7 @@ - (void)restoreFromDictionary:(NSDictionary *)dictionary
         _startOfRunningCommandOutput = [screenState[kScreenStateNextCommandOutputStartKey] gridAbsCoord];
         _cursorVisible = [screenState[kScreenStateCursorVisibleKey] boolValue];
         _trackCursorLineMovement = [screenState[kScreenStateTrackCursorLineMovementKey] boolValue];
+        _trackCursorColMovement = [screenState[kScreenStateTrackCursorColMovementKey] boolValue];
         _lastCommandOutputRange = [screenState[kScreenStateLastCommandOutputRangeKey] gridAbsCoordRange];
         _shellIntegrationInstalled = [screenState[kScreenStateShellIntegrationInstalledKey] boolValue];
 

sources/VT100ScreenDelegate.h

@@ -190,6 +190,9 @@
 // Only called if the trackCursorLineMovement property is set.
 - (void)screenCursorDidMoveToLine:(int)line;
 
+// Only called if the trackCursorColMovement property is set.
+- (void)screenCursorDidMoveToCol:(int)col;
+
 // Returns if there is a view.
 - (BOOL)screenHasView;