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 /include/sway/config.h | |
parent | layer_shell: do not SIGABRT sway on zero outputs (diff) | |
download | sway-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 'include/sway/config.h')
-rw-r--r-- | include/sway/config.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index 96fe899b..978606a6 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -260,7 +260,7 @@ struct bar_config { | |||
260 | 260 | ||
261 | #if HAVE_TRAY | 261 | #if HAVE_TRAY |
262 | char *icon_theme; | 262 | char *icon_theme; |
263 | const char *tray_bindings[10]; // mouse buttons 0-9 | 263 | struct wl_list tray_bindings; // struct tray_binding::link |
264 | list_t *tray_outputs; // char * | 264 | list_t *tray_outputs; // char * |
265 | int tray_padding; | 265 | int tray_padding; |
266 | #endif | 266 | #endif |
@@ -272,6 +272,14 @@ struct bar_binding { | |||
272 | char *command; | 272 | char *command; |
273 | }; | 273 | }; |
274 | 274 | ||
275 | #if HAVE_TRAY | ||
276 | struct tray_binding { | ||
277 | uint32_t button; | ||
278 | const char *command; | ||
279 | struct wl_list link; // struct tray_binding::link | ||
280 | }; | ||
281 | #endif | ||
282 | |||
275 | struct border_colors { | 283 | struct border_colors { |
276 | float border[4]; | 284 | float border[4]; |
277 | float background[4]; | 285 | float background[4]; |