aboutsummaryrefslogtreecommitdiffstats
path: root/sway/config/bar.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 /sway/config/bar.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 'sway/config/bar.c')
-rw-r--r--sway/config/bar.c7
1 files changed, 7 insertions, 0 deletions
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) {
81#if HAVE_TRAY 81#if HAVE_TRAY
82 list_free_items_and_destroy(bar->tray_outputs); 82 list_free_items_and_destroy(bar->tray_outputs);
83 free(bar->icon_theme); 83 free(bar->icon_theme);
84
85 struct tray_binding *tray_bind = NULL, *tmp_tray_bind = NULL;
86 wl_list_for_each_safe(tray_bind, tmp_tray_bind, &bar->tray_bindings, link) {
87 wl_list_remove(&tray_bind->link);
88 free(tray_bind);
89 }
84#endif 90#endif
85 free(bar); 91 free(bar);
86} 92}
@@ -174,6 +180,7 @@ struct bar_config *default_bar_config(void) {
174 180
175#if HAVE_TRAY 181#if HAVE_TRAY
176 bar->tray_padding = 2; 182 bar->tray_padding = 2;
183 wl_list_init(&bar->tray_bindings);
177#endif 184#endif
178 185
179 list_add(config->bars, bar); 186 list_add(config->bars, bar);