lkn
/
plan9port
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cancel compose when clicking the mouse on an alt+click. 

The alt key begins a compose. When using alt+click, compose was not previously cancelled and the next two typed characters would often end up composed.
This commit is contained in:
Ethan Burns 2025-11-04 17:33:31 -05:00
parent 2079b5e9c7
commit 8a727c1e21
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cmd/devdraw/wayland.c
View File

@ -589,6 +589,7 @@ void wl_pointer_button(void *data, struct wl_pointer *wl_pointer, uint32_t seria
if (wl->ctl) {
mask = 1 << CTL_BUTTON;
} else if (wl->alt) {
gfx_abortcompose(c);
mask = 1 << ALT_BUTTON;
}
}
@ -724,7 +725,7 @@ void wl_keyboard_key(void *data, struct wl_keyboard *wl_keyboard,
if (wayland_debug) {
char name[256];
xkb_keysym_get_name(keysym, &name[0], 256);
char *state_str = WL_KEYBOARD_KEY_STATE_PRESSED ? "down" : "up";
char *state_str = state == WL_KEYBOARD_KEY_STATE_PRESSED ? "down" : "up";
DEBUG("wl_keyboard_key: keysym=%s, rune=0x%x, state=%s\n",
name, rune, state_str);
}
@ -824,8 +825,9 @@ void wl_keyboard_key(void *data, struct wl_keyboard *wl_keyboard,
&wl_callback_key_repeat_listener, c);
}
qunlock(&wayland_lock);
if (state == WL_KEYBOARD_KEY_STATE_PRESSED && rune != 0)
if (state == WL_KEYBOARD_KEY_STATE_PRESSED && rune != 0) {
gfx_keystroke(c, rune);
}
}
void wl_keyboard_modifiers(void *data, struct wl_keyboard *wl_keyboard,