mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-28 02:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

swaybar: Prioritize hotspot events to bar bindings

Browse source 
This is consistent with i3bar's behaviour, and for example, allows binding a
command to button1, while still being able to click on tray icons or other
zones on the bar's status line which may have their own bindings.

E.g., in Sway, without this commit, this config. makes tray icons unclickable:

    bar {
        # ...
        bindsym button1 exec swaynag -m You_clicked_the_tray._Want_some_help?
    }

But the same configuration in i3 (with i3-nagbar) keeps tray items clickable.

Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
(cherry picked from commit 53f9dbd424)
This commit is contained in:
Joan Bruguera 2021-09-04 06:44:56 +02:00 committed by Simon Ser
parent d5872d0880
commit b92af7e3ca
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
swaybar/input.c
View file

@ -166,14 +166,13 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
return; return;
} }
if (check_bindings(seat->bar, button, state)) { if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
return; if (process_hotspots(output, pointer->x, pointer->y, button)) {
return;
}
} }
if (state != WL_POINTER_BUTTON_STATE_PRESSED) { check_bindings(seat->bar, button, state);
return;
}
process_hotspots(output, pointer->x, pointer->y, button);
} }
static void workspace_next(struct swaybar *bar, struct swaybar_output *output, static void workspace_next(struct swaybar *bar, struct swaybar_output *output,
@ -222,15 +221,14 @@ static void workspace_next(struct swaybar *bar, struct swaybar_output *output,
static void process_discrete_scroll(struct swaybar_seat *seat, static void process_discrete_scroll(struct swaybar_seat *seat,
struct swaybar_output *output, struct swaybar_pointer *pointer, struct swaybar_output *output, struct swaybar_pointer *pointer,
uint32_t axis, wl_fixed_t value) { uint32_t axis, wl_fixed_t value) {
// If there is a button press binding, execute it, skip default behavior,
// and check button release bindings
uint32_t button = wl_axis_to_button(axis, value); uint32_t button = wl_axis_to_button(axis, value);
if (check_bindings(seat->bar, button, WL_POINTER_BUTTON_STATE_PRESSED)) { if (process_hotspots(output, pointer->x, pointer->y, button)) {
check_bindings(seat->bar, button, WL_POINTER_BUTTON_STATE_RELEASED);
return; return;
} }
if (process_hotspots(output, pointer->x, pointer->y, button)) { // If there is a button press binding, execute it, and check button release bindings
if (check_bindings(seat->bar, button, WL_POINTER_BUTTON_STATE_PRESSED)) {
check_bindings(seat->bar, button, WL_POINTER_BUTTON_STATE_RELEASED);
return; return;
} }