diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-01-15 21:25:28 -0500 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2019-01-16 11:12:45 +0100 |
commit | 02bbefda20b9a4f86e740d33bbaa21c661bb2fac (patch) | |
tree | 1b753e414749374be1e144a326a744c4b6812480 /include/swaybar/input.h | |
parent | layer_shell: do not SIGABRT sway on zero outputs (diff) | |
download | sway-02bbefda20b9a4f86e740d33bbaa21c661bb2fac.tar.gz sway-02bbefda20b9a4f86e740d33bbaa21c661bb2fac.tar.zst sway-02bbefda20b9a4f86e740d33bbaa21c661bb2fac.zip |
bar_cmd_tray_bind: Use mouse button helpers
This modifies `bar_cmd_tray_bindsym` to use `get_mouse_bindsym` for
parsing mouse buttons. This also introduces `bar_cmd_tray_bindcode`,
which will use `get_mouse_bindcode` for parsing mouse buttons. Like with
sway bindings, the two commands are encapsulated in a single file to
maximize shared code.
This also modifies tray bindings to work off of events codes rather than
x11 buttons, which allows for any mouse buttons to be used.
For `get_bar_config`, `event_code` has been added to the `tray_bindings`
section and will include to event code for the button. If the event code
can be mapped to a x11 button, `input_code` will still be the x11 button
number. Otherwise, `input_code` will be `0`.
Diffstat (limited to 'include/swaybar/input.h')
-rw-r--r-- | include/swaybar/input.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/include/swaybar/input.h b/include/swaybar/input.h index 4b46b0de..d76cd551 100644 --- a/include/swaybar/input.h +++ b/include/swaybar/input.h | |||
@@ -22,19 +22,6 @@ struct swaybar_pointer { | |||
22 | uint32_t serial; | 22 | uint32_t serial; |
23 | }; | 23 | }; |
24 | 24 | ||
25 | enum x11_button { | ||
26 | NONE, | ||
27 | LEFT, | ||
28 | MIDDLE, | ||
29 | RIGHT, | ||
30 | SCROLL_UP, | ||
31 | SCROLL_DOWN, | ||
32 | SCROLL_LEFT, | ||
33 | SCROLL_RIGHT, | ||
34 | BACK, | ||
35 | FORWARD, | ||
36 | }; | ||
37 | |||
38 | enum hotspot_event_handling { | 25 | enum hotspot_event_handling { |
39 | HOTSPOT_IGNORE, | 26 | HOTSPOT_IGNORE, |
40 | HOTSPOT_PROCESS, | 27 | HOTSPOT_PROCESS, |
@@ -54,6 +41,8 @@ extern const struct wl_seat_listener seat_listener; | |||
54 | 41 | ||
55 | void update_cursor(struct swaybar *bar); | 42 | void update_cursor(struct swaybar *bar); |
56 | 43 | ||
44 | uint32_t event_to_x11_button(uint32_t event); | ||
45 | |||
57 | void free_hotspots(struct wl_list *list); | 46 | void free_hotspots(struct wl_list *list); |
58 | 47 | ||
59 | #endif | 48 | #endif |