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

wayland: Clean up wl_pointer_send_enter/leave code

Browse Source 
Be consistent and always use a helper, and fix the naming so
broadcast means to actually broadcast.

https://bugzilla.gnome.org/show_bug.cgi?id=755503
This commit is contained in:
Jonas Ådahl 2015-09-17 11:13:51 +08:00
parent 82bdd1e353
commit 428c687b5a
1 changed files with 53 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -598,13 +598,53 @@ meta_wayland_pointer_handle_event (MetaWaylandPointer *pointer,
} }
static void static void
broadcast_focus (MetaWaylandPointer *pointer, meta_wayland_pointer_send_enter (MetaWaylandPointer *pointer,
struct wl_resource *resource) struct wl_resource *pointer_resource,
uint32_t serial,
MetaWaylandSurface *surface)
{ {
wl_fixed_t sx, sy; wl_fixed_t sx, sy;
meta_wayland_pointer_get_relative_coordinates (pointer, pointer->focus_surface, &sx, &sy); meta_wayland_pointer_get_relative_coordinates (pointer, surface, &sx, &sy);
wl_pointer_send_enter (resource, pointer->focus_serial, pointer->focus_surface->resource, sx, sy); wl_pointer_send_enter (pointer_resource,
serial,
surface->resource,
sx, sy);
}
static void
meta_wayland_pointer_send_leave (MetaWaylandPointer *pointer,
struct wl_resource *pointer_resource,
uint32_t serial,
MetaWaylandSurface *surface)
{
wl_pointer_send_leave (pointer_resource, serial, surface->resource);
}
static void
meta_wayland_pointer_broadcast_enter (MetaWaylandPointer *pointer,
uint32_t serial,
MetaWaylandSurface *surface)
{
struct wl_resource *pointer_resource;
wl_resource_for_each (pointer_resource,
&pointer->focus_client->pointer_resources)
meta_wayland_pointer_send_enter (pointer, pointer_resource,
serial, surface);
}
static void
meta_wayland_pointer_broadcast_leave (MetaWaylandPointer *pointer,
uint32_t serial,
MetaWaylandSurface *surface)
{
struct wl_resource *pointer_resource;
wl_resource_for_each (pointer_resource,
&pointer->focus_client->pointer_resources)
meta_wayland_pointer_send_leave (pointer, pointer_resource,
serial, surface);
} }
void void
@ -623,18 +663,14 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
wl_resource_get_client (pointer->focus_surface->resource); wl_resource_get_client (pointer->focus_surface->resource);
struct wl_display *display = wl_client_get_display (client); struct wl_display *display = wl_client_get_display (client);
uint32_t serial; uint32_t serial;
struct wl_resource *resource;
serial = wl_display_next_serial (display); serial = wl_display_next_serial (display);
if (pointer->focus_client) if (pointer->focus_client)
{ {
wl_resource_for_each (resource, meta_wayland_pointer_broadcast_leave (pointer,
&pointer->focus_client->pointer_resources) serial,
{ pointer->focus_surface);
wl_pointer_send_leave (resource, serial, pointer->focus_surface->resource);
}
pointer->focus_client = NULL; pointer->focus_client = NULL;
} }
@ -646,7 +682,6 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
{ {
struct wl_client *client = wl_resource_get_client (surface->resource); struct wl_client *client = wl_resource_get_client (surface->resource);
struct wl_display *display = wl_client_get_display (client); struct wl_display *display = wl_client_get_display (client);
struct wl_resource *resource;
ClutterPoint pos; ClutterPoint pos;
pointer->focus_surface = surface; pointer->focus_surface = surface;
@ -665,12 +700,9 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
if (pointer->focus_client) if (pointer->focus_client)
{ {
pointer->focus_serial = wl_display_next_serial (display); pointer->focus_serial = wl_display_next_serial (display);
meta_wayland_pointer_broadcast_enter (pointer,
wl_resource_for_each (resource, pointer->focus_serial,
&pointer->focus_client->pointer_resources) pointer->focus_surface);
{
broadcast_focus (pointer, resource);
}
} }
} }
@ -946,7 +978,9 @@ meta_wayland_pointer_create_new_resource (MetaWaylandPointer *pointer,
wl_resource_get_link (cr)); wl_resource_get_link (cr));
if (pointer->focus_client == pointer_client) if (pointer->focus_client == pointer_client)
broadcast_focus (pointer, cr); meta_wayland_pointer_send_enter (pointer, cr,
pointer->focus_serial,
pointer->focus_surface);
} }
gboolean gboolean