1 files changed, 34 insertions, 2 deletions

diff --git a/swaybar/i3bar.c b/swaybar/i3bar.c
index 3ea74e13..116c8f6e 100644
--- a/swaybar/i3bar.c
+++ b/swaybar/i3bar.c
@@ -259,8 +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, enum x11_button button) {
+                struct i3bar_block *block, int x, int y, int rx, int ry, int w, int h,
+                uint32_t button) {
         wlr_log(WLR_DEBUG, "block %s clicked", block->name);
         if (!block->name || !status->click_events) {
                 return HOTSPOT_PROCESS;
@@ -274,9 +300,15 @@ 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));
+        json_object_object_add(event_json, "relative_y", json_object_new_int(ry));
+        json_object_object_add(event_json, "width", json_object_new_int(w));
+        json_object_object_add(event_json, "height", json_object_new_int(h));
         if (dprintf(status->write_fd, "%s%s\n", status->clicked ? "," : "",
                                 json_object_to_json_string(event_json)) < 0) {
                 status_error(status, "[failed to write click event]");