KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Dont send release events for kitty shortcuts to children

Browse Source
This commit is contained in:
Kovid Goyal 2021-01-15 18:21:38 +05:30
parent 3c648c05ec
commit 19a3635c64
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kitty/keys.c
View File

@ -109,7 +109,8 @@ update_ime_position(OSWindow *os_window, Window* w, Screen *screen) {
void void
on_key_input(GLFWkeyevent *ev) { on_key_input(GLFWkeyevent *ev) {
Window *w = active_window(); Window *w = active_window();
const int action = ev->action, native_key = ev->native_key, key = ev->key, mods = ev->mods; const int action = ev->action, mods = ev->mods;
const uint32_t key = ev->key, native_key = ev->native_key;
const char *text = ev->text ? ev->text : ""; const char *text = ev->text ? ev->text : "";
debug("on_key_input: glfw key: %d native_code: 0x%x action: %s mods: 0x%x text: '%s' state: %d ", debug("on_key_input: glfw key: %d native_code: 0x%x action: %s mods: 0x%x text: '%s' state: %d ",
@ -149,7 +150,10 @@ on_key_input(GLFWkeyevent *ev) {
debug("in sequence mode, handling as shortcut\n"); debug("in sequence mode, handling as shortcut\n");
if ( if (
action != GLFW_RELEASE && action != GLFW_RELEASE &&
key != GLFW_FKEY_LEFT_SHIFT && key != GLFW_FKEY_RIGHT_SHIFT && key != GLFW_FKEY_LEFT_ALT && key != GLFW_FKEY_RIGHT_ALT && key != GLFW_FKEY_LEFT_CONTROL && key != GLFW_FKEY_RIGHT_CONTROL key != GLFW_FKEY_LEFT_SHIFT && key != GLFW_FKEY_RIGHT_SHIFT &&
key != GLFW_FKEY_LEFT_ALT && key != GLFW_FKEY_RIGHT_ALT &&
key != GLFW_FKEY_LEFT_CONTROL && key != GLFW_FKEY_RIGHT_CONTROL &&
key != GLFW_FKEY_LEFT_SUPER && key != GLFW_FKEY_RIGHT_SUPER
) { ) {
create_key_event(); create_key_event();
call_boss(process_sequence, "O", ke); call_boss(process_sequence, "O", ke);
@ -161,15 +165,22 @@ on_key_input(GLFWkeyevent *ev) {
create_key_event(); create_key_event();
PyObject *ret = PyObject_CallMethod(global_state.boss, "dispatch_possible_special_key", "O", ke); PyObject *ret = PyObject_CallMethod(global_state.boss, "dispatch_possible_special_key", "O", ke);
Py_CLEAR(ke); Py_CLEAR(ke);
bool consumed = false;
w->last_special_key_pressed = 0;
if (ret == NULL) { PyErr_Print(); } if (ret == NULL) { PyErr_Print(); }
else { else {
bool consumed = ret == Py_True; consumed = ret == Py_True;
Py_DECREF(ret); Py_DECREF(ret);
if (consumed) { if (consumed) {
debug("handled as shortcut\n"); debug("handled as shortcut\n");
w->last_special_key_pressed = key;
return; return;
} }
} }
} else if (w->last_special_key_pressed == key) {
w->last_special_key_pressed = 0;
debug("ignoring release event for previous press that was handled as shortcut");
return;
} }
#undef create_key_event #undef create_key_event
if (action == GLFW_REPEAT && !screen->modes.mDECARM) { if (action == GLFW_REPEAT && !screen->modes.mDECARM) {

1
kitty/state.h
View File

@ -115,6 +115,7 @@ typedef struct {
WindowGeometry geometry; WindowGeometry geometry;
ClickQueue click_queue; ClickQueue click_queue;
monotonic_t last_drag_scroll_at; monotonic_t last_drag_scroll_at;
uint32_t last_special_key_pressed;
} Window; } Window;
typedef struct { typedef struct {