diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-01-10 12:43:10 -0500 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2019-01-10 12:43:10 -0500 |
commit | 3d6440ec26f2b39c54fd03aa3a3c822a8a2bbc72 (patch) | |
tree | 05e5dddd092b3d3ba16166a3784a49923e9f3de2 /include/swaybar/input.h | |
parent | 212baf2f75dca0279759ce6c27cfc68541b1b922 (diff) |
bar_cmd_bind: utilize mouse button helpers
This modifies `bar_cmd_bindsym` to use `get_mouse_bindsym` for parsing
mouse buttons. This also introduces `cmd_bar_bindcode`, which will use
`get_mouse_bindcode` for parsing mouse buttons. Like sway bindings, the
two commands are encapsulated in a single file with shared code.
This also modifies swaybar to operate off of event codes rather than x11
button numbers, which allows for any mouse button to be used.
This introduces two new IPC properties:
- For `get_bar_config`, `event_code` has been added to the `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`.
- Likewise for `click_events`, `event` has been added and will include
the event code for the button clicked. If the event code can be mapped
to a x11 button, `button` will still be the x11 button number.
Otherwise, `button` will be `0`.
Diffstat (limited to 'include/swaybar/input.h')
-rw-r--r-- | include/swaybar/input.h | 9 |
1 files changed, 7 insertions, 2 deletions
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 @@ #include <wayland-client.h> #include "list.h" +#define SWAY_SCROLL_UP KEY_MAX + 1 +#define SWAY_SCROLL_DOWN KEY_MAX + 2 +#define SWAY_SCROLL_LEFT KEY_MAX + 3 +#define SWAY_SCROLL_RIGHT KEY_MAX + 4 + struct swaybar; struct swaybar_output; @@ -39,8 +44,8 @@ struct swaybar_hotspot { struct wl_list link; // swaybar_output::hotspots int x, y, width, height; enum hotspot_event_handling (*callback)(struct swaybar_output *output, - struct swaybar_hotspot *hotspot, int x, int y, - enum x11_button button, void *data); + struct swaybar_hotspot *hotspot, int x, int y, uint32_t button, + void *data); void (*destroy)(void *data); void *data; }; |