4 files changed, 50 insertions, 38 deletions

diff --git a/swaybar/i3bar.c b/swaybar/i3bar.c
index 54607a3a..116c8f6e 100644
--- a/swaybar/i3bar.c
+++ b/swaybar/i3bar.c
@@ -259,9 +259,34 @@ bool i3bar_handle_readable(struct status_line *status) {
         }
 }
 
+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;
+        }
+}
+
 enum hotspot_event_handling i3bar_block_send_click(struct status_line *status,
                 struct i3bar_block *block, int x, int y, int rx, int ry, int w, int h,
-                enum x11_button button) {
+                uint32_t button) {
         wlr_log(WLR_DEBUG, "block %s clicked", block->name);
         if (!block->name || !status->click_events) {
                 return HOTSPOT_PROCESS;
@@ -275,7 +300,9 @@ enum hotspot_event_handling i3bar_block_send_click(struct status_line *status,
                                 json_object_new_string(block->instance));
         }
 
-        json_object_object_add(event_json, "button", json_object_new_int(button));
+        json_object_object_add(event_json, "button",
+                        json_object_new_int(event_to_x11_button(button)));
+        json_object_object_add(event_json, "event", json_object_new_int(button));
         json_object_object_add(event_json, "x", json_object_new_int(x));
         json_object_object_add(event_json, "y", json_object_new_int(y));
         json_object_object_add(event_json, "relative_x", json_object_new_int(rx));
diff --git a/swaybar/input.c b/swaybar/input.c
index 620da977..bdd55e58 100644
--- a/swaybar/input.c
+++ b/swaybar/input.c
@@ -22,32 +22,16 @@ void free_hotspots(struct wl_list *list) {
         }
 }
 
-static enum x11_button wl_button_to_x11_button(uint32_t button) {
-        switch (button) {
-        case BTN_LEFT:
-                return LEFT;
-        case BTN_MIDDLE:
-                return MIDDLE;
-        case BTN_RIGHT:
-                return RIGHT;
-        case BTN_SIDE:
-                return BACK;
-        case BTN_EXTRA:
-                return FORWARD;
-        default:
-                return NONE;
-        }
-}
-
-static enum x11_button wl_axis_to_x11_button(uint32_t axis, wl_fixed_t value) {
+static uint32_t wl_axis_to_button(uint32_t axis, wl_fixed_t value) {
+        bool negative = wl_fixed_to_double(value) < 0;
         switch (axis) {
         case WL_POINTER_AXIS_VERTICAL_SCROLL:
-                return wl_fixed_to_double(value) < 0 ? SCROLL_UP : SCROLL_DOWN;
+                return negative ? SWAY_SCROLL_UP : SWAY_SCROLL_DOWN;
         case WL_POINTER_AXIS_HORIZONTAL_SCROLL:
-                return wl_fixed_to_double(value) < 0 ? SCROLL_LEFT : SCROLL_RIGHT;
+                return negative ? SWAY_SCROLL_LEFT : SWAY_SCROLL_RIGHT;
         default:
                 wlr_log(WLR_DEBUG, "Unexpected axis value on mouse scroll");
-                return NONE;
+                return 0;
         }
 }
 
@@ -102,12 +86,12 @@ static void wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
         bar->pointer.y = wl_fixed_to_int(surface_y);
 }
 
-static bool check_bindings(struct swaybar *bar, uint32_t x11_button,
+static bool check_bindings(struct swaybar *bar, uint32_t button,
                 uint32_t state) {
         bool released = state == WL_POINTER_BUTTON_STATE_RELEASED;
         for (int i = 0; i < bar->config->bindings->length; i++) {
                 struct swaybar_binding *binding = bar->config->bindings->items[i];
-                if (binding->button == x11_button && binding->release == released) {
+                if (binding->button == button && binding->release == released) {
                         ipc_execute_binding(bar, binding);
                         return true;
                 }
@@ -124,7 +108,7 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
                 return;
         }
 
-        if (check_bindings(bar, wl_button_to_x11_button(button), state)) {
+        if (check_bindings(bar, button, state)) {
                 return;
         }
 
@@ -140,7 +124,7 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
                                 && x < hotspot->x + hotspot->width
                                 && y < hotspot->y + hotspot->height) {
                         if (HOTSPOT_IGNORE == hotspot->callback(output, hotspot,
-                                        pointer->x, pointer->y, wl_button_to_x11_button(button), hotspot->data)) {
+                                        pointer->x, pointer->y, button, hotspot->data)) {
                                 return;
                         }
                 }
@@ -158,7 +142,7 @@ static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
 
         // If there is a button press binding, execute it, skip default behavior,
         // and check button release bindings
-        enum x11_button button = wl_axis_to_x11_button(axis, value);
+        uint32_t button = wl_axis_to_button(axis, value);
         if (check_bindings(bar, button, WL_POINTER_BUTTON_STATE_PRESSED)) {
                 check_bindings(bar, button, WL_POINTER_BUTTON_STATE_RELEASED);
                 return;
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(
                         struct swaybar_binding *binding =
                                 calloc(1, sizeof(struct swaybar_binding));
                         binding->button = json_object_get_int(
-                                        json_object_object_get(bindobj, "input_code"));
+                                        json_object_object_get(bindobj, "event_code"));
                         binding->command = strdup(json_object_get_string(
                                         json_object_object_get(bindobj, "command")));
                         binding->release = json_object_get_boolean(
diff --git a/swaybar/render.c b/swaybar/render.c
index 7cbcea07..670e8e74 100644
--- a/swaybar/render.c
+++ b/swaybar/render.c
@@ -1,5 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
+#include <linux/input-event-codes.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -126,13 +127,13 @@ static void render_sharp_line(cairo_t *cairo, uint32_t color,
         }
 }
 
-static enum hotspot_event_handling block_hotspot_callback(struct swaybar_output *output,
-                struct swaybar_hotspot *hotspot,
-                int x, int y, enum x11_button button, void *data) {
+static enum hotspot_event_handling block_hotspot_callback(
+                struct swaybar_output *output, struct swaybar_hotspot *hotspot,
+                int x, int y, uint32_t button, void *data) {
         struct i3bar_block *block = data;
         struct status_line *status = output->bar->status;
-        return i3bar_block_send_click(status, block, x, y, x - hotspot->x, y - hotspot->y,
-                        hotspot->width, hotspot->height, button);
+        return i3bar_block_send_click(status, block, x, y, x - hotspot->x,
+                        y - hotspot->y, hotspot->width, hotspot->height, button);
 }
 
 static void i3bar_block_unref_callback(void *data) {
@@ -360,10 +361,10 @@ static uint32_t render_binding_mode_indicator(cairo_t *cairo,
         return output->height;
 }
 
-static enum hotspot_event_handling workspace_hotspot_callback(struct swaybar_output *output,
-                struct swaybar_hotspot *hotspot,
-                int x, int y, enum x11_button button, void *data) {
-        if (button != LEFT) {
+static enum hotspot_event_handling workspace_hotspot_callback(
+                struct swaybar_output *output, struct swaybar_hotspot *hotspot,
+                int x, int y, uint32_t button, void *data) {
+        if (button != BTN_LEFT) {
                 return HOTSPOT_PROCESS;
         }
         ipc_send_workspace_command(output->bar, (const char *)data);