Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-16 16:56:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #270 from mitchellh/cc-hidden-inactive-cursor

Browse Source 
Don't show hollow cursor in inactive windows when cursor is hidden.
This commit is contained in:
Mitchell Hashimoto
2023-08-11 08:56:06 -07:00
committed by GitHub
parent 70efaea787 6045088afc
commit a042b5db9c
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/renderer/Metal.zig
View File

@ -528,22 +528,21 @@ pub fn render(
state.mutex.lock(); state.mutex.lock();
defer state.mutex.unlock(); defer state.mutex.unlock();
// Setup our cursor state self.cursor_visible = visible: {
// If the cursor is explicitly not visible in the state,
// then it is not visible.
if (!state.cursor.visible) break :visible false;
// If the cursor isn't a blinking style, then never blink.
if (!state.cursor.style.blinking()) break :visible true;
// Otherwise, adhere to our current state.
break :visible self.cursor_visible;
};
if (self.focused) { if (self.focused) {
self.cursor_visible = visible: {
// If the cursor is explicitly not visible in the state,
// then it is not visible.
if (!state.cursor.visible) break :visible false;
// If the cursor isn't a blinking style, then never blink.
if (!state.cursor.style.blinking()) break :visible true;
// Otherwise, adhere to our current state.
break :visible self.cursor_visible;
};
self.cursor_style = renderer.CursorStyle.fromTerminal(state.cursor.style) orelse .box; self.cursor_style = renderer.CursorStyle.fromTerminal(state.cursor.style) orelse .box;
} else { } else {
self.cursor_visible = true;
self.cursor_style = .box_hollow; self.cursor_style = .box_hollow;
} }

25
src/renderer/OpenGL.zig
View File

@ -728,22 +728,21 @@ pub fn render(
state.mutex.lock(); state.mutex.lock();
defer state.mutex.unlock(); defer state.mutex.unlock();
// Setup our cursor state self.cursor_visible = visible: {
// If the cursor is explicitly not visible in the state,
// then it is not visible.
if (!state.cursor.visible) break :visible false;
// If the cursor isn't a blinking style, then never blink.
if (!state.cursor.style.blinking()) break :visible true;
// Otherwise, adhere to our current state.
break :visible self.cursor_visible;
};
if (self.focused) { if (self.focused) {
self.cursor_visible = visible: {
// If the cursor is explicitly not visible in the state,
// then it is not visible.
if (!state.cursor.visible) break :visible false;
// If the cursor isn't a blinking style, then never blink.
if (!state.cursor.style.blinking()) break :visible true;
// Otherwise, adhere to our current state.
break :visible self.cursor_visible;
};
self.cursor_style = renderer.CursorStyle.fromTerminal(state.cursor.style) orelse .box; self.cursor_style = renderer.CursorStyle.fromTerminal(state.cursor.style) orelse .box;
} else { } else {
self.cursor_visible = true;
self.cursor_style = .box_hollow; self.cursor_style = .box_hollow;
} }