From 3247974eb447b5fe2bc4df19464b2f15282f30cd Mon Sep 17 00:00:00 2001 From: Trygve Aaberge Date: Mon, 3 Jul 2023 21:59:23 +0200 Subject: core: don't send key_pressed signal again for the same key press If you press an incomplete key sequence, previously WeeChat would send the key_pressed signal again for the same keys on the next key. E.g. if you press escape and then 1, previously you would get the key_pressed signal with signal_data `\x01[` when you pressed escape, and then key_pressed with `\x01[` again when you pressed 1 (plus key_pressed with `1` for the 1 key). So two signals for the escape key, even though it was only pressed once. With this patch, you only get one signal for each key press. So one with `\x01[` when you press escape and then one with `1` when you press 1. --- src/gui/curses/gui-curses-key.c | 3 ++- src/gui/gui-key.c | 2 ++ src/gui/gui-key.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/gui') diff --git a/src/gui/curses/gui-curses-key.c b/src/gui/curses/gui-curses-key.c index eeedbb27b..8eea1bb7f 100644 --- a/src/gui/curses/gui-curses-key.c +++ b/src/gui/curses/gui-curses-key.c @@ -396,12 +396,13 @@ gui_key_flush (int paste) * or if the mouse code is valid UTF-8 (do not send partial mouse * code which is not UTF-8 valid) */ - if (!paste + if (!paste && i > gui_key_last_key_pressed_sent && (!gui_mouse_event_pending || utf8_is_valid (key_str, -1, NULL))) { (void) hook_signal_send ("key_pressed", WEECHAT_HOOK_SIGNAL_STRING, key_str); + gui_key_last_key_pressed_sent = i; } if (gui_current_window->buffer->text_search != GUI_TEXT_SEARCH_DISABLED) diff --git a/src/gui/gui-key.c b/src/gui/gui-key.c index ee43631ab..7212e10bc 100644 --- a/src/gui/gui-key.c +++ b/src/gui/gui-key.c @@ -94,6 +94,7 @@ int gui_key_grab_delay = 0; /* delay for grab (default is 500) */ int *gui_key_buffer = NULL; /* input buffer (for paste detection) */ int gui_key_buffer_alloc = 0; /* input buffer allocated size */ int gui_key_buffer_size = 0; /* input buffer size in bytes */ +int gui_key_last_key_pressed_sent = -1; int gui_key_paste_pending = 0; /* 1 is big paste was detected and */ /* WeeChat is asking user what to do */ @@ -2695,6 +2696,7 @@ gui_key_buffer_reset () gui_key_buffer_optimize (); } gui_key_paste_lines = 0; + gui_key_last_key_pressed_sent = -1; } /* diff --git a/src/gui/gui-key.h b/src/gui/gui-key.h index b0aeb2ad8..cbc600c2f 100644 --- a/src/gui/gui-key.h +++ b/src/gui/gui-key.h @@ -82,6 +82,7 @@ extern int gui_key_grab; extern int gui_key_grab_count; extern int *gui_key_buffer; extern int gui_key_buffer_size; +extern int gui_key_last_key_pressed_sent; extern int gui_key_paste_pending; extern int gui_key_paste_bracketed; extern time_t gui_key_last_activity_time; -- cgit debian/1.2.3+git2.25.1-1-2-gaceb0