Use existing reset_keybind function

diff --git a/include/input/keyboard.h b/include/input/keyboard.h
index 1f523da36acbc549a0cb1cfc1a087fcd86aab47e..ff2d8500bfc69c793388f7d65ef1e0feec2111f8 100644 (file)
--- a/include/input/keyboard.h
+++ b/include/input/keyboard.h
@@ -9,8 +9,6 @@ struct seat;
 struct keyboard;
 struct wlr_keyboard;
 
-extern struct keybind *cur_keybind;
-
 void keyboard_reset_current_keybind(void);
 void keyboard_configure(struct seat *seat, struct wlr_keyboard *kb,
        bool is_virtual);

diff --git a/src/action.c b/src/action.c
index 12523353b015171ee1c691c86fe561ca1c417063..152f04b486453d29843d0f29fead4eb55cebb710 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -708,7 +708,8 @@ actions_run(struct view *activator, struct server *server,
                return;
        }
 
-       cur_keybind = NULL;
+       /* This cancels any pending on-release keybinds */
+       keyboard_reset_current_keybind ();
 
        struct view *view;
        struct action *action;

diff --git a/src/input/keyboard.c b/src/input/keyboard.c
index d42650b3e8f2d204c796d1e5ce72eb4dcfaced63..147ec4dcbc0728df34b9b86c36fb94b510209238 100644 (file)
--- a/src/input/keyboard.c
+++ b/src/input/keyboard.c
@@ -38,7 +38,7 @@ struct keyinfo {
 
 static bool should_cancel_cycling_on_next_key_release;
 
-struct keybind *cur_keybind;
+static struct keybind *cur_keybind;
 
 /* Called on --reconfigure to prevent segfault when handling release keybinds */
 void