diff options
author | Drew DeVault <sir@cmpwn.com> | 2019-01-13 20:41:05 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-13 20:41:05 -0500 |
commit | 81bb6752748436788418c2fa3e7bef775c42c262 (patch) | |
tree | f90b770d160cf5ca773a3d63d52311f7ba731b16 /include/swaybar | |
parent | Merge pull request #3343 from RedSoxFan/seat-cursor-buttons-improved (diff) | |
parent | bar_cmd_bind: utilize mouse button helpers (diff) | |
download | sway-81bb6752748436788418c2fa3e7bef775c42c262.tar.gz sway-81bb6752748436788418c2fa3e7bef775c42c262.tar.zst sway-81bb6752748436788418c2fa3e7bef775c42c262.zip |
Merge pull request #3344 from RedSoxFan/bar-mouse-bindings-improved
Improve mouse button parsing: bar mouse bindings
Diffstat (limited to 'include/swaybar')
-rw-r--r-- | include/swaybar/i3bar.h | 2 | ||||
-rw-r--r-- | include/swaybar/input.h | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/swaybar/i3bar.h b/include/swaybar/i3bar.h index ab4744a5..aa4415ff 100644 --- a/include/swaybar/i3bar.h +++ b/include/swaybar/i3bar.h | |||
@@ -28,6 +28,6 @@ void i3bar_block_unref(struct i3bar_block *block); | |||
28 | bool i3bar_handle_readable(struct status_line *status); | 28 | bool i3bar_handle_readable(struct status_line *status); |
29 | enum hotspot_event_handling i3bar_block_send_click(struct status_line *status, | 29 | enum hotspot_event_handling i3bar_block_send_click(struct status_line *status, |
30 | struct i3bar_block *block, int x, int y, int rx, int ry, int w, int h, | 30 | struct i3bar_block *block, int x, int y, int rx, int ry, int w, int h, |
31 | enum x11_button button); | 31 | uint32_t button); |
32 | 32 | ||
33 | #endif | 33 | #endif |
diff --git a/include/swaybar/input.h b/include/swaybar/input.h index f480d009..4b46b0de 100644 --- a/include/swaybar/input.h +++ b/include/swaybar/input.h | |||
@@ -4,6 +4,11 @@ | |||
4 | #include <wayland-client.h> | 4 | #include <wayland-client.h> |
5 | #include "list.h" | 5 | #include "list.h" |
6 | 6 | ||
7 | #define SWAY_SCROLL_UP KEY_MAX + 1 | ||
8 | #define SWAY_SCROLL_DOWN KEY_MAX + 2 | ||
9 | #define SWAY_SCROLL_LEFT KEY_MAX + 3 | ||
10 | #define SWAY_SCROLL_RIGHT KEY_MAX + 4 | ||
11 | |||
7 | struct swaybar; | 12 | struct swaybar; |
8 | struct swaybar_output; | 13 | struct swaybar_output; |
9 | 14 | ||
@@ -39,8 +44,8 @@ struct swaybar_hotspot { | |||
39 | struct wl_list link; // swaybar_output::hotspots | 44 | struct wl_list link; // swaybar_output::hotspots |
40 | int x, y, width, height; | 45 | int x, y, width, height; |
41 | enum hotspot_event_handling (*callback)(struct swaybar_output *output, | 46 | enum hotspot_event_handling (*callback)(struct swaybar_output *output, |
42 | struct swaybar_hotspot *hotspot, int x, int y, | 47 | struct swaybar_hotspot *hotspot, int x, int y, uint32_t button, |
43 | enum x11_button button, void *data); | 48 | void *data); |
44 | void (*destroy)(void *data); | 49 | void (*destroy)(void *data); |
45 | void *data; | 50 | void *data; |
46 | }; | 51 | }; |