aboutsummaryrefslogtreecommitdiffstats
path: root/swaybar/input.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-01-15 21:25:28 -0500
committerLibravatar emersion <contact@emersion.fr>2019-01-16 11:12:45 +0100
commit02bbefda20b9a4f86e740d33bbaa21c661bb2fac (patch)
tree1b753e414749374be1e144a326a744c4b6812480 /swaybar/input.c
parentlayer_shell: do not SIGABRT sway on zero outputs (diff)
downloadsway-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 'swaybar/input.c')
-rw-r--r--swaybar/input.c25
1 files changed, 25 insertions, 0 deletions
diff --git a/swaybar/input.c b/swaybar/input.c
index bdd55e58..998b186f 100644
--- a/swaybar/input.c
+++ b/swaybar/input.c
@@ -22,6 +22,31 @@ void free_hotspots(struct wl_list *list) {
22 } 22 }
23} 23}
24 24
25uint32_t event_to_x11_button(uint32_t event) {
26 switch (event) {
27 case BTN_LEFT:
28 return 1;
29 case BTN_MIDDLE:
30 return 2;
31 case BTN_RIGHT:
32 return 3;
33 case SWAY_SCROLL_UP:
34 return 4;
35 case SWAY_SCROLL_DOWN:
36 return 5;
37 case SWAY_SCROLL_LEFT:
38 return 6;
39 case SWAY_SCROLL_RIGHT:
40 return 7;
41 case BTN_SIDE:
42 return 8;
43 case BTN_EXTRA:
44 return 9;
45 default:
46 return 0;
47 }
48}
49
25static uint32_t wl_axis_to_button(uint32_t axis, wl_fixed_t value) { 50static uint32_t wl_axis_to_button(uint32_t axis, wl_fixed_t value) {
26 bool negative = wl_fixed_to_double(value) < 0; 51 bool negative = wl_fixed_to_double(value) < 0;
27 switch (axis) { 52 switch (axis) {