aboutsummaryrefslogtreecommitdiffstats
path: root/sway/ipc-json.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/ipc-json.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/ipc-json.c')
-rw-r--r--sway/ipc-json.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index 6e5ba4fd..d72fc5db 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -852,15 +852,16 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) {
852 } 852 }
853 853
854 json_object *tray_bindings = json_object_new_array(); 854 json_object *tray_bindings = json_object_new_array();
855 for (int i = 0; i < 10; ++i) { 855 struct tray_binding *tray_bind = NULL;
856 if (bar->tray_bindings[i]) { 856 wl_list_for_each(tray_bind, &bar->tray_bindings, link) {
857 json_object *bind = json_object_new_object(); 857 json_object *bind = json_object_new_object();
858 json_object_object_add(bind, "input_code", 858 json_object_object_add(bind, "input_code",
859 json_object_new_int(i)); 859 json_object_new_int(event_to_x11_button(tray_bind->button)));
860 json_object_object_add(bind, "command", 860 json_object_object_add(bind, "event_code",
861 json_object_new_string(bar->tray_bindings[i])); 861 json_object_new_int(tray_bind->button));
862 json_object_array_add(tray_bindings, bind); 862 json_object_object_add(bind, "command",
863 } 863 json_object_new_string(tray_bind->command));
864 json_object_array_add(tray_bindings, bind);
864 } 865 }
865 if (json_object_array_length(tray_bindings) > 0) { 866 if (json_object_array_length(tray_bindings) > 0) {
866 json_object_object_add(json, "tray_bindings", tray_bindings); 867 json_object_object_add(json, "tray_bindings", tray_bindings);