From 24e8ba048aef4751c6fa1d5982ee634f921e6cf6 Mon Sep 17 00:00:00 2001
From: Hristo Venev <hristo@venev.name>
Date: Tue, 4 Dec 2018 12:47:59 +0200
Subject: Add relative coordinates in JSON for i3bar click events
Compatibility with i3 commit 161db6f17d734ac9deb0a20e81b78d4b2a92ce68.
---
include/swaybar/i3bar.h | 3 ++-
include/swaybar/input.h | 3 ++-
swaybar/i3bar.c | 7 ++++++-
swaybar/input.c | 8 ++++----
swaybar/render.c | 9 ++++++---
5 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/include/swaybar/i3bar.h b/include/swaybar/i3bar.h
index 3f1ecc25..ab4744a5 100644
--- a/include/swaybar/i3bar.h
+++ b/include/swaybar/i3bar.h
@@ -27,6 +27,7 @@ struct i3bar_block {
void i3bar_block_unref(struct i3bar_block *block);
bool i3bar_handle_readable(struct status_line *status);
enum hotspot_event_handling i3bar_block_send_click(struct status_line *status,
- struct i3bar_block *block, int x, int y, enum x11_button button);
+ struct i3bar_block *block, int x, int y, int rx, int ry, int w, int h,
+ enum x11_button button);
#endif
diff --git a/include/swaybar/input.h b/include/swaybar/input.h
index a552e7ac..390309a0 100644
--- a/include/swaybar/input.h
+++ b/include/swaybar/input.h
@@ -37,7 +37,8 @@ struct swaybar_hotspot {
struct wl_list link; // swaybar_output::hotspots
int x, y, width, height;
enum hotspot_event_handling (*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);
void (*destroy)(void *data);
void *data;
};
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) {
}
enum hotspot_event_handling i3bar_block_send_click(struct status_line *status,
- struct i3bar_block *block, int x, int y, enum x11_button button) {
+ struct i3bar_block *block, int x, int y, int rx, int ry, int w, int h,
+ enum x11_button button) {
wlr_log(WLR_DEBUG, "block %s clicked", block->name);
if (!block->name || !status->click_events) {
return HOTSPOT_PROCESS;
@@ -277,6 +278,10 @@ enum hotspot_event_handling i3bar_block_send_click(struct status_line *status,
json_object_object_add(event_json, "button", json_object_new_int(button));
json_object_object_add(event_json, "x", json_object_new_int(x));
json_object_object_add(event_json, "y", json_object_new_int(y));
+ json_object_object_add(event_json, "relative_x", json_object_new_int(rx));
+ json_object_object_add(event_json, "relative_y", json_object_new_int(ry));
+ json_object_object_add(event_json, "width", json_object_new_int(w));
+ json_object_object_add(event_json, "height", json_object_new_int(h));
if (dprintf(status->write_fd, "%s%s\n", status->clicked ? "," : "",
json_object_to_json_string(event_json)) < 0) {
status_error(status, "[failed to write click event]");
diff --git a/swaybar/input.c b/swaybar/input.c
index 263d0253..1f8491f6 100644
--- a/swaybar/input.c
+++ b/swaybar/input.c
@@ -133,8 +133,8 @@ 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) {
- if (HOTSPOT_IGNORE == hotspot->callback(output, pointer->x, pointer->y,
- wl_button_to_x11_button(button), hotspot->data)) {
+ if (HOTSPOT_IGNORE == hotspot->callback(output, hotspot,
+ pointer->x, pointer->y, wl_button_to_x11_button(button), hotspot->data)) {
return;
}
}
@@ -166,8 +166,8 @@ static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
&& y >= hotspot->y
&& x < hotspot->x + hotspot->width
&& y < hotspot->y + hotspot->height) {
- if (HOTSPOT_IGNORE == hotspot->callback(
- output, pointer->x, pointer->y, button, hotspot->data)) {
+ if (HOTSPOT_IGNORE == hotspot->callback(output, hotspot,
+ pointer->x, pointer->y, button, hotspot->data)) {
return;
}
}
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;
}
--
cgit v1.2.3