callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Store the device that does a grab for a window on the window

Browse Source 
This allows us to get the device if we need to make the window a popup. This
relies on the side effect that GTK calls into GDK to take a grab before the
popup window is shown.
This commit is contained in:
Rob Bradford
2012-02-27 14:06:22 +00:00
parent 161b9d2066
commit bdca0520e6
3 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gdk/wayland/gdkdevice-wayland.c
View File

@ -243,6 +243,15 @@ gdk_device_core_grab (GdkDevice *device,
wayland_device->pointer_grab_window = window; wayland_device->pointer_grab_window = window;
wayland_device->pointer_grab_time = time_; wayland_device->pointer_grab_time = time_;
/* FIXME: This probably breaks if you end up with multiple grabs on the
* same window - but we need to know the input device for when we are
* asked to map a popup window so that the grab can be managed by the
* compositor.
*/
_gdk_wayland_window_set_device_grabbed (window,
wayland_device->device,
time_);
} }
return GDK_GRAB_SUCCESS; return GDK_GRAB_SUCCESS;
@ -252,6 +261,7 @@ static void
gdk_device_core_ungrab (GdkDevice *device, gdk_device_core_ungrab (GdkDevice *device,
guint32 time_) guint32 time_)
{ {
GdkWaylandDevice *wayland_device = GDK_DEVICE_CORE (device)->device;
GdkDisplay *display; GdkDisplay *display;
GdkDeviceGrabInfo *grab; GdkDeviceGrabInfo *grab;
@ -268,6 +278,10 @@ gdk_device_core_ungrab (GdkDevice *device,
if (grab) if (grab)
grab->serial_end = grab->serial_start; grab->serial_end = grab->serial_start;
_gdk_wayland_window_set_device_grabbed (wayland_device->pointer_grab_window,
NULL,
0);
} }
} }

4
gdk/wayland/gdkprivate-wayland.h
View File

@ -146,4 +146,8 @@ void _gdk_wayland_display_manager_add_display (GdkDisplayManager *manager,
void _gdk_wayland_display_manager_remove_display (GdkDisplayManager *manager, void _gdk_wayland_display_manager_remove_display (GdkDisplayManager *manager,
GdkDisplay *display); GdkDisplay *display);
void _gdk_wayland_window_set_device_grabbed (GdkWindow *window,
struct wl_input_device *input_device,
guint32 time_);
#endif /* __GDK_PRIVATE_WAYLAND_H__ */ #endif /* __GDK_PRIVATE_WAYLAND_H__ */

15
gdk/wayland/gdkwindow-wayland.c
View File

@ -119,6 +119,9 @@ struct _GdkWindowImplWayland
GdkGeometry geometry_hints; GdkGeometry geometry_hints;
GdkWindowHints geometry_mask; GdkWindowHints geometry_mask;
struct wl_input_device *grab_input_device;
guint32 grab_time;
}; };
struct _GdkWindowImplWaylandClass struct _GdkWindowImplWaylandClass
@ -1477,3 +1480,15 @@ _gdk_window_impl_wayland_class_init (GdkWindowImplWaylandClass *klass)
impl_class->change_property = gdk_wayland_window_change_property; impl_class->change_property = gdk_wayland_window_change_property;
impl_class->delete_property = gdk_wayland_window_delete_property; impl_class->delete_property = gdk_wayland_window_delete_property;
} }
void
_gdk_wayland_window_set_device_grabbed (GdkWindow *window,
struct wl_input_device *input_device,
guint32 time_)
{
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
impl->grab_input_device = input_device;
impl->grab_time = time_;
}