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

Merge pull request #287 from mitchellh/macos-key

Browse Source 
apprt/embedded: keycallback should use nomod text to determine key
This commit is contained in:
Mitchell Hashimoto
2023-08-15 11:15:36 -07:00
committed by GitHub
parent d27bc1f0fe 2b2b23dcf6
commit c5439ca516
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Surface.zig
View File

@ -1134,6 +1134,13 @@ pub fn keyCallback(
const tracy = trace(@src()); const tracy = trace(@src());
defer tracy.end(); defer tracy.end();
// log.warn("KEY CALLBACK action={} key={} physical_key={} mods={}", .{
// action,
// key,
// physical_key,
// mods,
// });
// Dev Mode // Dev Mode
if (DevMode.enabled and DevMode.instance.visible) { if (DevMode.enabled and DevMode.instance.visible) {
// If the event was handled by imgui, ignore it. // If the event was handled by imgui, ignore it.

28
src/apprt/embedded.zig
View File

@ -422,10 +422,11 @@ pub const Surface = struct {
self.core_surface.preeditCallback(null) catch {}; self.core_surface.preeditCallback(null) catch {};
} }
// log.warn("TRANSLATE: action={} keycode={x} dead={} key={any} key_str={s} mods={}", .{ // log.warn("TRANSLATE: action={} keycode={x} dead={} key_len={} key={any} key_str={s} mods={}", .{
// action, // action,
// keycode, // keycode,
// result.composing, // result.composing,
// result.text.len,
// result.text, // result.text,
// result.text, // result.text,
// mods, // mods,
@ -444,8 +445,29 @@ pub const Surface = struct {
// We also only do key translation if this is not a dead key. // We also only do key translation if this is not a dead key.
const key = if (!result.composing and result.text.len == 1) key: { const key = if (!result.composing and result.text.len == 1) key: {
// A completed key. If the length of the key is one then we can // A completed key. If the length of the key is one then we can
// attempt to translate it to a key enum and call the key callback. // attempt to translate it to a key enum and call the key
break :key input.Key.fromASCII(result.text[0]) orelse physical_key; // callback. First try plain ASCII.
if (input.Key.fromASCII(result.text[0])) |key| {
break :key key;
}
// If that doesn't work then we try to translate without
// any modifiers and convert that.
var nomod_buf: [128]u8 = undefined;
var nomod_state: input.Keymap.State = undefined;
const nomod = try self.app.keymap.translate(
&nomod_buf,
&nomod_state,
@intCast(keycode),
.{},
);
if (nomod.text.len == 1) {
if (input.Key.fromASCII(nomod.text[0])) |key| {
break :key key;
}
}
break :key physical_key;
} else .invalid; } else .invalid;
// If both keys are invalid then we won't call the key callback. But // If both keys are invalid then we won't call the key callback. But