Merge branch 'master' into pid-workspaces

1 files changed, 36 insertions, 5 deletions

diff --git a/swaybar/i3bar.c b/swaybar/i3bar.c
index 141612a6..ae37eeb9 100644
--- a/swaybar/i3bar.c
+++ b/swaybar/i3bar.c
@@ -1,5 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
 #include <json-c/json.h>
+#include <linux/input-event-codes.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -31,7 +32,7 @@ static bool i3bar_parse_json(struct status_line *status, const char *text) {
 		status_error(status, "[failed to parse i3bar json]");
 		return false;
 	}
-	wlr_log(L_DEBUG, "Got i3bar json: '%s'", text);
+	wlr_log(WLR_DEBUG, "Got i3bar json: '%s'", text);
 	for (size_t i = 0; i < json_object_array_length(results); ++i) {
 		json_object *full_text, *short_text, *color, *min_width, *align, *urgent;
 		json_object *name, *instance, *separator, *separator_block_width;
@@ -191,11 +192,11 @@ bool i3bar_handle_readable(struct status_line *status) {
 	return redraw;
 }
 
-void i3bar_block_send_click(struct status_line *status,
-		struct i3bar_block *block, int x, int y, uint32_t button) {
-	wlr_log(L_DEBUG, "block %s clicked", block->name ? block->name : "(nil)");
+enum hotspot_event_handling i3bar_block_send_click(struct status_line *status,
+		struct i3bar_block *block, int x, int y, enum x11_button button) {
+	wlr_log(WLR_DEBUG, "block %s clicked", block->name ? block->name : "(nil)");
 	if (!block->name || !status->i3bar_state.click_events) {
-		return;
+		return HOTSPOT_PROCESS;
 	}
 
 	struct json_object *event_json = json_object_new_object();
@@ -214,4 +215,34 @@ void i3bar_block_send_click(struct status_line *status,
 		status_error(status, "[failed to write click event]");
 	}
 	json_object_put(event_json);
+	return HOTSPOT_IGNORE;
+}
+
+enum x11_button wl_button_to_x11_button(uint32_t button) {
+	switch (button) {
+	case BTN_LEFT:
+		return LEFT;
+	case BTN_MIDDLE:
+		return MIDDLE;
+	case BTN_RIGHT:
+		return RIGHT;
+	case BTN_SIDE:
+		return BACK;
+	case BTN_EXTRA:
+		return FORWARD;
+	default:
+		return NONE;
+	}
+}
+
+enum x11_button wl_axis_to_x11_button(uint32_t axis, wl_fixed_t value) {
+	switch (axis) {
+	case WL_POINTER_AXIS_VERTICAL_SCROLL:
+		return wl_fixed_to_double(value) < 0 ? SCROLL_UP : SCROLL_DOWN;
+	case WL_POINTER_AXIS_HORIZONTAL_SCROLL:
+		return wl_fixed_to_double(value) < 0 ? SCROLL_LEFT : SCROLL_RIGHT;
+	default:
+		wlr_log(WLR_DEBUG, "Unexpected axis value on mouse scroll");
+		return NONE;
+	}
 }