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 /swaybar/bar.c | |
parent | Implement bar bindsym (diff) | |
download | sway-d3f0e52784712696c7174d3adf8ec6cf3ac31b19.tar.gz sway-d3f0e52784712696c7174d3adf8ec6cf3ac31b19.tar.zst sway-d3f0e52784712696c7174d3adf8ec6cf3ac31b19.zip |
bar-bindsym: address ianyfan's comments
Diffstat (limited to 'swaybar/bar.c')
-rw-r--r-- | swaybar/bar.c | 13 |
1 files changed, 9 insertions, 4 deletions
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) { |