From 0a9b468540d4be7dbea3b63515b64eaa5c187f0f Mon Sep 17 00:00:00 2001 From: Joan Bruguera Date: Sat, 18 Sep 2021 22:21:22 +0200 Subject: swaybar: Make hotspots block bar release bindings The previous commit prioritized hotspots before bar bindings for press events, which matches i3's behaviour. However, since hotspots don't need to do any processing on release events, those were not handled, and simply fell through to `bindsym --release` bar bindings (if any). This is counter-intuitive, and doesn't match i3's behaviour. Instead in case a hotspot handles the press event, it should also handle the release event, doing nothing, but blocking the event from triggering a --release bar binding. E.g., in Sway, without this commit, this config. shows a text on tray clicks: bar { # ... bindsym --release button1 exec swaynag -m I_got_the_release_event. } But the same configuration in i3 (with i3-nagbar) doesn't show the text. Signed-off-by: Joan Bruguera (cherry picked from commit 94b69acf0d7b26ee5af2172300cb18473508da76) --- include/swaybar/i3bar.h | 2 +- include/swaybar/input.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/swaybar/i3bar.h b/include/swaybar/i3bar.h index 1aec6d6c..dced2a6c 100644 --- a/include/swaybar/i3bar.h +++ b/include/swaybar/i3bar.h @@ -30,6 +30,6 @@ void i3bar_block_unref(struct i3bar_block *block); bool i3bar_handle_readable(struct status_line *status); enum hotspot_event_handling i3bar_block_send_click(struct status_line *status, struct i3bar_block *block, double x, double y, double rx, double ry, - double w, double h, int scale, uint32_t button); + double w, double h, int scale, uint32_t button, bool released); #endif diff --git a/include/swaybar/input.h b/include/swaybar/input.h index e8735d88..8ea88a69 100644 --- a/include/swaybar/input.h +++ b/include/swaybar/input.h @@ -49,7 +49,7 @@ struct swaybar_hotspot { int x, y, width, height; enum hotspot_event_handling (*callback)(struct swaybar_output *output, struct swaybar_hotspot *hotspot, double x, double y, uint32_t button, - void *data); + bool released, void *data); void (*destroy)(void *data); void *data; }; -- cgit v1.2.3-54-g00ecf