mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

seat: use CONNECT_SIGNAL() for new_virtual_pointer event

Browse source
This commit is contained in:
tokyo4j 2025-10-25 14:15:37 +09:00 • committed by Consolatis
parent 4cdc6c435b
commit cd1a823fee
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/labwc.h
View file

@ -142,7 +142,7 @@ struct seat {
struct wl_listener pressed_surface_destroy; struct wl_listener pressed_surface_destroy;
struct wlr_virtual_pointer_manager_v1 *virtual_pointer; struct wlr_virtual_pointer_manager_v1 *virtual_pointer;
struct wl_listener virtual_pointer_new; struct wl_listener new_virtual_pointer;
struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard; struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard;
struct wl_listener new_virtual_keyboard; struct wl_listener new_virtual_keyboard;

10
src/seat.c
View file

@ -557,9 +557,9 @@ handle_new_input(struct wl_listener *listener, void *data)
} }
static void static void
new_virtual_pointer(struct wl_listener *listener, void *data) handle_new_virtual_pointer(struct wl_listener *listener, void *data)
{ {
struct seat *seat = wl_container_of(listener, seat, virtual_pointer_new); struct seat *seat = wl_container_of(listener, seat, new_virtual_pointer);
struct wlr_virtual_pointer_v1_new_pointer_event *event = data; struct wlr_virtual_pointer_v1_new_pointer_event *event = data;
struct wlr_virtual_pointer_v1 *pointer = event->new_pointer; struct wlr_virtual_pointer_v1 *pointer = event->new_pointer;
struct wlr_input_device *device = &pointer->pointer.base; struct wlr_input_device *device = &pointer->pointer.base;
@ -643,9 +643,7 @@ seat_init(struct server *server)
seat->virtual_pointer = wlr_virtual_pointer_manager_v1_create( seat->virtual_pointer = wlr_virtual_pointer_manager_v1_create(
server->wl_display); server->wl_display);
wl_signal_add(&seat->virtual_pointer->events.new_virtual_pointer, CONNECT_SIGNAL(seat->virtual_pointer, seat, new_virtual_pointer);
&seat->virtual_pointer_new);
seat->virtual_pointer_new.notify = new_virtual_pointer;
seat->virtual_keyboard = wlr_virtual_keyboard_manager_v1_create( seat->virtual_keyboard = wlr_virtual_keyboard_manager_v1_create(
server->wl_display); server->wl_display);
@ -675,7 +673,7 @@ seat_finish(struct server *server)
struct seat *seat = &server->seat; struct seat *seat = &server->seat;
wl_list_remove(&seat->new_input.link); wl_list_remove(&seat->new_input.link);
wl_list_remove(&seat->focus_change.link); wl_list_remove(&seat->focus_change.link);
wl_list_remove(&seat->virtual_pointer_new.link); wl_list_remove(&seat->new_virtual_pointer.link);
wl_list_remove(&seat->new_virtual_keyboard.link); wl_list_remove(&seat->new_virtual_keyboard.link);
struct input *input, *next; struct input *input, *next;