Separate control of the vertical cursor guide from the horizontal guide.

Andrew Helsley · Andrew Helsley · commit 6827cb36ef39 · 2019-03-26T01:21:01.000-07:00
diff --git a/Interfaces/MainMenu.xib b/Interfaces/MainMenu.xib
@@ -668,6 +668,12 @@ Gw
                                     <action selector="toggleCursorGuide:" target="-1" id="Vxk-ww-Ugb"/>
                                 </connections>
                             </menuItem>
+                            <menuItem title="Show Vertical Cursor Guide" identifier="Show Vertical Cursor Guide" id="pPk-Wb-7b8">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="toggleVCursorGuide:" target="-1" id="9p8-5y-S8s"/>
+                                </connections>
+                            </menuItem>
                             <menuItem title="Show Timestamps" keyEquivalent="E" identifier="Show Timestamps" id="TnF-kz-Lf0">
                                 <connections>
                                     <action selector="toggleShowTimestamps:" target="-1" id="oGg-h2-Ex7"/>
diff --git a/Interfaces/PreferencePanel.xib b/Interfaces/PreferencePanel.xib
@@ -1545,6 +1545,7 @@ DQ
                 <outlet property="_useSmartCursorColor" destination="4889" id="GhQ-EU-ndl"/>
                 <outlet property="_useTabColor" destination="j7F-r8-oes" id="HoY-6m-E99"/>
                 <outlet property="_useUnderlineColor" destination="Cqf-RZ-UnO" id="HoY-6m-xxx"/>
+                <outlet property="_useVGuide" destination="CDY-GW-Oi5" id="31z-FX-BPt"/>
                 <outlet property="delegate" destination="HVI-63-mNz" id="NFg-pP-EcM"/>
                 <outlet property="view" destination="SCN-fS-hNB" id="yvb-17-eJa"/>
             </connections>
@@ -2272,7 +2273,7 @@ DQ
                     </textFieldCell>
                 </textField>
                 <customView id="Yny-j0-8Wk" customClass="CPKColorWell">
-                    <rect key="frame" x="304" y="73" width="32" height="21"/>
+                    <rect key="frame" x="304" y="84" width="32" height="21"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="boolean" keyPath="alphaAllowed" value="YES"/>
@@ -2323,7 +2324,7 @@ DQ
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                 </customView>
                 <button id="Rpk-o3-4ec">
-                    <rect key="frame" x="193" y="74" width="105" height="18"/>
+                    <rect key="frame" x="173" y="85" width="105" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="check" title="Cursor guide" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="Ai2-im-FjJ">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -2334,6 +2335,18 @@ DQ
                         <outlet property="nextKeyView" destination="4896" id="kw5-A8-LVc"/>
                     </connections>
                 </button>
+                <button id="CDY-GW-Oi5" userLabel="Use Vertical Guide">
+                    <rect key="frame" x="173" y="65" width="148" height="18"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <buttonCell key="cell" type="check" title="Vertical cursor guide" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="2Co-vY-kv7">
+                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="settingChanged:" target="p8i-eM-oBc" id="T94-1y-jPl"/>
+                        <outlet property="nextKeyView" destination="4896" id="H8S-V8-cYY"/>
+                    </connections>
+                </button>
                 <customView id="2286" customClass="CPKColorWell">
                     <rect key="frame" x="442" y="211" width="32" height="21"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
diff --git a/iTerm2XCTests/VT100ScreenTest.m b/iTerm2XCTests/VT100ScreenTest.m
@@ -748,6 +748,12 @@ - (void)screenSetHighlightCursorLine:(BOOL)highlight {
 - (void)screenCursorDidMoveToLine:(int)line {
 }
 
+- (void)screenSetHighlightCursorCol:(BOOL)highlight {
+}
+
+- (void)screenCursorDidMoveToCol:(int)line {
+}
+
 - (void)screenSaveScrollPosition {
 }
 
diff --git a/sources/ITAddressBookMgr.h b/sources/ITAddressBookMgr.h
@@ -114,6 +114,7 @@
 #define KEY_USE_UNDERLINE_COLOR    @"Use Underline Color"
 #define KEY_CURSOR_BOOST           @"Cursor Boost"
 #define KEY_USE_CURSOR_GUIDE       @"Use Cursor Guide"
+#define KEY_USE_VERT_CURSOR_GUIDE  @"Use Vertical Cursor Guide"
 #define KEY_CURSOR_GUIDE_COLOR     @"Cursor Guide Color"
 #define KEY_BADGE_COLOR            @"Badge Color"
 
diff --git a/sources/Metal/Renderers/iTermCursorGuideRenderer.h b/sources/Metal/Renderers/iTermCursorGuideRenderer.h
@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface iTermCursorGuideRenderer : NSObject<iTermMetalCellRenderer>
 
 @property (nonatomic) BOOL enabled;
+@property (nonatomic) BOOL venabled;
 
 - (nullable instancetype)initWithDevice:(id<MTLDevice>)device NS_DESIGNATED_INITIALIZER;
 - (instancetype)init NS_UNAVAILABLE;
diff --git a/sources/Metal/Renderers/iTermCursorGuideRenderer.m b/sources/Metal/Renderers/iTermCursorGuideRenderer.m
@@ -141,7 +141,7 @@ - (void)drawWithFrameData:(iTermMetalFrameData *)frameData
                                      textures:@{ @(iTermTextureIndexPrimary): tState.texture } ];
     }
 
