diff options
author | Ian Fan <ianfan0@gmail.com> | 2018-10-17 20:21:27 +0100 |
---|---|---|
committer | Ian Fan <ianfan0@gmail.com> | 2018-10-18 14:19:00 +0100 |
commit | 499150a91b706b9829ca763ede9b97c573b51cb7 (patch) | |
tree | 09ff2da2b266f152e590db839f0c5e2016888552 /swaybar/i3bar.c | |
parent | Merge pull request #2871 from RyanDwyer/untangle-cursor-warp (diff) | |
download | sway-499150a91b706b9829ca763ede9b97c573b51cb7.tar.gz sway-499150a91b706b9829ca763ede9b97c573b51cb7.tar.zst sway-499150a91b706b9829ca763ede9b97c573b51cb7.zip |
swaybar: separate input code to new file
Diffstat (limited to 'swaybar/i3bar.c')
-rw-r--r-- | swaybar/i3bar.c | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/swaybar/i3bar.c b/swaybar/i3bar.c index 1d754808..3ea74e13 100644 --- a/swaybar/i3bar.c +++ b/swaybar/i3bar.c | |||
@@ -9,6 +9,7 @@ | |||
9 | #include "swaybar/bar.h" | 9 | #include "swaybar/bar.h" |
10 | #include "swaybar/config.h" | 10 | #include "swaybar/config.h" |
11 | #include "swaybar/i3bar.h" | 11 | #include "swaybar/i3bar.h" |
12 | #include "swaybar/input.h" | ||
12 | #include "swaybar/status_line.h" | 13 | #include "swaybar/status_line.h" |
13 | 14 | ||
14 | void i3bar_block_unref(struct i3bar_block *block) { | 15 | void i3bar_block_unref(struct i3bar_block *block) { |
@@ -284,32 +285,3 @@ enum hotspot_event_handling i3bar_block_send_click(struct status_line *status, | |||
284 | json_object_put(event_json); | 285 | json_object_put(event_json); |
285 | return HOTSPOT_IGNORE; | 286 | return HOTSPOT_IGNORE; |
286 | } | 287 | } |
287 | |||
288 | enum x11_button wl_button_to_x11_button(uint32_t button) { | ||
289 | switch (button) { | ||
290 | case BTN_LEFT: | ||
291 | return LEFT; | ||
292 | case BTN_MIDDLE: | ||
293 | return MIDDLE; | ||
294 | case BTN_RIGHT: | ||
295 | return RIGHT; | ||
296 | case BTN_SIDE: | ||
297 | return BACK; | ||
298 | case BTN_EXTRA: | ||
299 | return FORWARD; | ||
300 | default: | ||
301 | return NONE; | ||
302 | } | ||
303 | } | ||
304 | |||
305 | enum x11_button wl_axis_to_x11_button(uint32_t axis, wl_fixed_t value) { | ||
306 | switch (axis) { | ||
307 | case WL_POINTER_AXIS_VERTICAL_SCROLL: | ||
308 | return wl_fixed_to_double(value) < 0 ? SCROLL_UP : SCROLL_DOWN; | ||
309 | case WL_POINTER_AXIS_HORIZONTAL_SCROLL: | ||
310 | return wl_fixed_to_double(value) < 0 ? SCROLL_LEFT : SCROLL_RIGHT; | ||
311 | default: | ||
312 | wlr_log(WLR_DEBUG, "Unexpected axis value on mouse scroll"); | ||
313 | return NONE; | ||
314 | } | ||
315 | } | ||