Mirrors/rofi
2
0
Fork 0
mirror of https://github.com/lbonn/rofi synced 2025-02-16 21:08:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Wayland] Compositor-side cursors via cursor-shape-v1

Browse source
This commit is contained in:
Aleksei Bavshin 2024-01-07 19:11:51 -08:00 • committed by lbonn
parent 8f259ce9b0
commit b88dddd1a1
3 changed files with 89 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/wayland-internal.h
View file

@ -14,6 +14,7 @@ typedef enum {
WAYLAND_GLOBAL_COMPOSITOR,
WAYLAND_GLOBAL_SHM,
WAYLAND_GLOBAL_LAYER_SHELL,
WAYLAND_GLOBAL_CURSOR_SHAPE,
_WAYLAND_GLOBAL_SIZE,
} wayland_global_name;
@ -40,6 +41,10 @@ typedef struct {
uint32_t global_names[_WAYLAND_GLOBAL_SIZE];
struct wl_compositor *compositor;
#ifdef HAVE_WAYLAND_CURSOR_SHAPE
struct wp_cursor_shape_manager_v1 *cursor_shape_manager;
#endif
struct wl_data_device_manager *data_device_manager;
struct zwp_primary_selection_device_manager_v1
*primary_selection_device_manager;
@ -92,6 +97,9 @@ struct _wayland_seat {
struct wl_keyboard *keyboard;
struct wl_pointer *pointer;
#ifdef HAVE_WAYLAND_CURSOR_SHAPE
struct wp_cursor_shape_device_v1 *cursor_shape_device;
#endif
struct wl_data_device *data_device;
struct zwp_primary_selection_device_v1 *primary_selection_device;

9
meson.build
View file

@ -293,6 +293,15 @@ if wayland_enabled
'protocols/wlr-foreign-toplevel-management-unstable-v1.xml',
'protocols/wlr-layer-shell-unstable-v1.xml',
)
if wayland_protocols.version().version_compare('>=1.32')
add_project_arguments('-DHAVE_WAYLAND_CURSOR_SHAPE', language: 'c')
protocols += files(
wayland_sys_protocols_dir + '/staging/cursor-shape/cursor-shape-v1.xml',
wayland_sys_protocols_dir + '/unstable/tablet/tablet-unstable-v2.xml',
)
endif
proto_srcs = []
proto_headers = []
foreach p : protocols

81
source/wayland/display.c
View file

@ -60,6 +60,9 @@
#include "display.h"
#include "wayland-internal.h"
#ifdef HAVE_WAYLAND_CURSOR_SHAPE
#include "cursor-shape-v1-protocol.h"
#endif
#include "primary-selection-unstable-v1-protocol.h"
#include "wlr-layer-shell-unstable-v1-protocol.h"
@ -650,7 +653,33 @@ rofi_cursor_type_to_wl_cursor(struct wl_cursor_theme *theme,
return cursor;
}
#ifdef HAVE_WAYLAND_CURSOR_SHAPE
static enum wp_cursor_shape_device_v1_shape
rofi_cursor_type_to_wp_cursor_shape(RofiCursorType type) {
switch (type) {
case ROFI_CURSOR_POINTER:
return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_POINTER;
case ROFI_CURSOR_TEXT:
return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_TEXT;
default:
return WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_DEFAULT;
}
}
#endif
static void wayland_cursor_update_for_seat(wayland_seat *seat) {
#ifdef HAVE_WAYLAND_CURSOR_SHAPE
if (seat->cursor_shape_device != NULL) {
wp_cursor_shape_device_v1_set_shape(
seat->cursor_shape_device, seat->pointer_serial,
rofi_cursor_type_to_wp_cursor_shape(wayland->cursor.type));
return;
} else if (wayland->cursor.theme == NULL) {
// cursor-shape-v1 is available, but the seat haven't seen a pointer yet
return;
}
#endif
if (wayland->cursor.surface == NULL) {
wayland->cursor.surface = wl_compositor_create_surface(wayland->compositor);
}
@ -674,8 +703,17 @@ static void wayland_pointer_enter(void *data, struct wl_pointer *pointer,
self->pointer_serial = serial;
if (!wayland_cursor_reload_theme(wayland->scale))
#ifdef HAVE_WAYLAND_CURSOR_SHAPE
if (wayland->cursor_shape_manager != NULL) {
if (self->cursor_shape_device == NULL) {
self->cursor_shape_device = wp_cursor_shape_manager_v1_get_pointer(
wayland->cursor_shape_manager, pointer);
}
} else
#endif
if (!wayland_cursor_reload_theme(wayland->scale)) {
return;
}
wayland_cursor_update_for_seat(self);
}
@ -690,16 +728,21 @@ void wayland_display_set_cursor_type(RofiCursorType type) {
}
wayland->cursor.type = type;
if (wayland->cursor.theme == NULL) {
return;
}
#ifdef HAVE_WAYLAND_CURSOR_SHAPE
if (wayland->cursor_shape_manager == NULL)
#endif
{
if (wayland->cursor.theme == NULL) {
return;
}
cursor = rofi_cursor_type_to_wl_cursor(wayland->cursor.theme, type);
if (cursor == NULL) {
g_info("Failed to load cursor type %d", type);
return;
cursor = rofi_cursor_type_to_wl_cursor(wayland->cursor.theme, type);
if (cursor == NULL) {
g_info("Failed to load cursor type %d", type);
return;
}
wayland->cursor.cursor = cursor;
}
wayland->cursor.cursor = cursor;
g_hash_table_iter_init(&iter, wayland->seats);
while (g_hash_table_iter_next(&iter, NULL, (gpointer *)&seat)) {
@ -1017,6 +1060,13 @@ static void wayland_pointer_release(wayland_seat *self) {
return;
}
#ifdef HAVE_WAYLAND_CURSOR_SHAPE
if (self->cursor_shape_device != NULL) {
wp_cursor_shape_device_v1_destroy(self->cursor_shape_device);
self->cursor_shape_device = NULL;
}
#endif
if (wl_pointer_get_version(self->pointer) >=
WL_POINTER_RELEASE_SINCE_VERSION) {
wl_pointer_release(self->pointer);
@ -1253,6 +1303,13 @@ static void wayland_registry_handle_global(void *data,
wayland->primary_selection_device_manager = wl_registry_bind(
registry, name, &zwp_primary_selection_device_manager_v1_interface, 1);
}
#ifdef HAVE_WAYLAND_CURSOR_SHAPE
else if (strcmp(interface, wp_cursor_shape_manager_v1_interface.name) == 0) {
wayland->global_names[WAYLAND_GLOBAL_CURSOR_SHAPE] = name;
wayland->cursor_shape_manager = wl_registry_bind(
registry, name, &wp_cursor_shape_manager_v1_interface, 1);
}
#endif
}
static void wayland_registry_handle_global_remove(void *data,
@ -1270,6 +1327,12 @@ static void wayland_registry_handle_global_remove(void *data,
wl_compositor_destroy(wayland->compositor);
wayland->compositor = NULL;
break;
case WAYLAND_GLOBAL_CURSOR_SHAPE:
#ifdef HAVE_WAYLAND_CURSOR_SHAPE
wp_cursor_shape_manager_v1_destroy(wayland->cursor_shape_manager);
wayland->cursor_shape_manager = NULL;
#endif
break;
case WAYLAND_GLOBAL_LAYER_SHELL:
zwlr_layer_shell_v1_destroy(wayland->layer_shell);
wayland->layer_shell = NULL;