-    if (tState.col >= 0 && self.enabled) {
+    if (tState.col >= 0 && self.venabled) {
         [_cellRenderer drawWithTransientState:tState
                                 renderEncoder:frameData.renderEncoder
                              numberOfVertices:6
diff --git a/sources/Metal/iTermMetalDriver.h b/sources/Metal/iTermMetalDriver.h
@@ -61,6 +61,7 @@ NS_CLASS_AVAILABLE(10_11, NA)
 @property (nonatomic, readonly) BOOL showBroadcastStripes;
 @property (nonatomic, readonly) NSColor *cursorGuideColor;
 @property (nonatomic, readonly) BOOL cursorGuideEnabled;
+@property (nonatomic, readonly) BOOL cursorVGuideEnabled;
 @property (nonatomic, readonly) vector_float4 fullScreenFlashColor;
 @property (nonatomic, readonly) BOOL timestampsEnabled;
 @property (nonatomic, readonly) NSColor *timestampsBackgroundColor;
diff --git a/sources/Metal/iTermMetalDriver.m b/sources/Metal/iTermMetalDriver.m
@@ -644,7 +644,8 @@ - (BOOL)shouldCreateIntermediateRenderPassDescriptor:(iTermMetalFrameData *)fram
     if (!_broadcastStripesRenderer.rendererDisabled && frameData.perFrameState.showBroadcastStripes) {
         return YES;
     }
-    if (!_cursorGuideRenderer.rendererDisabled && frameData.perFrameState.cursorGuideEnabled) {
+    if (!_cursorGuideRenderer.rendererDisabled && (frameData.perFrameState.cursorGuideEnabled
+                                                   || frameData.perFrameState.cursorVGuideEnabled)) {
         return YES;
     }
 
@@ -970,6 +971,7 @@ - (void)updateCursorGuideRendererForFrameData:(iTermMetalFrameData *)frameData {
     }
     [_cursorGuideRenderer setColor:frameData.perFrameState.cursorGuideColor];
     _cursorGuideRenderer.enabled = frameData.perFrameState.cursorGuideEnabled;
+    _cursorGuideRenderer.venabled = frameData.perFrameState.cursorVGuideEnabled;
 }
 
 - (void)updateTimestampsRendererForFrameData:(iTermMetalFrameData *)frameData {
diff --git a/sources/PTYSession.h b/sources/PTYSession.h
@@ -422,6 +422,7 @@ typedef enum {
 @property(nonatomic, readonly) BOOL hasSelection;
 
 @property(nonatomic, assign) BOOL highlightCursorLine;
+@property(nonatomic, assign) BOOL highlightCursorCol;
 
 // Used to help remember total ordering on views while one is maximized
 @property(nonatomic, assign) NSPoint savedRootRelativeOrigin;
diff --git a/sources/PTYSession.m b/sources/PTYSession.m
@@ -205,6 +205,7 @@
 static NSString *const SESSION_ARRANGEMENT_DIRECTORIES = @"Directories";  // Array of strings
 static NSString *const SESSION_ARRANGEMENT_HOSTS = @"Hosts";  // Array of VT100RemoteHost
 static NSString *const SESSION_ARRANGEMENT_CURSOR_GUIDE = @"Cursor Guide";  // BOOL
+static NSString *const SESSION_ARRANGEMENT_VCURSOR_GUIDE = @"Vertical Cursor Guide";  // BOOL
 static NSString *const SESSION_ARRANGEMENT_LAST_DIRECTORY = @"Last Directory";  // NSString
 static NSString *const SESSION_ARRANGEMENT_LAST_DIRECTORY_IS_UNSUITABLE_FOR_OLD_PWD = @"Last Directory Is Remote";  // BOOL
 static NSString *const SESSION_ARRANGEMENT_SELECTION = @"Selection";  // Dictionary for iTermSelection.
@@ -1175,6 +1176,9 @@ + (void)finishInitializingArrangementOriginatedSession:(PTYSession *)aSession
         if (arrangement[SESSION_ARRANGEMENT_CURSOR_GUIDE]) {
             aSession.textview.highlightCursorLine = [arrangement[SESSION_ARRANGEMENT_CURSOR_GUIDE] boolValue];
         }
+        if (arrangement[SESSION_ARRANGEMENT_VCURSOR_GUIDE]) {
+            aSession.textview.highlightCursorLine = [arrangement[SESSION_ARRANGEMENT_VCURSOR_GUIDE] boolValue];
+        }
         aSession->_lastMark = [aSession.screen.lastMark retain];
         aSession.lastRemoteHost = aSession.screen.lastRemoteHost;
         if (arrangement[SESSION_ARRANGEMENT_LAST_DIRECTORY]) {
@@ -3463,6 +3467,8 @@ - (void)loadInitialColorTable
     }
     _textview.highlightCursorLine = [iTermProfilePreferences boolForKey:KEY_USE_CURSOR_GUIDE
                                                               inProfile:_profile];
+    _textview.highlightCursorCol = [iTermProfilePreferences boolForKey:KEY_USE_VERT_CURSOR_GUIDE
+                                                             inProfile:_profile];
 }
 
 - (NSColor *)tabColorInProfile:(NSDictionary *)profile
@@ -3645,6 +3651,8 @@ - (void)setPreferencesFromAddressBookEntry:(NSDictionary *)aePrefs {
     if (!_cursorGuideSettingHasChanged) {
         _textview.highlightCursorLine = [iTermProfilePreferences boolForKey:KEY_USE_CURSOR_GUIDE
                                                                   inProfile:aDict];
+        _textview.highlightCursorCol = [iTermProfilePreferences boolForKey:KEY_USE_VERT_CURSOR_GUIDE
+                                                                 inProfile:aDict];
     }
 
     for (i = 0; i < 16; i++) {
@@ -4371,6 +4379,7 @@ - (NSDictionary *)arrangementWithContents:(BOOL)includeContents {
             [NSDictionary dictionaryWithGridCoordRange:range];
         result[SESSION_ARRANGEMENT_ALERT_ON_NEXT_MARK] = @(_alertOnNextMark);
         result[SESSION_ARRANGEMENT_CURSOR_GUIDE] = @(_textview.highlightCursorLine);
+        result[SESSION_ARRANGEMENT_VCURSOR_GUIDE] = @(_textview.highlightCursorCol);
         if (self.lastDirectory) {
             result[SESSION_ARRANGEMENT_LAST_DIRECTORY] = self.lastDirectory;
             result[SESSION_ARRANGEMENT_LAST_DIRECTORY_IS_UNSUITABLE_FOR_OLD_PWD] = @(self.lastDirectoryIsUnsuitableForOldPWD);
@@ -8298,6 +8307,8 @@ - (void)screenDidReset {
     _cursorGuideSettingHasChanged = NO;
     _textview.highlightCursorLine = [iTermProfilePreferences boolForKey:KEY_USE_CURSOR_GUIDE
                                                               inProfile:_profile];
+    _textview.highlightCursorCol = [iTermProfilePreferences boolForKey:KEY_USE_VERT_CURSOR_GUIDE
+                                                             inProfile:_profile];
     [_textview setNeedsDisplay:YES];
     _screen.trackCursorLineMovement = NO;
 }
@@ -8570,6 +8581,28 @@ - (BOOL)highlightCursorLine {
     return _textview.highlightCursorLine;
 }
 
+- (void)screenCursorDidMoveToCol:(int)col {
+    if (_textview.cursorVisible) {
+        [_textview setNeedsDisplayOnCol:col];
+    }
+}
+
+- (void)screenSetHighlightCursorCol:(BOOL)highlight {
+    _cursorGuideSettingHasChanged = YES;
+    self.highlightCursorCol = highlight;
+}
+
+- (void)setHighlightCursorCol:(BOOL)highlight {
+    _cursorGuideSettingHasChanged = YES;
+    _textview.highlightCursorCol = highlight;
+    [_textview setNeedsDisplay:YES];
+    _screen.trackCursorColMovement = highlight;
+}
+
+- (BOOL)highlightCursorCol {
+    return _textview.highlightCursorCol;
+}
+
 - (BOOL)screenHasView {
     return _textview != nil;
 }
diff --git a/sources/PTYTextView.h b/sources/PTYTextView.h
@@ -235,6 +235,9 @@ typedef NS_ENUM(NSInteger, PTYTextViewSelectionExtensionUnit) {
 // Draw a highlight along the entire line the cursor is on.
 @property(nonatomic, assign) BOOL highlightCursorLine;
 
+// Draw a highlight along the entire column the cursor is in.
+@property(nonatomic, assign) BOOL highlightCursorCol;
+
 // Use the non-ascii font? If not set, use the regular font for all characters.
 @property(nonatomic, assign) BOOL useNonAsciiFont;
 
diff --git a/sources/PTYTextView.m b/sources/PTYTextView.m
@@ -581,6 +581,14 @@ - (BOOL)highlightCursorLine {
     return _drawingHelper.highlightCursorLine;
 }
 
+- (void)setHighlightCursorCol:(BOOL)highlightCursorCol {
+    _drawingHelper.highlightCursorCol = highlightCursorCol;
+}
+
+- (BOOL)highlightCursorCol {
+    return _drawingHelper.highlightCursorCol;
+}
+
 - (void)setUseNonAsciiFont:(BOOL)useNonAsciiFont {
     _drawingHelper.useNonAsciiFont = useNonAsciiFont;
     _useNonAsciiFont = useNonAsciiFont;
diff --git a/sources/ProfilesColorsPreferencesViewController.m b/sources/ProfilesColorsPreferencesViewController.m
@@ -62,6 +62,7 @@ @implementation ProfilesColorsPreferencesViewController {
     IBOutlet NSMenu *_presetsMenu;
 
     IBOutlet NSButton *_useGuide;
+    IBOutlet NSButton *_useVGuide;
     IBOutlet CPKColorWell *_guideColor;
 
     IBOutlet NSPopUpButton *_presetsPopupButton;
@@ -171,6 +172,10 @@ - (void)awakeFromNib {
                     key:KEY_USE_CURSOR_GUIDE
                    type:kPreferenceInfoTypeCheckbox];
 
+    [self defineControl:_useVGuide
+                    key:KEY_USE_VERT_CURSOR_GUIDE
+                   type:kPreferenceInfoTypeCheckbox];
+
     info = [self defineControl:_useBrightBold
                            key:KEY_USE_BOLD_COLOR
                           type:kPreferenceInfoTypeCheckbox];
diff --git a/sources/PseudoTerminal.m b/sources/PseudoTerminal.m
@@ -1782,6 +1782,11 @@ - (IBAction)toggleCursorGuide:(id)sender {
   session.highlightCursorLine = !session.highlightCursorLine;
 }
 
+- (IBAction)toggleVCursorGuide:(id)sender {
+    PTYSession *session = [self currentSession];
+    session.highlightCursorCol = !session.highlightCursorCol;
+}
+
 - (IBAction)toggleSelectionRespectsSoftBoundaries:(id)sender {
     iTermController *controller = [iTermController sharedInstance];
     controller.selectionRespectsSoftBoundaries = !controller.selectionRespectsSoftBoundaries;
@@ -8590,6 +8595,10 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item {
         PTYSession *session = [self currentSession];
         [item setState:session.highlightCursorLine ? NSOnState : NSOffState];
         result = YES;
+    } else if ([item action] == @selector(toggleVCursorGuide:)) {
+        PTYSession *session = [self currentSession];
+        [item setState:session.highlightCursorCol ? NSOnState : NSOffState];
+        result = YES;
     } else if ([item action] == @selector(toggleSelectionRespectsSoftBoundaries:)) {
         [item setState:[[iTermController sharedInstance] selectionRespectsSoftBoundaries] ? NSOnState : NSOffState];
         result = YES;
diff --git a/sources/VT100Screen.m b/sources/VT100Screen.m
@@ -4139,6 +4139,10 @@ - (void)terminalSetHighlightCursorLine:(BOOL)highlight {
     [delegate_ screenSetHighlightCursorLine:highlight];
 }
 
+- (void)terminalSetHighlightCursorCol:(BOOL)highlight {
+    [delegate_ screenSetHighlightCursorCol:highlight];
+}
+
 - (void)terminalPromptDidStart {
     [self promptDidStartAt:VT100GridAbsCoordMake(currentGrid_.cursor.x,
                                                  currentGrid_.cursor.y + self.numberOfScrollbackLines + self.totalScrollbackOverflow)];
diff --git a/sources/VT100ScreenDelegate.h b/sources/VT100ScreenDelegate.h
@@ -185,6 +185,7 @@
 - (void)screenSetCursorVisible:(BOOL)visible;
 
 - (void)screenSetHighlightCursorLine:(BOOL)highlight;
+- (void)screenSetHighlightCursorCol:(BOOL)highlight;
 
 // Only called if the trackCursorLineMovement property is set.
 - (void)screenCursorDidMoveToLine:(int)line;
diff --git a/sources/VT100Terminal.m b/sources/VT100Terminal.m
@@ -2367,6 +2367,8 @@ - (void)executeXtermSetKvp:(VT100Token *)token {
         [delegate_ terminalAddNote:(NSString *)value show:NO];
     } else if ([key isEqualToString:@"HighlightCursorLine"]) {
         [delegate_ terminalSetHighlightCursorLine:value.length ? [value boolValue] : YES];
+    } else if ([key isEqualToString:@"HighlightCursorCol"]) {
+        [delegate_ terminalSetHighlightCursorCol:value.length ? [value boolValue] : YES];
     } else if ([key isEqualToString:@"CopyToClipboard"]) {
         if ([delegate_ terminalIsTrusted]) {
             [delegate_ terminalSetPasteboard:value];
diff --git a/sources/VT100TerminalDelegate.h b/sources/VT100TerminalDelegate.h
@@ -366,6 +366,7 @@ typedef NS_ENUM(int, VT100TerminalColorIndex) {
 - (void)terminalSetCursorVisible:(BOOL)visible;
 
 - (void)terminalSetHighlightCursorLine:(BOOL)highlight;
+- (void)terminalSetHighlightCursorCol:(BOOL)highlight;
 
 // FinalTerm features
 - (void)terminalPromptDidStart;
diff --git a/sources/iTermMetalPerFrameState.m b/sources/iTermMetalPerFrameState.m
@@ -582,6 +582,10 @@ - (BOOL)cursorGuideEnabled {
     return _configuration->_cursorGuideColor && _configuration->_cursorGuideEnabled;
 }
 
+- (BOOL)cursorVGuideEnabled {
+    return _configuration->_cursorGuideColor && _configuration->_cursorVGuideEnabled;
+}
+
 - (NSColor *)cursorGuideColor {
     return _configuration->_cursorGuideColor;
 }
diff --git a/sources/iTermMetalPerFrameStateConfiguration.h b/sources/iTermMetalPerFrameStateConfiguration.h
@@ -62,6 +62,7 @@ NS_ASSUME_NONNULL_BEGIN
     // Cursor
     BOOL _shouldDrawFilledInCursor;
     BOOL _cursorGuideEnabled;
+    BOOL _cursorVGuideEnabled;
 
     // Size
     VT100GridSize _gridSize;
diff --git a/sources/iTermMetalPerFrameStateConfiguration.m b/sources/iTermMetalPerFrameStateConfiguration.m
@@ -56,6 +56,7 @@ - (void)loadSettingsWithDrawingHelper:(iTermTextDrawingHelper *)drawingHelper
 
     // Cursor guide
     _cursorGuideEnabled = drawingHelper.highlightCursorLine;
+    _cursorVGuideEnabled = drawingHelper.highlightCursorCol;
     _cursorGuideColor = drawingHelper.cursorGuideColor;
 
     // Background image
diff --git a/sources/iTermProfilePreferences.m b/sources/iTermProfilePreferences.m
@@ -184,7 +184,7 @@ + (BOOL)valueIsLegal:(id)value forKey:(NSString *)key {
                         KEY_CURSOR_GUIDE_COLOR, KEY_BADGE_COLOR, KEY_TAB_COLOR,
                         KEY_UNDERLINE_COLOR ];
 
-    NSArray *number = @[ KEY_USE_CURSOR_GUIDE, KEY_USE_TAB_COLOR, KEY_USE_UNDERLINE_COLOR,
+    NSArray *number = @[ KEY_USE_CURSOR_GUIDE, KEY_USE_VERT_CURSOR_GUIDE, KEY_USE_TAB_COLOR, KEY_USE_UNDERLINE_COLOR,
                          KEY_SMART_CURSOR_COLOR, KEY_MINIMUM_CONTRAST, KEY_CURSOR_BOOST,
                          KEY_CURSOR_TYPE, KEY_BLINKING_CURSOR, KEY_USE_BOLD_FONT, KEY_THIN_STROKES,
                          KEY_ASCII_LIGATURES, KEY_NON_ASCII_LIGATURES, KEY_USE_BOLD_COLOR,
@@ -268,6 +268,7 @@ + (NSDictionary *)defaultValueMap {
                   KEY_CURSOR_GUIDE_COLOR:  [[NSColor colorWithCalibratedRed:0.650 green:0.910 blue:1.000 alpha:0.25] dictionaryValue],
                   KEY_BADGE_COLOR:         [[NSColor colorWithCalibratedRed:1.0 green:0.000 blue:0.000 alpha:0.5] dictionaryValue],
                   KEY_USE_CURSOR_GUIDE: @NO,
+                  KEY_USE_VERT_CURSOR_GUIDE: @NO,
                   KEY_TAB_COLOR: [NSNull null],
                   KEY_USE_TAB_COLOR: @NO,
                   KEY_UNDERLINE_COLOR: [NSNull null],
diff --git a/sources/iTermTextDrawingHelper.h b/sources/iTermTextDrawingHelper.h
@@ -180,6 +180,9 @@ BOOL CheckFindMatchAtIndex(NSData *findMatches, int index);
 // Should the cursor guide be shown?
 @property(nonatomic, assign) BOOL highlightCursorLine;
 
+// Should the vertical cursor guide be shown?
+@property(nonatomic, assign) BOOL highlightCursorCol;
+
 // Minimum contrast level, 0-1.
 @property(nonatomic, assign) double minimumContrast;
 

Original file line number	Diff line number	Diff line change
`@@ -748,6 +748,12 @@ - (void)screenSetHighlightCursorLine:(BOOL)highlight {`
`748`	`748`	`- (void)screenCursorDidMoveToLine:(int)line {`
`749`	`749`	`}`
`750`	`750`
	`751`	`+- (void)screenSetHighlightCursorCol:(BOOL)highlight {`
	`752`	`+}`
	`753`	`+`
	`754`	`+- (void)screenCursorDidMoveToCol:(int)line {`
	`755`	`+}`
	`756`	`+`
`751`	`757`	`- (void)screenSaveScrollPosition {`
`752`	`758`	`}`
`753`	`759`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ - (void)drawWithFrameData:(iTermMetalFrameData *)frameData`
`141`	`141`	`textures:@{ @(iTermTextureIndexPrimary): tState.texture } ];`
`142`	`142`	`}`
`143`	`143`
`144`		`- if (tState.col >= 0 && self.enabled) {`
	`144`	`+ if (tState.col >= 0 && self.venabled) {`
`145`	`145`	`[_cellRenderer drawWithTransientState:tState`
`146`	`146`	`renderEncoder:frameData.renderEncoder`
`147`	`147`	`numberOfVertices:6`
Original file line number	Diff line number	Diff line change
`@@ -644,7 +644,8 @@ - (BOOL)shouldCreateIntermediateRenderPassDescriptor:(iTermMetalFrameData *)fram`
`644`	`644`	`if (!_broadcastStripesRenderer.rendererDisabled && frameData.perFrameState.showBroadcastStripes) {`
`645`	`645`	`return YES;`
`646`	`646`	`}`
`647`		`- if (!_cursorGuideRenderer.rendererDisabled && frameData.perFrameState.cursorGuideEnabled) {`
	`647`	`+ if (!_cursorGuideRenderer.rendererDisabled && (frameData.perFrameState.cursorGuideEnabled`
	`648`	`+ \|\| frameData.perFrameState.cursorVGuideEnabled)) {`
`648`	`649`	`return YES;`
`649`	`650`	`}`
`650`	`651`
`@@ -970,6 +971,7 @@ - (void)updateCursorGuideRendererForFrameData:(iTermMetalFrameData *)frameData {`
`970`	`971`	`}`
`971`	`972`	`[_cursorGuideRenderer setColor:frameData.perFrameState.cursorGuideColor];`
`972`	`973`	`_cursorGuideRenderer.enabled = frameData.perFrameState.cursorGuideEnabled;`
	`974`	`+ _cursorGuideRenderer.venabled = frameData.perFrameState.cursorVGuideEnabled;`
`973`	`975`	`}`
`974`	`976`
`975`	`977`	`- (void)updateTimestampsRendererForFrameData:(iTermMetalFrameData *)frameData {`