diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-07-20 11:45:47 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-20 11:45:47 -0400 |
commit | b642d47c7f1f61993edd20200298fe971f636bbb (patch) | |
tree | bec87e642ae380995b5addc12624b83600489a60 /include | |
parent | Merge pull request #2316 from RyanDwyer/fix-floating-pointer-events (diff) | |
parent | swaybar: Fix scroll handling on workspace buttons (diff) | |
download | sway-b642d47c7f1f61993edd20200298fe971f636bbb.tar.gz sway-b642d47c7f1f61993edd20200298fe971f636bbb.tar.zst sway-b642d47c7f1f61993edd20200298fe971f636bbb.zip |
Merge pull request #2313 from minus7/swaybar-hotspot-input-fix
swaybar: Fix scroll handling on workspace buttons
Diffstat (limited to 'include')
-rw-r--r-- | include/swaybar/bar.h | 7 | ||||
-rw-r--r-- | include/swaybar/status_line.h | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h index f1ff25b2..1cecea71 100644 --- a/include/swaybar/bar.h +++ b/include/swaybar/bar.h | |||
@@ -29,10 +29,15 @@ enum x11_button { | |||
29 | FORWARD, | 29 | FORWARD, |
30 | }; | 30 | }; |
31 | 31 | ||
32 | enum hotspot_event_handling { | ||
33 | HOTSPOT_IGNORE, | ||
34 | HOTSPOT_PROCESS, | ||
35 | }; | ||
36 | |||
32 | struct swaybar_hotspot { | 37 | struct swaybar_hotspot { |
33 | struct wl_list link; | 38 | struct wl_list link; |
34 | int x, y, width, height; | 39 | int x, y, width, height; |
35 | void (*callback)(struct swaybar_output *output, | 40 | enum hotspot_event_handling (*callback)(struct swaybar_output *output, |
36 | int x, int y, enum x11_button button, void *data); | 41 | int x, int y, enum x11_button button, void *data); |
37 | void (*destroy)(void *data); | 42 | void (*destroy)(void *data); |
38 | void *data; | 43 | void *data; |
diff --git a/include/swaybar/status_line.h b/include/swaybar/status_line.h index 2eaf8140..de9b98d7 100644 --- a/include/swaybar/status_line.h +++ b/include/swaybar/status_line.h | |||
@@ -71,7 +71,7 @@ void status_error(struct status_line *status, const char *text); | |||
71 | bool status_handle_readable(struct status_line *status); | 71 | bool status_handle_readable(struct status_line *status); |
72 | void status_line_free(struct status_line *status); | 72 | void status_line_free(struct status_line *status); |
73 | bool i3bar_handle_readable(struct status_line *status); | 73 | bool i3bar_handle_readable(struct status_line *status); |
74 | void i3bar_block_send_click(struct status_line *status, | 74 | enum hotspot_event_handling i3bar_block_send_click(struct status_line *status, |
75 | struct i3bar_block *block, int x, int y, enum x11_button button); | 75 | struct i3bar_block *block, int x, int y, enum x11_button button); |
76 | void i3bar_block_free(struct i3bar_block *block); | 76 | void i3bar_block_free(struct i3bar_block *block); |
77 | enum x11_button wl_button_to_x11_button(uint32_t button); | 77 | enum x11_button wl_button_to_x11_button(uint32_t button); |