aboutsummaryrefslogtreecommitdiffstats
path: root/swaybar/ipc.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-01-10 12:43:10 -0500
committerLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-01-10 12:43:10 -0500
commit3d6440ec26f2b39c54fd03aa3a3c822a8a2bbc72 (patch)
tree05e5dddd092b3d3ba16166a3784a49923e9f3de2 /swaybar/ipc.c
parentMerge pull request #3400 from ianyfan/config-brace (diff)
downloadsway-3d6440ec26f2b39c54fd03aa3a3c822a8a2bbc72.tar.gz
sway-3d6440ec26f2b39c54fd03aa3a3c822a8a2bbc72.tar.zst
sway-3d6440ec26f2b39c54fd03aa3a3c822a8a2bbc72.zip
bar_cmd_bind: utilize mouse button helpers
This modifies `bar_cmd_bindsym` to use `get_mouse_bindsym` for parsing mouse buttons. This also introduces `cmd_bar_bindcode`, which will use `get_mouse_bindcode` for parsing mouse buttons. Like sway bindings, the two commands are encapsulated in a single file with shared code. This also modifies swaybar to operate off of event codes rather than x11 button numbers, which allows for any mouse button to be used. This introduces two new IPC properties: - For `get_bar_config`, `event_code` has been added to the `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`. - Likewise for `click_events`, `event` has been added and will include the event code for the button clicked. If the event code can be mapped to a x11 button, `button` will still be the x11 button number. Otherwise, `button` will be `0`.
Diffstat (limited to 'swaybar/ipc.c')
-rw-r--r--swaybar/ipc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/swaybar/ipc.c b/swaybar/ipc.c
index 8e7a542e..ba53d95d 100644
--- a/swaybar/ipc.c
+++ b/swaybar/ipc.c
@@ -237,7 +237,7 @@ static bool ipc_parse_config(
237 struct swaybar_binding *binding = 237 struct swaybar_binding *binding =
238 calloc(1, sizeof(struct swaybar_binding)); 238 calloc(1, sizeof(struct swaybar_binding));
239 binding->button = json_object_get_int( 239 binding->button = json_object_get_int(
240 json_object_object_get(bindobj, "input_code")); 240 json_object_object_get(bindobj, "event_code"));
241 binding->command = strdup(json_object_get_string( 241 binding->command = strdup(json_object_get_string(
242 json_object_object_get(bindobj, "command"))); 242 json_object_object_get(bindobj, "command")));
243 binding->release = json_object_get_boolean( 243 binding->release = json_object_get_boolean(