From 7797490e9e285589f501e46202df36b6bf8afcfd Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 4 Sep 2018 20:00:04 +1000 Subject: Deny repeating reload by holding key Fixes #2568 The binding that gets stored in the keyboard's `repeat_binding` would get freed on reload, leaving a dangling pointer. Rather than attempt to unset the keyboard's `repeat_binding` along with the other bindings, I opted to just not set it for the reload command because there's no point in reloading repeatedly by holding the binding. This disables repeat bindings for the reload command. As we now need to detect whether it's a reload command in two places, I've added a binding flag to track whether it's a reload or not. --- sway/input/keyboard.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'sway/input') diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c index 160ef10b..0d2a62b5 100644 --- a/sway/input/keyboard.c +++ b/sway/input/keyboard.c @@ -280,7 +280,10 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) { if (binding_pressed) { seat_execute_command(seat, binding_pressed); handled = true; - next_repeat_binding = binding_pressed; + + if ((binding_pressed->flags & BINDING_RELOAD) == 0) { + next_repeat_binding = binding_pressed; + } } } -- cgit v1.2.3