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/ipc.c | |
| 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/ipc.c')
| -rw-r--r-- | swaybar/ipc.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/swaybar/ipc.c b/swaybar/ipc.c index 097f9161..0dc39439 100644 --- a/swaybar/ipc.c +++ b/swaybar/ipc.c @@ -313,11 +313,13 @@ static bool ipc_parse_config( int length = json_object_array_length(tray_bindings); for (int i = 0; i < length; ++i) { json_object *bind = json_object_array_get_idx(tray_bindings, i); - json_object *button, *command; - json_object_object_get_ex(bind, "input_code", &button); - json_object_object_get_ex(bind, "command", &command); - config->tray_bindings[json_object_get_int(button)] = - strdup(json_object_get_string(command)); + struct tray_binding *binding = + calloc(1, sizeof(struct tray_binding)); + binding->button = json_object_get_int( + json_object_object_get(bind, "event_code")); + binding->command = strdup(json_object_get_string( + json_object_object_get(bind, "command"))); + wl_list_insert(&config->tray_bindings, &binding->link); } } |