aboutsummaryrefslogtreecommitdiffstats
path: root/swaybar/i3bar.c
diff options
context:
space:
mode:
authorLibravatar Hristo Venev <hristo@venev.name>2018-12-04 12:47:59 +0200
committerLibravatar Hristo Venev <hristo@venev.name>2018-12-04 12:49:21 +0200
commit24e8ba048aef4751c6fa1d5982ee634f921e6cf6 (patch)
tree97290bcc79a26e09291d87c549afc1cb0392dabd /swaybar/i3bar.c
parentconfig: do not set $XDG_CONFIG_HOME if unset or empty (diff)
downloadsway-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/i3bar.c')
-rw-r--r--swaybar/i3bar.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/swaybar/i3bar.c b/swaybar/i3bar.c
index 3ea74e13..54607a3a 100644
--- a/swaybar/i3bar.c
+++ b/swaybar/i3bar.c
@@ -260,7 +260,8 @@ bool i3bar_handle_readable(struct status_line *status) {
260} 260}
261 261
262enum hotspot_event_handling i3bar_block_send_click(struct status_line *status, 262enum hotspot_event_handling i3bar_block_send_click(struct status_line *status,
263 struct i3bar_block *block, int x, int y, enum x11_button button) { 263 struct i3bar_block *block, int x, int y, int rx, int ry, int w, int h,
264 enum x11_button button) {
264 wlr_log(WLR_DEBUG, "block %s clicked", block->name); 265 wlr_log(WLR_DEBUG, "block %s clicked", block->name);
265 if (!block->name || !status->click_events) { 266 if (!block->name || !status->click_events) {
266 return HOTSPOT_PROCESS; 267 return HOTSPOT_PROCESS;
@@ -277,6 +278,10 @@ enum hotspot_event_handling i3bar_block_send_click(struct status_line *status,
277 json_object_object_add(event_json, "button", json_object_new_int(button)); 278 json_object_object_add(event_json, "button", json_object_new_int(button));
278 json_object_object_add(event_json, "x", json_object_new_int(x)); 279 json_object_object_add(event_json, "x", json_object_new_int(x));
279 json_object_object_add(event_json, "y", json_object_new_int(y)); 280 json_object_object_add(event_json, "y", json_object_new_int(y));
281 json_object_object_add(event_json, "relative_x", json_object_new_int(rx));
282 json_object_object_add(event_json, "relative_y", json_object_new_int(ry));
283 json_object_object_add(event_json, "width", json_object_new_int(w));
284 json_object_object_add(event_json, "height", json_object_new_int(h));
280 if (dprintf(status->write_fd, "%s%s\n", status->clicked ? "," : "", 285 if (dprintf(status->write_fd, "%s%s\n", status->clicked ? "," : "",
281 json_object_to_json_string(event_json)) < 0) { 286 json_object_to_json_string(event_json)) < 0) {
282 status_error(status, "[failed to write click event]"); 287 status_error(status, "[failed to write click event]");