From 20c91335f6ba515e43b444fafd52b822bd460eda Mon Sep 17 00:00:00 2001 From: Mark Bolhuis Date: Mon, 26 Jun 2023 21:43:13 +0100 Subject: input: Move wlr_pointer_gestures_v1 to sway_input_manager On multi-seat configurations a zwp_pointer_gestures_v1 global was created for every seat. Instead, create the global once in the input manager, to be shared across all seats. --- include/sway/input/cursor.h | 1 - include/sway/input/input-manager.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'include/sway/input') diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h index c7da8829..1636588a 100644 --- a/include/sway/input/cursor.h +++ b/include/sway/input/cursor.h @@ -35,7 +35,6 @@ struct sway_cursor { pixman_region32_t confine; // invalid if active_constraint == NULL bool active_confine_requires_warp; - struct wlr_pointer_gestures_v1 *pointer_gestures; struct wl_listener hold_begin; struct wl_listener hold_end; struct wl_listener pinch_begin; diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h index c9bd08f0..b651e3dd 100644 --- a/include/sway/input/input-manager.h +++ b/include/sway/input/input-manager.h @@ -25,6 +25,7 @@ struct sway_input_manager { struct wlr_keyboard_shortcuts_inhibit_manager_v1 *keyboard_shortcuts_inhibit; struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard; struct wlr_virtual_pointer_manager_v1 *virtual_pointer; + struct wlr_pointer_gestures_v1 *pointer_gestures; struct wl_listener new_input; struct wl_listener inhibit_activate; -- cgit v1.2.3