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

core: handle unconsumed key sequences

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-08-19 12:27:55 -07:00
parent 4ce7a88dee
commit 454c585eb3
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Surface.zig
View File

@ -1557,7 +1557,9 @@ fn maybeHandleBinding(
// Setup the next set we'll look at. // Setup the next set we'll look at.
self.keyboard.bindings = set; self.keyboard.bindings = set;
// Store this event so that we can drain and encode on invalid // Store this event so that we can drain and encode on invalid.
// We don't need to cap this because it is naturally capped by
// the config validation.
if (try self.encodeKey(event, insp_ev)) |req| { if (try self.encodeKey(event, insp_ev)) |req| {
try self.keyboard.queued.append(self.alloc, req); try self.keyboard.queued.append(self.alloc, req);
} }
@ -1576,11 +1578,6 @@ fn maybeHandleBinding(
// An action also always resets the binding set. // An action also always resets the binding set.
self.keyboard.bindings = null; self.keyboard.bindings = null;
if (self.keyboard.queued.items.len > 0) {
// TODO: unconsumed
for (self.keyboard.queued.items) |req| req.deinit();
self.keyboard.queued.clearRetainingCapacity();
}
// Attempt to perform the action // Attempt to perform the action
log.debug("key event binding consumed={} action={}", .{ consumed, action }); log.debug("key event binding consumed={} action={}", .{ consumed, action });
@ -1598,11 +1595,32 @@ fn maybeHandleBinding(
// it, we processed the action but we still want to process our // it, we processed the action but we still want to process our
// encodings, too. // encodings, too.
if (performed and consumed) { if (performed and consumed) {
// If we had queued events, we deinit them since we consumed
if (self.keyboard.queued.items.len > 0) {
for (self.keyboard.queued.items) |req| req.deinit();
self.keyboard.queued.clearRetainingCapacity();
}
// Store our last trigger so we don't encode the release event
self.keyboard.last_trigger = event.bindingHash(); self.keyboard.last_trigger = event.bindingHash();
if (insp_ev) |ev| ev.binding = action; if (insp_ev) |ev| ev.binding = action;
return .consumed; return .consumed;
} }
// If we didn't perform OR we didn't consume, then we want to
// encode any queued events for a sequence.
if (self.keyboard.queued.items.len > 0) {
for (self.keyboard.queued.items) |write_req| {
self.io.queueMessage(switch (write_req) {
.small => |v| .{ .write_small = v },
.stable => |v| .{ .write_stable = v },
.alloc => |v| .{ .write_alloc = v },
}, .unlocked);
}
self.keyboard.queued.clearRetainingCapacity();
}
return null; return null;
} }