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

apprt/glfw: new keycallback for unmapped

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-03-25 15:40:49 -07:00
parent c774e37548
commit 67d3507f9a
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Surface.zig
View File

@ -850,6 +850,7 @@ pub fn keyCallback(
self: *Surface,
action: input.Action,
key: input.Key,
unmapped_key: input.Key,
mods: input.Mods,
) !void {
const tracy = trace(@src());
@ -870,13 +871,24 @@ pub fn keyCallback(
self.ignore_char = false;
if (action == .press or action == .repeat) {
const trigger: input.Binding.Trigger = .{
.mods = mods,
.key = key,
const binding_action_: ?input.Binding.Action = action: {
var trigger: input.Binding.Trigger = .{
.mods = mods,
.key = key,
};
//log.warn("BINDING TRIGGER={}", .{trigger});
const set = self.config.keybind.set;
if (set.get(trigger)) |v| break :action v;
trigger.key = unmapped_key;
trigger.unmapped = true;
if (set.get(trigger)) |v| break :action v;
break :action null;
};
//log.warn("BINDING TRIGGER={}", .{trigger});
if (self.config.keybind.set.get(trigger)) |binding_action| {
if (binding_action_) |binding_action| {
//log.warn("BINDING ACTION={}", .{binding_action});
switch (binding_action) {

4
src/apprt/glfw.zig
View File

@ -683,8 +683,10 @@ pub const Surface = struct {
=> .invalid,
};
// TODO: we need to do mapped keybindings
const core_win = window.getUserPointer(CoreSurface) orelse return;
core_win.keyCallback(action, key, mods) catch |err| {
core_win.keyCallback(action, key, key, mods) catch |err| {
log.err("error in key callback err={}", .{err});
return;
};