seat: use CONNECT_SIGNAL() for new_virtual_pointer event

diff --git a/include/labwc.h b/include/labwc.h
index 735f57b81504f28b254e794629ba087b7658c960..d853c01d0b45e0d63cf4f25c2dc91707256cf66d 100644 (file)
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -142,7 +142,7 @@ struct seat {
        struct wl_listener pressed_surface_destroy;
 
        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 wl_listener new_virtual_keyboard;

diff --git a/src/seat.c b/src/seat.c
index 05f5a006bdaf5936ec735516984b54f9aa5d1b9c..7e882a9bfee9e4ae558129b36c19bbd8c3556c35 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -557,9 +557,9 @@ handle_new_input(struct wl_listener *listener, void *data)
 }
 
 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 *pointer = event->new_pointer;
        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(
                server->wl_display);
-       wl_signal_add(&seat->virtual_pointer->events.new_virtual_pointer,
-               &seat->virtual_pointer_new);
-       seat->virtual_pointer_new.notify = new_virtual_pointer;
+       CONNECT_SIGNAL(seat->virtual_pointer, seat, new_virtual_pointer);
 
        seat->virtual_keyboard = wlr_virtual_keyboard_manager_v1_create(
                server->wl_display);
@@ -675,7 +673,7 @@ seat_finish(struct server *server)
        struct seat *seat = &server->seat;
        wl_list_remove(&seat->new_input.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);
 
        struct input *input, *next;