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

apprt/gtk: ibus activation should not encode keys (#5310)

Browse Source 
Related to #3567

This cleans up our handling of when GTK tells us the input method
handled the key press to address more scenarios we should not encode the
key event. The comments in this diff should explain clearly.

Reproduction is simple:

1. Use ibus (X11 or Wayland doesn't matter)
2. Press `super+.` to activate the emoji keyboard
3. Notice the `.` is written to the shell AND the emoji keyboard is
activated.

The bug is that `.` should not be encoded since it was used to activate
the emoji keyboard. This PR fixes that.
This commit is contained in:
Mitchell Hashimoto
2025-01-22 20:32:03 -08:00
committed by GitHub
parent ddf7173ae9 4408101b8d
commit eb21a58aa4
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/apprt/gtk/Surface.zig
View File

@ -1700,15 +1700,32 @@ pub fn keyEvent(
// self.im_composing, // self.im_composing,
// }); // });
if (self.im_composing) { // If the input method handled the event, you would think we would
// If we're composing and the input method handled this event then // never proceed with key encoding for Ghostty but that is not the
// we don't continue processing it. Any preedit changes or any of that // case. Input methods will handle basic character encoding like
// would've been handled by the preedit events. // typing "a" and we want to associate that with the key event.
if (im_handled) return true; // So we have to check additional state to determine if we exit.
} else if (was_composing) { if (im_handled) {
// If we are composing then we're in a preedit state and do
// not want to encode any keys. For example: type a deadkey
// such as single quote on a US international keyboard layout.
if (self.im_composing) return true;
// If we were composing and now we're not it means that we committed // If we were composing and now we're not it means that we committed
// the text. We also don't want to encode a key event for this. // the text. We also don't want to encode a key event for this.
return true; // Example: enable Japanese input method, press "konn" and then
// press enter. The final enter should not be encoded and "konn"
// (in hiragana) should be written as "こん".
if (was_composing) return true;
// Not composing and our input method buffer is empty. This could
// mean that the input method reacted to this event by activating
// an onscreen keyboard or something equivalent. We don't know.
// But the input method handled it and didn't give us text so
// we will just assume we should not encode this. This handles a
// real scenario when ibus starts the emoji input method
// (super+.).
if (self.im_len == 0) return true;
} }
// At this point, for the sake of explanation of internal state: // At this point, for the sake of explanation of internal state: