diff options
author | Hristo Venev <hristo@venev.name> | 2018-12-04 12:47:59 +0200 |
---|---|---|
committer | Hristo Venev <hristo@venev.name> | 2018-12-04 12:49:21 +0200 |
commit | 24e8ba048aef4751c6fa1d5982ee634f921e6cf6 (patch) | |
tree | 97290bcc79a26e09291d87c549afc1cb0392dabd /swaybar/render.c | |
parent | config: do not set $XDG_CONFIG_HOME if unset or empty (diff) | |
download | sway-24e8ba048aef4751c6fa1d5982ee634f921e6cf6.tar.gz sway-24e8ba048aef4751c6fa1d5982ee634f921e6cf6.tar.zst sway-24e8ba048aef4751c6fa1d5982ee634f921e6cf6.zip |
Add relative coordinates in JSON for i3bar click events
Compatibility with i3 commit 161db6f17d734ac9deb0a20e81b78d4b2a92ce68.
Diffstat (limited to 'swaybar/render.c')
-rw-r--r-- | swaybar/render.c | 9 |
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, | |||
112 | } | 112 | } |
113 | 113 | ||
114 | static enum hotspot_event_handling block_hotspot_callback(struct swaybar_output *output, | 114 | static enum hotspot_event_handling block_hotspot_callback(struct swaybar_output *output, |
115 | int x, int y, enum x11_button button, void *data) { | 115 | struct swaybar_hotspot *hotspot, |
116 | int x, int y, enum x11_button button, void *data) { | ||
116 | struct i3bar_block *block = data; | 117 | struct i3bar_block *block = data; |
117 | struct status_line *status = output->bar->status; | 118 | struct status_line *status = output->bar->status; |
118 | return i3bar_block_send_click(status, block, x, y, button); | 119 | return i3bar_block_send_click(status, block, x, y, x - hotspot->x, y - hotspot->y, |
120 | hotspot->width, hotspot->height, button); | ||
119 | } | 121 | } |
120 | 122 | ||
121 | static void i3bar_block_unref_callback(void *data) { | 123 | static void i3bar_block_unref_callback(void *data) { |
@@ -343,7 +345,8 @@ static uint32_t render_binding_mode_indicator(cairo_t *cairo, | |||
343 | } | 345 | } |
344 | 346 | ||
345 | static enum hotspot_event_handling workspace_hotspot_callback(struct swaybar_output *output, | 347 | static enum hotspot_event_handling workspace_hotspot_callback(struct swaybar_output *output, |
346 | int x, int y, enum x11_button button, void *data) { | 348 | struct swaybar_hotspot *hotspot, |
349 | int x, int y, enum x11_button button, void *data) { | ||
347 | if (button != LEFT) { | 350 | if (button != LEFT) { |
348 | return HOTSPOT_PROCESS; | 351 | return HOTSPOT_PROCESS; |
349 | } | 352 | } |