input: Remove exported function weston_pointer_verify()
Instead, add a compositor signal that an output has been destroyed and
handle that case locally in input.c.
diff --git a/src/compositor.c b/src/compositor.c
index 8466652..9ef3c4e 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -3170,19 +3170,6 @@
}
}
-static void
-weston_compositor_verify_pointers(struct weston_compositor *ec)
-{
- struct weston_seat *seat;
-
- wl_list_for_each(seat, &ec->seat_list, link) {
- if (!seat->pointer)
- continue;
-
- weston_pointer_verify(seat->pointer);
- }
-}
-
WL_EXPORT void
weston_output_destroy(struct weston_output *output)
{
@@ -3191,8 +3178,7 @@
weston_compositor_remove_output(output->compositor, output);
wl_list_remove(&output->link);
- weston_compositor_verify_pointers(output->compositor);
-
+ wl_signal_emit(&output->compositor->output_destroyed_signal, output);
wl_signal_emit(&output->destroy_signal, output);
free(output->name);
@@ -3654,6 +3640,7 @@
wl_signal_init(&ec->update_input_panel_signal);
wl_signal_init(&ec->seat_created_signal);
wl_signal_init(&ec->output_created_signal);
+ wl_signal_init(&ec->output_destroyed_signal);
wl_signal_init(&ec->session_signal);
ec->session_active = 1;
diff --git a/src/compositor.h b/src/compositor.h
index 22a485f..ced792f 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -329,6 +329,8 @@
wl_fixed_t x, y;
uint32_t button_count;
+
+ struct wl_listener output_destroy_listener;
};
@@ -375,8 +377,6 @@
void
weston_pointer_set_default_grab(struct weston_pointer *pointer,
const struct weston_pointer_grab_interface *interface);
-void
-weston_pointer_verify(struct weston_pointer *pointer);
struct weston_keyboard *
weston_keyboard_create(void);
@@ -579,6 +579,7 @@
struct wl_signal seat_created_signal;
struct wl_signal output_created_signal;
+ struct wl_signal output_destroyed_signal;
struct wl_event_loop *input_loop;
struct wl_event_source *input_loop_source;
diff --git a/src/input.c b/src/input.c
index 1d3bd1b..d0f7fdf 100644
--- a/src/input.c
+++ b/src/input.c
@@ -438,6 +438,9 @@
pointer->button_count = 0;
}
+static void
+weston_pointer_handle_output_destroy(struct wl_listener *listener, void *data);
+
WL_EXPORT struct weston_pointer *
weston_pointer_create(struct weston_seat *seat)
{
@@ -465,6 +468,11 @@
pointer->x = wl_fixed_from_int(100);
pointer->y = wl_fixed_from_int(100);
+ pointer->output_destroy_listener.notify =
+ weston_pointer_handle_output_destroy;
+ wl_signal_add(&seat->compositor->output_destroyed_signal,
+ &pointer->output_destroy_listener);
+
return pointer;
}
@@ -478,6 +486,7 @@
wl_list_remove(&pointer->focus_resource_listener.link);
wl_list_remove(&pointer->focus_view_listener.link);
+ wl_list_remove(&pointer->output_destroy_listener.link);
free(pointer);
}
@@ -871,14 +880,19 @@
/** Verify if the pointer is in a valid position and move it if it isn't.
*/
-WL_EXPORT void
-weston_pointer_verify(struct weston_pointer *pointer)
+static void
+weston_pointer_handle_output_destroy(struct wl_listener *listener, void *data)
{
- struct weston_compositor *ec = pointer->seat->compositor;
+ struct weston_pointer *pointer;
+ struct weston_compositor *ec;
struct weston_output *output, *closest = NULL;
int x, y, distance, min = INT_MAX;
wl_fixed_t fx, fy;
+ pointer = container_of(listener, struct weston_pointer,
+ output_destroy_listener);
+ ec = pointer->seat->compositor;
+
x = wl_fixed_to_int(pointer->x);
y = wl_fixed_to_int(pointer->y);