Merge pull request #3252 from hvenev/swaybar-rel

Add relative coordinates in JSON for i3bar click events

1 files changed, 6 insertions, 3 deletions

diff --git a/swaybar/render.c b/swaybar/render.c
index 77cfecbf..481e0293 100644
--- a/swaybar/render.c
+++ b/swaybar/render.c
@@ -112,10 +112,12 @@ static void render_sharp_line(cairo_t *cairo, uint32_t color,
 }
 
 static enum hotspot_event_handling block_hotspot_callback(struct swaybar_output *output,
-                        int x, int y, enum x11_button button, void *data) {
+                struct swaybar_hotspot *hotspot,
+                int x, int y, enum x11_button button, void *data) {
         struct i3bar_block *block = data;
         struct status_line *status = output->bar->status;
-        return i3bar_block_send_click(status, block, x, y, 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) {
@@ -343,7 +345,8 @@ static uint32_t render_binding_mode_indicator(cairo_t *cairo,
 }
 
 static enum hotspot_event_handling workspace_hotspot_callback(struct swaybar_output *output,
-                        int x, int y, enum x11_button button, void *data) {
+                struct swaybar_hotspot *hotspot,
+                int x, int y, enum x11_button button, void *data) {
         if (button != LEFT) {
                 return HOTSPOT_PROCESS;
         }