[mutter/wayland] wayland: Remove meta_wayland_pointer_set_current
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wayland] wayland: Remove meta_wayland_pointer_set_current
- Date: Wed, 16 Oct 2013 04:32:07 +0000 (UTC)
commit 21d511e50fd3262b591eac2f8dd0c63ee59528ec
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Oct 15 23:53:59 2013 -0400
wayland: Remove meta_wayland_pointer_set_current
It's unused. The current field is filled in by meta_wayland_seat_repick.
src/wayland/meta-wayland-pointer.c | 26 --------------------------
src/wayland/meta-wayland-pointer.h | 5 -----
2 files changed, 0 insertions(+), 31 deletions(-)
---
diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c
index 50620a8..2ec8c75 100644
--- a/src/wayland/meta-wayland-pointer.c
+++ b/src/wayland/meta-wayland-pointer.c
@@ -386,32 +386,6 @@ meta_wayland_pointer_end_grab (MetaWaylandPointer *pointer)
}
static void
-current_surface_destroy (struct wl_listener *listener, void *data)
-{
- MetaWaylandPointer *pointer =
- wl_container_of (listener, pointer, current_listener);
-
- pointer->current = NULL;
-}
-
-void
-meta_wayland_pointer_set_current (MetaWaylandPointer *pointer,
- MetaWaylandSurface *surface)
-{
- if (pointer->current)
- wl_list_remove (&pointer->current_listener.link);
-
- pointer->current = surface;
-
- if (!surface)
- return;
-
- wl_resource_add_destroy_listener (surface->resource,
- &pointer->current_listener);
- pointer->current_listener.notify = current_surface_destroy;
-}
-
-static void
modal_focus (MetaWaylandPointerGrab *grab,
MetaWaylandSurface *surface,
const ClutterEvent *event)
diff --git a/src/wayland/meta-wayland-pointer.h b/src/wayland/meta-wayland-pointer.h
index 53e59f3..e25b008 100644
--- a/src/wayland/meta-wayland-pointer.h
+++ b/src/wayland/meta-wayland-pointer.h
@@ -62,7 +62,6 @@ struct _MetaWaylandPointer
wl_fixed_t x, y; /* TODO: remove, use ClutterInputDevice instead */
MetaWaylandSurface *current;
- struct wl_listener current_listener;
wl_fixed_t current_x, current_y;
guint32 button_count;
@@ -98,10 +97,6 @@ meta_wayland_pointer_start_popup_grab (MetaWaylandPointer *pointer,
MetaWaylandSurface *popup);
void
-meta_wayland_pointer_set_current (MetaWaylandPointer *pointer,
- MetaWaylandSurface *surface);
-
-void
meta_wayland_pointer_get_relative_coordinates (MetaWaylandPointer *pointer,
MetaWaylandSurface *surface,
wl_fixed_t *x,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]