From d4b38c580660505e98f5ef18d39b7865c79c5fa3 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Sun, 13 May 2012 17:57:59 +0200 Subject: [PATCH] quartz: Ignore events from all mouse buttons past the resize boundary Before, right click events were still let through into GDK. In this case, also middle/right button events with x-coordinates in the range [-3, 0] are processed, resulting in failures/crashes in the window finding code because no GdkWindows are present in this range. --- gdk/quartz/gdkevents-quartz.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c index 94064c0de9..ac60e3361e 100644 --- a/gdk/quartz/gdkevents-quartz.c +++ b/gdk/quartz/gdkevents-quartz.c @@ -1115,14 +1115,13 @@ test_resize (NSEvent *event, GdkWindow *toplevel, gint x, gint y) GdkWindowImplQuartz *toplevel_impl; gboolean lion; - /* Resizing only begins if an NSLeftMouseButton event is received in - * the resizing area. Handle anything else. + /* Resizing from the resize indicator only begins if an NSLeftMouseButton + * event is received in the resizing area. */ - if ([event type] != NSLeftMouseDown) - return FALSE; - toplevel_impl = (GdkWindowImplQuartz *)toplevel->impl; if ([toplevel_impl->toplevel showsResizeIndicator]) + if ([event type] == NSLeftMouseDown && + [toplevel_impl->toplevel showsResizeIndicator]) { NSRect frame; @@ -1150,12 +1149,25 @@ test_resize (NSEvent *event, GdkWindow *toplevel, gint x, gint y) * the selector isRestorable to see if we're on 10.7. * This extra check is in case the user starts * dragging before GDK recognizes the grab. + * + * We perform this check for a button press of all buttons, because we + * do receive, for instance, a right mouse down event for a GDK window + * for x-coordinate range [-3, 0], but we do not want to forward this + * into GDK. Forwarding such events into GDK will confuse the pointer + * window finding code, because there are no GdkWindows present in + * the range [-3, 0]. */ lion = gdk_quartz_osx_version () >= GDK_OSX_LION; - if (lion && (x < GDK_LION_RESIZE || - x > toplevel->width - GDK_LION_RESIZE || - y > toplevel->height - GDK_LION_RESIZE)) - return TRUE; + if (lion && + ([event type] == NSLeftMouseDown || + [event type] == NSRightMouseDown || + [event type] == NSOtherMouseDown)) + { + if (x < GDK_LION_RESIZE || + x > toplevel->width - GDK_LION_RESIZE || + y > toplevel->height - GDK_LION_RESIZE) + return TRUE; + } return FALSE; }