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 /swaybar/tray | |
| parent | 247817f68c69c8f4533d948502ae300520dcad59 (diff) | |
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/tray')
| -rw-r--r-- | swaybar/tray/item.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/swaybar/tray/item.c b/swaybar/tray/item.c index 0833dcb9..9056331e 100644 --- a/swaybar/tray/item.c +++ b/swaybar/tray/item.c @@ -301,8 +301,15 @@ void destroy_sni(struct swaybar_sni *sni) { } static void handle_click(struct swaybar_sni *sni, int x, int y, - enum x11_button button, int delta) { - const char *method = sni->tray->bar->config->tray_bindings[button]; + uint32_t button, int delta) { + const char *method = NULL; + struct tray_binding *binding = NULL; + wl_list_for_each(binding, &sni->tray->bar->config->tray_bindings, link) { + if (binding->button == button) { + method = binding->command; + break; + } + } if (!method) { static const char *default_bindings[10] = { "nop", @@ -316,7 +323,7 @@ static void handle_click(struct swaybar_sni *sni, int x, int y, "nop", "nop" }; - method = default_bindings[button]; + method = default_bindings[event_to_x11_button(button)]; } if (strcmp(method, "nop") == 0) { return; @@ -345,7 +352,7 @@ static int cmp_sni_id(const void *item, const void *cmp_to) { static enum hotspot_event_handling icon_hotspot_callback( struct swaybar_output *output, struct swaybar_hotspot *hotspot, - int x, int y, enum x11_button button, void *data) { + int x, int y, uint32_t button, void *data) { wlr_log(WLR_DEBUG, "Clicked on %s", (char *)data); struct swaybar_tray *tray = output->bar->tray; |