isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Add emit_crossing argument to meta_wayland_pointer_set_focus()

Browse Source 
This is TRUE in every place it was previously called.

https://bugzilla.gnome.org/show_bug.cgi?id=728030
This commit is contained in:
Carlos Garnacho 2014-09-30 17:14:07 +02:00
parent 869d12c36d
commit 6dfdc6d6ec
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wayland/meta-wayland-data-device.c
View File

@ -483,7 +483,7 @@ data_device_start_drag (struct wl_client *client,
&drag_grab->drag_icon_listener); &drag_grab->drag_icon_listener);
} }
meta_wayland_pointer_set_focus (&seat->pointer, NULL); meta_wayland_pointer_set_focus (&seat->pointer, NULL, TRUE);
meta_wayland_pointer_start_grab (&seat->pointer, (MetaWaylandPointerGrab*)drag_grab); meta_wayland_pointer_start_grab (&seat->pointer, (MetaWaylandPointerGrab*)drag_grab);
drag_grab_update_dnd_surface_position (drag_grab); drag_grab_update_dnd_surface_position (drag_grab);
drag_grab_update_dnd_surface (drag_grab); drag_grab_update_dnd_surface (drag_grab);

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

@ -95,7 +95,7 @@ pointer_handle_focus_surface_destroy (struct wl_listener *listener, void *data)
{ {
MetaWaylandPointer *pointer = wl_container_of (listener, pointer, focus_surface_listener); MetaWaylandPointer *pointer = wl_container_of (listener, pointer, focus_surface_listener);
meta_wayland_pointer_set_focus (pointer, NULL); meta_wayland_pointer_set_focus (pointer, NULL, TRUE);
} }
static void static void
@ -107,7 +107,7 @@ default_grab_focus (MetaWaylandPointerGrab *grab,
if (pointer->button_count > 0) if (pointer->button_count > 0)
return; return;
meta_wayland_pointer_set_focus (pointer, surface); meta_wayland_pointer_set_focus (pointer, surface, TRUE);
} }
static void static void
@ -178,7 +178,7 @@ default_grab_button (MetaWaylandPointerGrab *grab,
} }
if (pointer->button_count == 0 && event_type == CLUTTER_BUTTON_RELEASE) if (pointer->button_count == 0 && event_type == CLUTTER_BUTTON_RELEASE)
meta_wayland_pointer_set_focus (pointer, pointer->current); meta_wayland_pointer_set_focus (pointer, pointer->current, TRUE);
} }
static const MetaWaylandPointerGrabInterface default_pointer_grab_interface = { static const MetaWaylandPointerGrabInterface default_pointer_grab_interface = {
@ -218,7 +218,7 @@ meta_wayland_pointer_init (MetaWaylandPointer *pointer,
void void
meta_wayland_pointer_release (MetaWaylandPointer *pointer) meta_wayland_pointer_release (MetaWaylandPointer *pointer)
{ {
meta_wayland_pointer_set_focus (pointer, NULL); meta_wayland_pointer_set_focus (pointer, NULL, TRUE);
set_cursor_surface (pointer, NULL); set_cursor_surface (pointer, NULL);
pointer->display = NULL; pointer->display = NULL;
@ -480,7 +480,8 @@ broadcast_focus (MetaWaylandPointer *pointer,
void void
meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer, meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
MetaWaylandSurface *surface) MetaWaylandSurface *surface,
gboolean emit_crossing)
{ {
if (pointer->display == NULL) if (pointer->display == NULL)
return; return;
@ -500,9 +501,12 @@ 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);
uint32_t serial = wl_display_next_serial (display); uint32_t serial = wl_display_next_serial (display);
wl_resource_for_each (resource, l) if (emit_crossing)
{ {
wl_pointer_send_leave (resource, serial, pointer->focus_surface->resource); wl_resource_for_each (resource, l)
{
wl_pointer_send_leave (resource, serial, pointer->focus_surface->resource);
}
} }
move_resources (&pointer->resource_list, &pointer->focus_resource_list); move_resources (&pointer->resource_list, &pointer->focus_resource_list);
@ -533,7 +537,7 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
wl_resource_get_client (pointer->focus_surface->resource)); wl_resource_get_client (pointer->focus_surface->resource));
l = &pointer->focus_resource_list; l = &pointer->focus_resource_list;
if (!wl_list_empty (l)) if (emit_crossing && !wl_list_empty (l))
{ {
struct wl_client *client = wl_resource_get_client (pointer->focus_surface->resource); struct wl_client *client = 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);
@ -595,9 +599,9 @@ popup_grab_focus (MetaWaylandPointerGrab *grab,
/* Popup grabs are in owner-events mode (ie, events for the same client /* Popup grabs are in owner-events mode (ie, events for the same client
are reported as normal) */ are reported as normal) */
if (surface && wl_resource_get_client (surface->resource) == popup_grab->grab_client) if (surface && wl_resource_get_client (surface->resource) == popup_grab->grab_client)
meta_wayland_pointer_set_focus (grab->pointer, surface); meta_wayland_pointer_set_focus (grab->pointer, surface, TRUE);
else else
meta_wayland_pointer_set_focus (grab->pointer, NULL); meta_wayland_pointer_set_focus (grab->pointer, NULL, TRUE);
} }
static void static void

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

@ -86,7 +86,8 @@ gboolean meta_wayland_pointer_handle_event (MetaWaylandPointer *pointer,
const ClutterEvent *event); const ClutterEvent *event);
void meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer, void meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
MetaWaylandSurface *surface); MetaWaylandSurface *surface,
gboolean emit_crossing);
void meta_wayland_pointer_start_grab (MetaWaylandPointer *pointer, void meta_wayland_pointer_start_grab (MetaWaylandPointer *pointer,
MetaWaylandPointerGrab *grab); MetaWaylandPointerGrab *grab);