brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "pointer: Remove focus listener"

Browse Source 
This reverts commit a8ac2cc275.
This commit is contained in:
Jasper St. Pierre 2013-12-03 10:50:35 -05:00
parent b2c18c4a78
commit 602307e694
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/wayland/meta-wayland-pointer.c
View File

@ -63,6 +63,16 @@ meta_wayland_pointer_get_seat (MetaWaylandPointer *pointer)
return seat; return seat;
} }
static void
lose_pointer_focus (struct wl_listener *listener, void *data)
{
MetaWaylandPointer *pointer =
wl_container_of (listener, pointer, focus_listener);
pointer->focus_resource = NULL;
pointer->focus = NULL;
}
static void static void
default_grab_focus (MetaWaylandPointerGrab *grab, default_grab_focus (MetaWaylandPointerGrab *grab,
MetaWaylandSurface *surface, MetaWaylandSurface *surface,
@ -257,6 +267,7 @@ meta_wayland_pointer_init (MetaWaylandPointer *pointer,
memset (pointer, 0, sizeof *pointer); memset (pointer, 0, sizeof *pointer);
wl_list_init (&pointer->resource_list); wl_list_init (&pointer->resource_list);
pointer->focus_listener.notify = lose_pointer_focus;
pointer->default_grab.interface = &default_pointer_grab_interface; pointer->default_grab.interface = &default_pointer_grab_interface;
pointer->default_grab.pointer = pointer; pointer->default_grab.pointer = pointer;
pointer->grab = &pointer->default_grab; pointer->grab = &pointer->default_grab;
@ -276,6 +287,10 @@ meta_wayland_pointer_init (MetaWaylandPointer *pointer,
void void
meta_wayland_pointer_release (MetaWaylandPointer *pointer) meta_wayland_pointer_release (MetaWaylandPointer *pointer)
{ {
/* XXX: What about pointer->resource_list? */
if (pointer->focus_resource)
wl_list_remove (&pointer->focus_listener.link);
pointer->focus = NULL; pointer->focus = NULL;
pointer->focus_resource = NULL; pointer->focus_resource = NULL;
} }
@ -313,6 +328,7 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
struct wl_display *display = wl_client_get_display (client); struct wl_display *display = wl_client_get_display (client);
serial = wl_display_next_serial (display); serial = wl_display_next_serial (display);
wl_pointer_send_leave (resource, serial, pointer->focus->resource); wl_pointer_send_leave (resource, serial, pointer->focus->resource);
wl_list_remove (&pointer->focus_listener.link);
} }
resource = find_resource_for_surface (&pointer->resource_list, surface); resource = find_resource_for_surface (&pointer->resource_list, surface);
@ -345,6 +361,7 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
wl_fixed_to_int (pointer->x), wl_fixed_to_int (pointer->x),
wl_fixed_to_int (pointer->y)); wl_fixed_to_int (pointer->y));
wl_pointer_send_enter (resource, serial, surface->resource, sx, sy); wl_pointer_send_enter (resource, serial, surface->resource, sx, sy);
wl_resource_add_destroy_listener (resource, &pointer->focus_listener);
pointer->focus_serial = serial; pointer->focus_serial = serial;
} }

1
src/wayland/meta-wayland-pointer.h
View File

@ -48,6 +48,7 @@ struct _MetaWaylandPointer
struct wl_list resource_list; struct wl_list resource_list;
MetaWaylandSurface *focus; MetaWaylandSurface *focus;
struct wl_resource *focus_resource; struct wl_resource *focus_resource;
struct wl_listener focus_listener;
guint32 focus_serial; guint32 focus_serial;
guint32 click_serial; guint32 click_serial;