Merge pull request #2281 from pvsr/X11_click

Send clicks to swaybar blocks as X11 button ids

3 files changed, 49 insertions, 4 deletions

diff --git a/swaybar/bar.c b/swaybar/bar.c
index f03c5aea..94bc48bc 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -147,7 +147,7 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
                                 && x < hotspot->x + hotspot->width
                                 && y < hotspot->y + hotspot->height) {
                         hotspot->callback(output, pointer->x, pointer->y,
-                                        button, hotspot->data);
+                                        wl_button_to_x11_button(button), hotspot->data);
                 }
         }
 }
@@ -155,11 +155,26 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
 static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
                 uint32_t time, uint32_t axis, wl_fixed_t value) {
         struct swaybar *bar = data;
+        struct swaybar_pointer *pointer = &bar->pointer;
         struct swaybar_output *output = bar->pointer.current;
         if (!sway_assert(output, "axis with no active output")) {
                 return;
         }
 
+        struct swaybar_hotspot *hotspot;
+        wl_list_for_each(hotspot, &output->hotspots, link) {
+                double x = pointer->x * output->scale;
+                double y = pointer->y * output->scale;
+                if (x >= hotspot->x
+                                && y >= hotspot->y
+                                && x < hotspot->x + hotspot->width
+                                && y < hotspot->y + hotspot->height) {
+                        hotspot->callback(output, pointer->x, pointer->y,
+                                        wl_axis_to_x11_button(axis, value), hotspot->data);
+                        return;
+                }
+        }
+
         double amt = wl_fixed_to_double(value);
         if (amt == 0.0) {
                 return;
diff --git a/swaybar/i3bar.c b/swaybar/i3bar.c
index 26f073c8..78b183ad 100644
--- a/swaybar/i3bar.c
+++ b/swaybar/i3bar.c
@@ -1,5 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include <json-c/json.h>
+#include <linux/input-event-codes.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -192,7 +193,7 @@ bool i3bar_handle_readable(struct status_line *status) {
 }
 
 void i3bar_block_send_click(struct status_line *status,
-                struct i3bar_block *block, int x, int y, uint32_t button) {
+                struct i3bar_block *block, int x, int y, enum x11_button button) {
         wlr_log(WLR_DEBUG, "block %s clicked", block->name ? block->name : "(nil)");
         if (!block->name || !status->i3bar_state.click_events) {
                 return;
@@ -215,3 +216,32 @@ void i3bar_block_send_click(struct status_line *status,
         }
         json_object_put(event_json);
 }
+
+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;
+        }
+}
+
+enum x11_button wl_axis_to_x11_button(uint32_t axis, wl_fixed_t value) {
+        switch (axis) {
+        case WL_POINTER_AXIS_VERTICAL_SCROLL:
+                return wl_fixed_to_double(value) < 0 ? SCROLL_UP : SCROLL_DOWN;
+        case WL_POINTER_AXIS_HORIZONTAL_SCROLL:
+                return wl_fixed_to_double(value) < 0 ? SCROLL_LEFT : SCROLL_RIGHT;
+        default:
+                wlr_log(WLR_DEBUG, "Unexpected axis value on mouse scroll");
+                return NONE;
+        }
+}
diff --git a/swaybar/render.c b/swaybar/render.c
index 909b56f4..d210e25a 100644
--- a/swaybar/render.c
+++ b/swaybar/render.c
@@ -109,7 +109,7 @@ static void render_sharp_line(cairo_t *cairo, uint32_t color,
 }
 
 static void block_hotspot_callback(struct swaybar_output *output,
-                        int x, int y, uint32_t button, void *data) {
+                        int x, int y, enum x11_button button, void *data) {
         struct i3bar_block *block = data;
         struct status_line *status = output->bar->status;
         i3bar_block_send_click(status, block, x, y, button);
@@ -349,7 +349,7 @@ static const char *strip_workspace_number(const char *ws_name) {
 }
 
 static void workspace_hotspot_callback(struct swaybar_output *output,
-                        int x, int y, uint32_t button, void *data) {
+                        int x, int y, enum x11_button button, void *data) {
         ipc_send_workspace_command(output->bar, (const char *)data);
 }