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 | |
| 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 'include/sway')
| -rw-r--r-- | include/sway/commands.h | 1 | ||||
| -rw-r--r-- | include/sway/config.h | 10 | ||||
| -rw-r--r-- | include/sway/input/cursor.h | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h index 68487879..7672a3fd 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h @@ -207,6 +207,7 @@ sway_cmd bar_cmd_pango_markup; sway_cmd bar_cmd_strip_workspace_numbers; sway_cmd bar_cmd_strip_workspace_name; sway_cmd bar_cmd_swaybar_command; +sway_cmd bar_cmd_tray_bindcode; sway_cmd bar_cmd_tray_bindsym; sway_cmd bar_cmd_tray_output; sway_cmd bar_cmd_tray_padding; 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 { #if HAVE_TRAY char *icon_theme; - const char *tray_bindings[10]; // mouse buttons 0-9 + struct wl_list tray_bindings; // struct tray_binding::link list_t *tray_outputs; // char * int tray_padding; #endif @@ -272,6 +272,14 @@ struct bar_binding { char *command; }; +#if HAVE_TRAY +struct tray_binding { + uint32_t button; + const char *command; + struct wl_list link; // struct tray_binding::link +}; +#endif + struct border_colors { float border[4]; float background[4]; diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h index 77aa0ea1..abd72783 100644 --- a/include/sway/input/cursor.h +++ b/include/sway/input/cursor.h @@ -103,4 +103,6 @@ uint32_t get_mouse_bindcode(const char *name, char **error); // Considers both bindsym and bindcode uint32_t get_mouse_button(const char *name, char **error); +const char *get_mouse_button_name(uint32_t button); + #endif |