superrob1500
/
mirror-ghostty
mirror of https://github.com/ghostty-org/ghostty
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

On wait-after-command (or abnormal exit), only close on encoded key 

Fixes #7794

This commit also resets some terminal state to give us a better chance
of getting an encoded key, such as ensuring keyboard input is enabled
and disabling any Kitty protocols. This shouldn't ever be set but just
in case!
pull/7800/head
Mitchell Hashimoto 2025-07-04 07:40:59 -07:00
parent 887a77fbab
commit eea073c97b
No known key found for this signature in database
GPG Key ID: 523D5DC389D273BC
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Surface.zig
View File

@ -1034,6 +1034,12 @@ fn childExited(self: *Surface, info: apprt.surface.Message.ChildExited) void {
t.printString("Process exited. Press any key to close the terminal.") catch t.printString("Process exited. Press any key to close the terminal.") catch
break :terminal; break :terminal;
t.modes.set(.cursor_visible, false); t.modes.set(.cursor_visible, false);
// We also want to ensure that normal keyboard encoding is on
// so that we can close the terminal. We close the terminal on
// any key press that encodes a character.
t.modes.set(.disable_keyboard, false);
t.screen.kitty_keyboard.set(.set, .{});
} }
// Waiting after command we stop here. The terminal is updated, our // Waiting after command we stop here. The terminal is updated, our
@ -2129,14 +2135,6 @@ pub fn keyCallback(
if (self.io.terminal.modes.get(.disable_keyboard)) return .consumed; if (self.io.terminal.modes.get(.disable_keyboard)) return .consumed;
} }
// If our process is exited and we press a key then we close the
// surface. We may want to eventually move this to the apprt rather
// than in core.
if (self.child_exited and event.action == .press) {
self.close();
return .closed;
}
// If this input event has text, then we hide the mouse if configured. // If this input event has text, then we hide the mouse if configured.
// We only do this on pressed events to avoid hiding the mouse when we // We only do this on pressed events to avoid hiding the mouse when we
// change focus due to a keybinding (i.e. switching tabs). // change focus due to a keybinding (i.e. switching tabs).
@ -2231,6 +2229,14 @@ pub fn keyCallback(
event, event,
if (insp_ev) |*ev| ev else null, if (insp_ev) |*ev| ev else null,
)) |write_req| { )) |write_req| {
// If our process is exited and we press a key that results in
// an encoded value, we close the surface. We want to eventually
// move this behavior to the apprt probably.
if (self.child_exited) {
self.close();
return .closed;
}
errdefer write_req.deinit(); errdefer write_req.deinit();
self.io.queueMessage(switch (write_req) { self.io.queueMessage(switch (write_req) {
.small => |v| .{ .write_small = v }, .small => |v| .{ .write_small = v },