diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-04-19 23:08:24 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-05-28 20:25:14 +0000 |
| commit | f692974e5ade024b241bea6013c005fc70aaefaf (patch) | |
| tree | 178caaf3b3fd2ddad94dbc9f11c52599ab576fca /gdk/gdkdevice.c | |
| parent | bab5836e896415cb265b1d17e52d3ef8ac88e5fc (diff) | |
| download | gtk+-f692974e5ade024b241bea6013c005fc70aaefaf.tar.gz | |
gdk: Remove remnants of client-side windows
Now that all surfaces are native, we don't need
to separately keep track of grab surfaces and
their native ancestor anymore.
Diffstat (limited to 'gdk/gdkdevice.c')
| -rw-r--r-- | gdk/gdkdevice.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c index a919bd2814..8e99f2e6c2 100644 --- a/gdk/gdkdevice.c +++ b/gdk/gdkdevice.c @@ -1237,7 +1237,7 @@ get_native_grab_event_mask (GdkEventMask grab_mask) GdkGrabStatus gdk_device_grab (GdkDevice *device, - GdkSurface *surface, + GdkSurface *surface, GdkGrabOwnership grab_ownership, gboolean owner_events, GdkEventMask event_mask, @@ -1245,19 +1245,16 @@ gdk_device_grab (GdkDevice *device, guint32 time_) { GdkGrabStatus res; - GdkSurface *native; g_return_val_if_fail (GDK_IS_DEVICE (device), GDK_GRAB_FAILED); g_return_val_if_fail (GDK_IS_SURFACE (surface), GDK_GRAB_FAILED); g_return_val_if_fail (gdk_surface_get_display (surface) == gdk_device_get_display (device), GDK_GRAB_FAILED); - native = surface; - - if (GDK_SURFACE_DESTROYED (native)) + if (GDK_SURFACE_DESTROYED (surface)) return GDK_GRAB_NOT_VIEWABLE; res = GDK_DEVICE_GET_CLASS (device)->grab (device, - native, + surface, owner_events, get_native_grab_event_mask (event_mask), NULL, @@ -1275,7 +1272,6 @@ gdk_device_grab (GdkDevice *device, _gdk_display_add_device_grab (display, device, surface, - native, grab_ownership, owner_events, event_mask, |