Merge pull request #2874 from ianyfan/swaybar

swaybar: separate input code to new file

1 files changed, 1 insertions, 247 deletions

diff --git a/swaybar/bar.c b/swaybar/bar.c
index 0deba72d..5e9767b2 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -11,14 +11,10 @@
 #include <wayland-client.h>
 #include <wayland-cursor.h>
 #include <wlr/util/log.h>
-#ifdef __FreeBSD__
-#include <dev/evdev/input-event-codes.h>
-#else
-#include <linux/input-event-codes.h>
-#endif
 #include "swaybar/bar.h"
 #include "swaybar/config.h"
 #include "swaybar/i3bar.h"
+#include "swaybar/input.h"
 #include "swaybar/ipc.h"
 #include "swaybar/status_line.h"
 #include "swaybar/render.h"
@@ -36,17 +32,6 @@ static void bar_init(struct swaybar *bar) {
 	wl_list_init(&bar->outputs);
 }
 
-void free_hotspots(struct wl_list *list) {
-	struct swaybar_hotspot *hotspot, *tmp;
-	wl_list_for_each_safe(hotspot, tmp, list, link) {
-		wl_list_remove(&hotspot->link);
-		if (hotspot->destroy) {
-			hotspot->destroy(hotspot->data);
-		}
-		free(hotspot);
-	}
-}
-
 void free_workspaces(struct wl_list *list) {
 	struct swaybar_workspace *ws, *tmp;
 	wl_list_for_each_safe(ws, tmp, list, link) {
@@ -107,237 +92,6 @@ struct zwlr_layer_surface_v1_listener layer_surface_listener = {
 	.closed = layer_surface_closed,
 };
 
-static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
-		uint32_t serial, struct wl_surface *surface,
-		wl_fixed_t surface_x, wl_fixed_t surface_y) {
-	struct swaybar *bar = data;
-	struct swaybar_pointer *pointer = &bar->pointer;
-	struct swaybar_output *output;
-	wl_list_for_each(output, &bar->outputs, link) {
-		if (output->surface == surface) {
-			pointer->current = output;
-			break;
-		}
-	}
-	int max_scale = 1;
-	struct swaybar_output *_output;
-	wl_list_for_each(_output, &bar->outputs, link) {
-		if (_output->scale > max_scale) {
-			max_scale = _output->scale;
-		}
-	}
-	wl_surface_set_buffer_scale(pointer->cursor_surface, max_scale);
-	wl_surface_attach(pointer->cursor_surface,
-			wl_cursor_image_get_buffer(pointer->cursor_image), 0, 0);
-	wl_pointer_set_cursor(wl_pointer, serial, pointer->cursor_surface,
-			pointer->cursor_image->hotspot_x / max_scale,
-			pointer->cursor_image->hotspot_y / max_scale);
-	wl_surface_commit(pointer->cursor_surface);
-}
-
-static void wl_pointer_leave(void *data, struct wl_pointer *wl_pointer,
-		uint32_t serial, struct wl_surface *surface) {
-	struct swaybar *bar = data;
-	bar->pointer.current = NULL;
-}
-
-static void wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
-		uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) {
-	struct swaybar *bar = data;
-	bar->pointer.x = wl_fixed_to_int(surface_x);
-	bar->pointer.y = wl_fixed_to_int(surface_y);
-}
-
-static bool check_bindings(struct swaybar *bar, uint32_t x11_button,
-		uint32_t state) {
-	bool released = state == WL_POINTER_BUTTON_STATE_RELEASED;
-	for (int i = 0; i < bar->config->bindings->length; i++) {
-		struct swaybar_binding *binding = bar->config->bindings->items[i];
-		if (binding->button == x11_button && binding->release == released) {
-			ipc_execute_binding(bar, binding);
-			return true;
-		}
-	}
-	return false;
-}
-
-static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
-		uint32_t serial, uint32_t time, uint32_t button, uint32_t state) {
-	struct swaybar *bar = data;
-	struct swaybar_pointer *pointer = &bar->pointer;
-	struct swaybar_output *output = pointer->current;
-	if (!sway_assert(output, "button with no active output")) {
-		return;
-	}
-
-	if (check_bindings(bar, wl_button_to_x11_button(button), state)) {
-		return;
-	}
-
-	if (state != WL_POINTER_BUTTON_STATE_PRESSED) {
-		return;
-	}
-	struct swaybar_hotspot *hotspot;
-	wl_list_for_each(hotspot, &output->hotspots, link) {
-		double x = pointer->x * output->scale;
-		double y = pointer->y * output->scale;
-		if (x >= hotspot->x
-				&& 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)) {
-				return;
-			}
-		}
-	}
-}
-
-static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
-		uint32_t time, uint32_t axis, wl_fixed_t value) {
-	struct swaybar *bar = data;
-	struct swaybar_pointer *pointer = &bar->pointer;
-	struct swaybar_output *output = bar->pointer.current;
-	if (!sway_assert(output, "axis with no active output")) {
-		return;
-	}
-
-	// If there is a button press binding, execute it, skip default behavior,
-	// and check button release bindings
-	if (check_bindings(bar, wl_axis_to_x11_button(axis, value),
-			WL_POINTER_BUTTON_STATE_PRESSED)) {
-		check_bindings(bar, wl_axis_to_x11_button(axis, value),
-				WL_POINTER_BUTTON_STATE_RELEASED);
-		return;
-	}
-
-	struct swaybar_hotspot *hotspot;
-	wl_list_for_each(hotspot, &output->hotspots, link) {
-		double x = pointer->x * output->scale;
-		double y = pointer->y * output->scale;
-		if (x >= hotspot->x
-				&& y >= hotspot->y
-				&& x < hotspot->x + hotspot->width
-				&& y < hotspot->y + hotspot->height) {
-			if (HOTSPOT_IGNORE == hotspot->callback(
-					output, pointer->x, pointer->y,
-					wl_axis_to_x11_button(axis, value), hotspot->data)) {
-				return;
-			}
-		}
-	}
-
-	double amt = wl_fixed_to_double(value);
-	if (amt == 0.0) {
-		return;
-	}
-
-	// last doesn't actually need initialization,
-	// but gcc (7.3.1) is too dumb to figure it out
-	struct swaybar_workspace *first = NULL;
-	struct swaybar_workspace *active = NULL;
-	struct swaybar_workspace *last = NULL;
-
-	struct swaybar_workspace *iter;
-	wl_list_for_each(iter, &output->workspaces, link) {
-		if (!first) {
-			first = iter;
-		}
-
-		if (iter->visible) {
-			active = iter;
-		}
-
-		last = iter;
-	}
-
-	if (!sway_assert(active, "axis with null workspace")) {
-		return;
-	}
-
-	struct swaybar_workspace *new;
-
-	if (amt > 0.0) {
-		if (active == first) {
-			if (!bar->config->wrap_scroll) {
-				return;
-			}
-			new = last;
-		}
-
-		new = wl_container_of(active->link.prev, new, link);
-	} else {
-		if (active == last) {
-			if (!bar->config->wrap_scroll) {
-				return;
-			}
-			new = first;
-		}
-
-		new = wl_container_of(active->link.next, new, link);
-	}
-
-	ipc_send_workspace_command(bar, new->name);
-
-	// Check button release bindings
-	check_bindings(bar, wl_axis_to_x11_button(axis, value),
-			WL_POINTER_BUTTON_STATE_RELEASED);
-}
-
-static void wl_pointer_frame(void *data, struct wl_pointer *wl_pointer) {
-	// Who cares
-}
-
-static void wl_pointer_axis_source(void *data, struct wl_pointer *wl_pointer,
-		uint32_t axis_source) {
-	// Who cares
-}
-
-static void wl_pointer_axis_stop(void *data, struct wl_pointer *wl_pointer,
-		uint32_t time, uint32_t axis) {
-	// Who cares
-}
-
-static void wl_pointer_axis_discrete(void *data, struct wl_pointer *wl_pointer,
-		uint32_t axis, int32_t discrete) {
-	// Who cares
-}
-
-struct wl_pointer_listener pointer_listener = {
-	.enter = wl_pointer_enter,
-	.leave = wl_pointer_leave,
-	.motion = wl_pointer_motion,
-	.button = wl_pointer_button,
-	.axis = wl_pointer_axis,
-	.frame = wl_pointer_frame,
-	.axis_source = wl_pointer_axis_source,
-	.axis_stop = wl_pointer_axis_stop,
-	.axis_discrete = wl_pointer_axis_discrete,
-};
-
-static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
-		enum wl_seat_capability caps) {
-	struct swaybar *bar = data;
-	if (bar->pointer.pointer != NULL) {
-		wl_pointer_release(bar->pointer.pointer);
-		bar->pointer.pointer = NULL;
-	}
-	if ((caps & WL_SEAT_CAPABILITY_POINTER)) {
-		bar->pointer.pointer = wl_seat_get_pointer(wl_seat);
-		wl_pointer_add_listener(bar->pointer.pointer, &pointer_listener, bar);
-	}
-}
-
-static void seat_handle_name(void *data, struct wl_seat *wl_seat,
-		const char *name) {
-	// Who cares
-}
-
-const struct wl_seat_listener seat_listener = {
-	.capabilities = seat_handle_capabilities,
-	.name = seat_handle_name,
-};
-
 static void add_layer_surface(struct swaybar_output *output) {
 	if (output->layer_surface) {
 		return;