1 files changed, 22 insertions, 3 deletions

diff --git a/swaybar/bar.c b/swaybar/bar.c
index 5b8028e5..62a7727e 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -46,7 +46,7 @@ static void swaybar_output_free(struct swaybar_output *output) {
         if (!output) {
                 return;
         }
-        wlr_log(L_DEBUG, "Removing output %s", output->name);
+        wlr_log(WLR_DEBUG, "Removing output %s", output->name);
         zwlr_layer_surface_v1_destroy(output->layer_surface);
         wl_surface_destroy(output->surface);
         wl_output_destroy(output->output);
@@ -146,8 +146,10 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
                                 && y >= hotspot->y
                                 && x < hotspot->x + hotspot->width
                                 && y < hotspot->y + hotspot->height) {
-                        hotspot->callback(output, pointer->x, pointer->y,
-                                        button, hotspot->data);
+                        if (HOTSPOT_IGNORE == hotspot->callback(output, pointer->x, pointer->y,
+                                        wl_button_to_x11_button(button), hotspot->data)) {
+                                return;
+                        }
                 }
         }
 }
@@ -155,11 +157,28 @@ 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) {
+                        if (HOTSPOT_IGNORE == 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;