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`.

1 files changed, 29 insertions, 0 deletions

diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index 53e0e335..61602343 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -1,4 +1,5 @@
 #include <json-c/json.h>
+#include <libevdev/libevdev.h>
 #include <stdio.h>
 #include <ctype.h>
 #include "config.h"
@@ -10,6 +11,7 @@
 #include "sway/tree/workspace.h"
 #include "sway/output.h"
 #include "sway/input/input-manager.h"
+#include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output.h>
@@ -626,6 +628,31 @@ json_object *ipc_json_describe_seat(struct sway_seat *seat) {
         return object;
 }
 
+static uint32_t event_to_x11_button(uint32_t event) {
+        switch (event) {
+        case BTN_LEFT:
+                return 1;
+        case BTN_MIDDLE:
+                return 2;
+        case BTN_RIGHT:
+                return 3;
+        case SWAY_SCROLL_UP:
+                return 4;
+        case SWAY_SCROLL_DOWN:
+                return 5;
+        case SWAY_SCROLL_LEFT:
+                return 6;
+        case SWAY_SCROLL_RIGHT:
+                return 7;
+        case BTN_SIDE:
+                return 8;
+        case BTN_EXTRA:
+                return 9;
+        default:
+                return 0;
+        }
+}
+
 json_object *ipc_json_describe_bar_config(struct bar_config *bar) {
         if (!sway_assert(bar, "Bar must not be NULL")) {
                 return NULL;
@@ -767,6 +794,8 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) {
                         struct bar_binding *binding = bar->bindings->items[i];
                         json_object *bind = json_object_new_object();
                         json_object_object_add(bind, "input_code",
+                                        json_object_new_int(event_to_x11_button(binding->button)));
+                        json_object_object_add(bind, "event_code",
                                         json_object_new_int(binding->button));
                         json_object_object_add(bind, "command",
                                         json_object_new_string(binding->command));