diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2018-10-09 08:12:02 -0400 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2018-10-09 08:12:46 -0400 |
commit | d3f0e52784712696c7174d3adf8ec6cf3ac31b19 (patch) | |
tree | 313ca9e6eb03e9f5971d3fde90ace73b613ca9e4 | |
parent | Implement bar bindsym (diff) | |
download | sway-d3f0e52784712696c7174d3adf8ec6cf3ac31b19.tar.gz sway-d3f0e52784712696c7174d3adf8ec6cf3ac31b19.tar.zst sway-d3f0e52784712696c7174d3adf8ec6cf3ac31b19.zip |
bar-bindsym: address ianyfan's comments
-rw-r--r-- | sway/commands/bar/bindsym.c | 6 | ||||
-rw-r--r-- | sway/config/bar.c | 9 | ||||
-rw-r--r-- | swaybar/bar.c | 13 | ||||
-rw-r--r-- | swaybar/config.c | 16 | ||||
-rw-r--r-- | swaybar/ipc.c | 2 |
5 files changed, 28 insertions, 18 deletions
diff --git a/sway/commands/bar/bindsym.c b/sway/commands/bar/bindsym.c index b0df9eff..4eea3e6a 100644 --- a/sway/commands/bar/bindsym.c +++ b/sway/commands/bar/bindsym.c | |||
@@ -33,12 +33,12 @@ struct cmd_results *bar_cmd_bindsym(int argc, char **argv) { | |||
33 | binding->button = 0; | 33 | binding->button = 0; |
34 | if (strncasecmp(argv[0], "button", strlen("button")) == 0 && | 34 | if (strncasecmp(argv[0], "button", strlen("button")) == 0 && |
35 | strlen(argv[0]) == strlen("button0")) { | 35 | strlen(argv[0]) == strlen("button0")) { |
36 | binding->button = argv[0][strlen("button")] - '1' + 1; | 36 | binding->button = argv[0][strlen("button")] - '0'; |
37 | } | 37 | } |
38 | if (binding->button == 0) { | 38 | if (binding->button < 1 || binding->button > 9) { |
39 | free_bar_binding(binding); | 39 | free_bar_binding(binding); |
40 | return cmd_results_new(CMD_FAILURE, "bar bindsym", | 40 | return cmd_results_new(CMD_FAILURE, "bar bindsym", |
41 | "Only button<n> is supported"); | 41 | "Only button<1-9> is supported"); |
42 | } | 42 | } |
43 | 43 | ||
44 | binding->command = join_args(argv + 1, argc - 1); | 44 | binding->command = join_args(argv + 1, argc - 1); |
diff --git a/sway/config/bar.c b/sway/config/bar.c index f84407c9..c6899f57 100644 --- a/sway/config/bar.c +++ b/sway/config/bar.c | |||
@@ -32,9 +32,7 @@ void free_bar_binding(struct bar_binding *binding) { | |||
32 | if (!binding) { | 32 | if (!binding) { |
33 | return; | 33 | return; |
34 | } | 34 | } |
35 | if (binding->command) { | 35 | free(binding->command); |
36 | free(binding->command); | ||
37 | } | ||
38 | free(binding); | 36 | free(binding); |
39 | } | 37 | } |
40 | 38 | ||
@@ -49,9 +47,8 @@ void free_bar_config(struct bar_config *bar) { | |||
49 | free(bar->status_command); | 47 | free(bar->status_command); |
50 | free(bar->font); | 48 | free(bar->font); |
51 | free(bar->separator_symbol); | 49 | free(bar->separator_symbol); |
52 | while (bar->bindings->length) { | 50 | for (int i = 0; i < bar->bindings->length; i++) { |
53 | struct bar_binding *binding = bar->bindings->items[0]; | 51 | struct bar_binding *binding = bar->bindings->items[i]; |
54 | list_del(bar->bindings, 0); | ||
55 | free_bar_binding(binding); | 52 | free_bar_binding(binding); |
56 | } | 53 | } |
57 | list_free(bar->bindings); | 54 | list_free(bar->bindings); |
diff --git a/swaybar/bar.c b/swaybar/bar.c index 3eeec5d4..5b7fea71 100644 --- a/swaybar/bar.c +++ b/swaybar/bar.c | |||
@@ -149,9 +149,6 @@ static bool check_bindings(struct swaybar *bar, uint32_t x11_button, | |||
149 | bool released = state == WL_POINTER_BUTTON_STATE_RELEASED; | 149 | bool released = state == WL_POINTER_BUTTON_STATE_RELEASED; |
150 | for (int i = 0; i < bar->config->bindings->length; i++) { | 150 | for (int i = 0; i < bar->config->bindings->length; i++) { |
151 | struct swaybar_binding *binding = bar->config->bindings->items[i]; | 151 | struct swaybar_binding *binding = bar->config->bindings->items[i]; |
152 | wlr_log(WLR_DEBUG, "Checking [%u, %d] against [%u, %d, %s]", | ||
153 | x11_button, released, | ||
154 | binding->button, binding->release, binding->command); | ||
155 | if (binding->button == x11_button && binding->release == released) { | 152 | if (binding->button == x11_button && binding->release == released) { |
156 | ipc_execute_binding(bar, binding); | 153 | ipc_execute_binding(bar, binding); |
157 | return true; | 154 | return true; |
@@ -201,8 +198,12 @@ static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer, | |||
201 | return; | 198 | return; |
202 | } | 199 | } |
203 | 200 | ||
201 | // If there is a button press binding, execute it, skip default behavior, | ||
202 | // and check button release bindings | ||
204 | if (check_bindings(bar, wl_axis_to_x11_button(axis, value), | 203 | if (check_bindings(bar, wl_axis_to_x11_button(axis, value), |
205 | WL_POINTER_BUTTON_STATE_PRESSED)) { | 204 | WL_POINTER_BUTTON_STATE_PRESSED)) { |
205 | check_bindings(bar, wl_axis_to_x11_button(axis, value), | ||
206 | WL_POINTER_BUTTON_STATE_RELEASED); | ||
206 | return; | 207 | return; |
207 | } | 208 | } |
208 | 209 | ||
@@ -273,6 +274,10 @@ static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer, | |||
273 | } | 274 | } |
274 | 275 | ||
275 | ipc_send_workspace_command(bar, new->name); | 276 | ipc_send_workspace_command(bar, new->name); |
277 | |||
278 | // Check button release bindings | ||
279 | check_bindings(bar, wl_axis_to_x11_button(axis, value), | ||
280 | WL_POINTER_BUTTON_STATE_RELEASED); | ||
276 | } | 281 | } |
277 | 282 | ||
278 | static void wl_pointer_frame(void *data, struct wl_pointer *wl_pointer) { | 283 | static void wl_pointer_frame(void *data, struct wl_pointer *wl_pointer) { |
diff --git a/swaybar/config.c b/swaybar/config.c index c646fe66..09d40c24 100644 --- a/swaybar/config.c +++ b/swaybar/config.c | |||
@@ -72,16 +72,22 @@ struct swaybar_config *init_config(void) { | |||
72 | return config; | 72 | return config; |
73 | } | 73 | } |
74 | 74 | ||
75 | static void free_binding(struct swaybar_binding *binding) { | ||
76 | if (!binding) { | ||
77 | return; | ||
78 | } | ||
79 | free(binding->command); | ||
80 | free(binding); | ||
81 | } | ||
82 | |||
75 | void free_config(struct swaybar_config *config) { | 83 | void free_config(struct swaybar_config *config) { |
76 | free(config->status_command); | 84 | free(config->status_command); |
77 | free(config->font); | 85 | free(config->font); |
78 | free(config->mode); | 86 | free(config->mode); |
79 | free(config->sep_symbol); | 87 | free(config->sep_symbol); |
80 | while (config->bindings->length) { | 88 | for (int i = 0; i < config->bindings->length; i++) { |
81 | struct swaybar_binding *binding = config->bindings->items[0]; | 89 | struct swaybar_binding *binding = config->bindings->items[i]; |
82 | list_del(config->bindings, 0); | 90 | free_binding(binding); |
83 | free(binding->command); | ||
84 | free(binding); | ||
85 | } | 91 | } |
86 | list_free(config->bindings); | 92 | list_free(config->bindings); |
87 | struct config_output *coutput, *tmp; | 93 | struct config_output *coutput, *tmp; |
diff --git a/swaybar/ipc.c b/swaybar/ipc.c index 70086a36..a67814c1 100644 --- a/swaybar/ipc.c +++ b/swaybar/ipc.c | |||
@@ -338,6 +338,8 @@ static void ipc_get_outputs(struct swaybar *bar) { | |||
338 | } | 338 | } |
339 | 339 | ||
340 | void ipc_execute_binding(struct swaybar *bar, struct swaybar_binding *bind) { | 340 | void ipc_execute_binding(struct swaybar *bar, struct swaybar_binding *bind) { |
341 | wlr_log(WLR_DEBUG, "Executing binding for button %u (release=%d): `%s`", | ||
342 | bind->button, bind->release, bind->command); | ||
341 | uint32_t len = strlen(bind->command); | 343 | uint32_t len = strlen(bind->command); |
342 | free(ipc_single_command(bar->ipc_socketfd, | 344 | free(ipc_single_command(bar->ipc_socketfd, |
343 | IPC_COMMAND, bind->command, &len)); | 345 | IPC_COMMAND, bind->command, &len)); |