From 02bbefda20b9a4f86e740d33bbaa21c661bb2fac Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Tue, 15 Jan 2019 21:25:28 -0500 Subject: 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`. --- sway/config/bar.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'sway/config') diff --git a/sway/config/bar.c b/sway/config/bar.c index 701bf051..b1aa2313 100644 --- a/sway/config/bar.c +++ b/sway/config/bar.c @@ -81,6 +81,12 @@ void free_bar_config(struct bar_config *bar) { #if HAVE_TRAY list_free_items_and_destroy(bar->tray_outputs); free(bar->icon_theme); + + struct tray_binding *tray_bind = NULL, *tmp_tray_bind = NULL; + wl_list_for_each_safe(tray_bind, tmp_tray_bind, &bar->tray_bindings, link) { + wl_list_remove(&tray_bind->link); + free(tray_bind); + } #endif free(bar); } @@ -174,6 +180,7 @@ struct bar_config *default_bar_config(void) { #if HAVE_TRAY bar->tray_padding = 2; + wl_list_init(&bar->tray_bindings); #endif list_add(config->bars, bar); -- cgit v1.2.3