[gtk+/xi2] Fix up things in refactoring

[Kristian Rietveld <kristian src gnome org>]

commit e4d9180fc0f84193001ffb88b3176c5a2a50f573
Author: Kristian Rietveld <kris gtk org>
Date:   Thu Mar 11 11:32:09 2010 +0100

    Fix up things in refactoring

 gdk/quartz/gdkevents-quartz.c |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index f98b8ea..9bd4e0e 100644
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -573,17 +573,21 @@ find_toplevel_for_keyboard_event (NSEvent *nsevent)
 
 static GdkWindow *
 find_toplevel_for_mouse_event (NSEvent    *nsevent,
-                               GdkWindow  *toplevel,
                                gint       *x,
                                gint       *y)
 {
   NSPoint point;
   NSPoint screen_point;
   NSEventType event_type;
+  GdkWindow *toplevel;
+  GdkQuartzView *view;
   GdkDisplay *display;
   GdkDeviceGrabInfo *grab;
   GdkWindowObject *private;
 
+  view = (GdkQuartzView *)[[nsevent window] contentView];
+  toplevel = [view gdkWindow];
+
   display = gdk_drawable_get_display (toplevel);
   private = GDK_WINDOW_OBJECT (toplevel);
 
@@ -591,9 +595,6 @@ find_toplevel_for_mouse_event (NSEvent    *nsevent,
   point = [nsevent locationInWindow];
   screen_point = [[nsevent window] convertBaseToScreen:point];
 
-  *x = point.x;
-  *y = private->height - point.y;
-
   /* From the docs for XGrabPointer:
    *
    * If owner_events is True and if a generated pointer event
@@ -734,19 +735,23 @@ find_window_for_ns_event (NSEvent *nsevent,
                           gint    *y_root)
 {
   GdkQuartzView *view;
-  GdkWindow *toplevel;
   NSPoint point;
   NSPoint screen_point;
   NSEventType event_type;
+  GdkWindow *toplevel;
+  GdkWindowObject *private;
 
   view = (GdkQuartzView *)[[nsevent window] contentView];
+  toplevel = [view gdkWindow];
+  private = GDK_WINDOW_OBJECT (toplevel);
 
   point = [nsevent locationInWindow];
   screen_point = [[nsevent window] convertBaseToScreen:point];
 
-  _gdk_quartz_window_nspoint_to_gdk_xy (screen_point, x_root, y_root);
+  *x = point.x;
+  *y = private->height - point.y;
 
-  toplevel = [view gdkWindow];
+  _gdk_quartz_window_nspoint_to_gdk_xy (screen_point, x_root, y_root);
 
   event_type = [nsevent type];
 
@@ -763,7 +768,7 @@ find_window_for_ns_event (NSEvent *nsevent,
     case NSLeftMouseDragged:
     case NSRightMouseDragged:
     case NSOtherMouseDragged:
-      return find_toplevel_for_mouse_event (nsevent, toplevel, x, y);
+      return find_toplevel_for_mouse_event (nsevent, x, y);
       
     case NSMouseEntered:
     case NSMouseExited: