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

pointer: Remove dead and incorrect code

Browse Source 
Now that we can never pick a destroying actor, we can remove these
bad asserts.
This commit is contained in:
Jasper St. Pierre 2013-11-19 19:35:29 -05:00
parent 2952d3671d
commit 2930612e64
3 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -446,24 +446,6 @@ meta_wayland_pointer_end_modal (MetaWaylandPointer *pointer)
g_slice_free (MetaWaylandPointerGrab, grab); g_slice_free (MetaWaylandPointerGrab, grab);
} }
/* Called when the focused resource is destroyed */
void
meta_wayland_pointer_destroy_focus (MetaWaylandPointer *pointer)
{
if (pointer->grab == &pointer->default_grab)
{
/* The surface was destroyed, but had the implicit pointer grab.
Bypass the grab interface. */
g_assert (pointer->button_count > 0);
/* Note: we focus the NULL interface, not the current one, because
we have button down, and the clients would be confused if the
pointer enters the surface.
*/
meta_wayland_pointer_set_focus (pointer, NULL);
}
}
typedef struct { typedef struct {
MetaWaylandPointerGrab generic; MetaWaylandPointerGrab generic;

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

@ -76,8 +76,6 @@ meta_wayland_pointer_release (MetaWaylandPointer *pointer);
void void
meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer, meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
MetaWaylandSurface *surface); MetaWaylandSurface *surface);
void
meta_wayland_pointer_destroy_focus (MetaWaylandPointer *pointer);
void void
meta_wayland_pointer_start_grab (MetaWaylandPointer *pointer, meta_wayland_pointer_start_grab (MetaWaylandPointer *pointer,

8
src/wayland/meta-wayland-surface.c
View File

@ -393,14 +393,6 @@ meta_wayland_surface_free (MetaWaylandSurface *surface)
meta_wayland_compositor_repick (compositor); meta_wayland_compositor_repick (compositor);
g_assert (surface != compositor->seat->keyboard.focus);
if (surface == compositor->seat->pointer.focus)
{
meta_wayland_pointer_destroy_focus (&compositor->seat->pointer);
g_assert (surface != compositor->seat->pointer.focus);
}
if (surface->resource) if (surface->resource)
wl_resource_set_user_data (surface->resource, NULL); wl_resource_set_user_data (surface->resource, NULL);
g_slice_free (MetaWaylandSurface, surface); g_slice_free (MetaWaylandSurface, surface);