]> Pileus Git - ~andy/gtk/blobdiff - gdk/quartz/gdkevents-quartz.c
Change FSF Address
[~andy/gtk] / gdk / quartz / gdkevents-quartz.c
index 91932b8887682839048a4aeaf1347bfc615d1f28..ec3440d47a7d729e61ed3e240960246b5fb36059 100644 (file)
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
 #import <Cocoa/Cocoa.h>
 #include <Carbon/Carbon.h>
 
+#include <gdk/gdkdisplayprivate.h>
+
 #include "gdkscreen.h"
 #include "gdkkeysyms.h"
+#include "gdkquartz.h"
+#include "gdkquartzdisplay.h"
 #include "gdkprivate-quartz.h"
+#include "gdkquartzdevicemanager-core.h"
+
+#define GRIP_WIDTH 15
+#define GRIP_HEIGHT 15
+#define GDK_LION_RESIZE 5
 
-/* This is the window the mouse is currently over */
-static GdkWindow   *current_mouse_window;
+#define WINDOW_IS_TOPLEVEL(window)                  \
+  (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&   \
+   GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN && \
+   GDK_WINDOW_TYPE (window) != GDK_WINDOW_OFFSCREEN)
 
 /* This is the window corresponding to the key window */
 static GdkWindow   *current_keyboard_window;
 
-/* This is the pointer grab window */
-GdkWindow          *_gdk_quartz_pointer_grab_window;
-static gboolean     pointer_grab_owner_events;
-static GdkEventMask pointer_grab_event_mask;
-static gboolean     pointer_grab_implicit;
-
-/* This is the keyboard grab window */
-GdkWindow *         _gdk_quartz_keyboard_grab_window;
-static gboolean     keyboard_grab_owner_events;
-
-/* This is the event mask and button state from the last event */
-static GdkEventMask current_event_mask;
-static int          current_button_state;
-
-static void get_child_coordinates_from_ancestor (GdkWindow *ancestor_window,
-                                                 gint       ancestor_x,
-                                                 gint       ancestor_y,
-                                                 GdkWindow *child_window, 
-                                                 gint      *child_x, 
-                                                 gint      *child_y);
-static void get_ancestor_coordinates_from_child (GdkWindow *child_window,
-                                                 gint       child_x,
-                                                 gint       child_y,
-                                                 GdkWindow *ancestor_window, 
-                                                 gint      *ancestor_x, 
-                                                 gint      *ancestor_y);
-static void get_converted_window_coordinates    (GdkWindow *in_window,
-                                                 gint       in_x,
-                                                 gint       in_y,
-                                                 GdkWindow *out_window, 
-                                                 gint      *out_x, 
-                                                 gint      *out_y);
-static void append_event                        (GdkEvent  *event);
-
-static const gchar *
-which_window_is_this (GdkWindow *window)
-{
-  static gchar buf[256];
-  const gchar *name = NULL;
-  gpointer widget;
-
-  /* Get rid of compiler warning. */
-  if (0) which_window_is_this (window);
-
-  if (window == _gdk_root)
-    name = "root";
-  else if (window == NULL)
-    name = "null";
-
-  if (window)
-    {
-      gdk_window_get_user_data (window, &widget);
-      if (widget)
-        name = G_OBJECT_TYPE_NAME (widget);
-    }
-
-  if (!name)
-    name = "unknown";
 
-  snprintf (buf, 256, "<%s (%p)%s>", 
-            name, window, 
-            window == current_mouse_window ? ", is mouse" : "");
+static void append_event                        (GdkEvent  *event,
+                                                 gboolean   windowing);
 
-  return buf;
-}
+static GdkWindow *find_toplevel_under_pointer   (GdkDisplay *display,
+                                                 NSPoint     screen_point,
+                                                 gint       *x,
+                                                 gint       *y);
 
-NSEvent *
-gdk_quartz_event_get_nsevent (GdkEvent *event)
-{
-  /* FIXME: If the event here is unallocated, we crash. */
-  return ((GdkEventPrivate *) event)->windowing_data;
-}
 
 void
-_gdk_events_init (void)
+_gdk_quartz_events_init (void)
 {
   _gdk_quartz_event_loop_init ();
 
-  current_mouse_window = g_object_ref (_gdk_root);
   current_keyboard_window = g_object_ref (_gdk_root);
 }
 
 gboolean
-gdk_events_pending (void)
-{
-  return (_gdk_event_queue_find_first (_gdk_display) ||
-         (_gdk_quartz_event_loop_check_pending ()));
-}
-
-GdkEvent*
-gdk_event_get_graphics_expose (GdkWindow *window)
-{
-  /* FIXME: Implement */
-  return NULL;
-}
-
-static void
-generate_grab_broken_event (GdkWindow *window,
-                           gboolean   keyboard,
-                           gboolean   implicit,
-                           GdkWindow *grab_window)
-{
-  if (!GDK_WINDOW_DESTROYED (window))
-    {
-      GdkEvent *event = gdk_event_new (GDK_GRAB_BROKEN);
-
-      event->grab_broken.window = window;
-      event->grab_broken.send_event = 0;
-      event->grab_broken.keyboard = keyboard;
-      event->grab_broken.implicit = implicit;
-      event->grab_broken.grab_window = grab_window;
-      
-      append_event (event);
-    }
-}
-
-GdkGrabStatus
-gdk_keyboard_grab (GdkWindow  *window,
-                  gint        owner_events,
-                  guint32     time)
-{
-  g_return_val_if_fail (window != NULL, 0);
-  g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
-
-  if (_gdk_quartz_keyboard_grab_window)
-    {
-      if (_gdk_quartz_keyboard_grab_window != window)
-       generate_grab_broken_event (_gdk_quartz_keyboard_grab_window,
-                                   TRUE, FALSE, window);
-      
-      g_object_unref (_gdk_quartz_keyboard_grab_window);
-    }
-
-  _gdk_quartz_keyboard_grab_window = g_object_ref (window);
-  keyboard_grab_owner_events = owner_events;
-
-  return GDK_GRAB_SUCCESS;
-}
-
-void
-gdk_display_keyboard_ungrab (GdkDisplay *display,
-                            guint32     time)
-{
-  if (_gdk_quartz_keyboard_grab_window)
-    g_object_unref (_gdk_quartz_keyboard_grab_window);
-  _gdk_quartz_keyboard_grab_window = NULL;
-}
-
-gboolean
-gdk_keyboard_grab_info_libgtk_only (GdkDisplay *display,
-                                   GdkWindow **grab_window,
-                                   gboolean   *owner_events)
+_gdk_quartz_display_has_pending (GdkDisplay *display)
 {
-  if (_gdk_quartz_keyboard_grab_window) 
-    {
-      if (grab_window)
-       *grab_window = _gdk_quartz_keyboard_grab_window;
-      if (owner_events)
-       *owner_events = keyboard_grab_owner_events;
-
-      return TRUE;
-    }
-
-  return FALSE;
+  return (_gdk_event_queue_find_first (display) ||
+         (_gdk_quartz_event_loop_check_pending ()));
 }
 
 static void
-pointer_ungrab_internal (gboolean only_if_implicit)
-{
-  if (!_gdk_quartz_pointer_grab_window)
-    return;
-
-  if (only_if_implicit && !pointer_grab_implicit)
-    return;
-
-  g_object_unref (_gdk_quartz_pointer_grab_window);
-  _gdk_quartz_pointer_grab_window = NULL;
-
-  pointer_grab_owner_events = FALSE;
-  pointer_grab_event_mask = 0;
-  pointer_grab_implicit = FALSE;
-
-  /* FIXME: Send crossing events */
-}
-
-void
-gdk_display_pointer_ungrab (GdkDisplay *display,
-                           guint32     time)
-{
-  pointer_ungrab_internal (FALSE);
-}
-
-static GdkGrabStatus
-pointer_grab_internal (GdkWindow    *window,
-                      gboolean      owner_events,
-                      GdkEventMask  event_mask,
-                      GdkWindow    *confine_to,
-                      GdkCursor    *cursor,
-                      gboolean      implicit)
-{
-  /* FIXME: Send crossing events */
-  
-  _gdk_quartz_pointer_grab_window = g_object_ref (window);
-  pointer_grab_owner_events = owner_events;
-  pointer_grab_event_mask = event_mask;
-  pointer_grab_implicit = implicit;
-
-  return GDK_GRAB_SUCCESS;
-}
-
-GdkGrabStatus
-gdk_pointer_grab (GdkWindow    *window,
-                 gboolean      owner_events,
-                 GdkEventMask  event_mask,
-                 GdkWindow    *confine_to,
-                 GdkCursor    *cursor,
-                 guint32       time)
+break_all_grabs (guint32 time)
 {
-  g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
-  g_return_val_if_fail (confine_to == NULL || GDK_IS_WINDOW (confine_to), 0);
+  GList *list, *l;
+  GdkDeviceManager *device_manager;
 
-  if (_gdk_quartz_pointer_grab_window)
+  device_manager = gdk_display_get_device_manager (_gdk_display);
+  list = gdk_device_manager_list_devices (device_manager,
+                                          GDK_DEVICE_TYPE_MASTER);
+  for (l = list; l; l = l->next)
     {
-      if (_gdk_quartz_pointer_grab_window != window)
-        generate_grab_broken_event (_gdk_quartz_pointer_grab_window,
-                                    FALSE, pointer_grab_implicit, window);
-
-      pointer_ungrab_internal (FALSE);
-    }
+      GdkDeviceGrabInfo *grab;
 
-  return pointer_grab_internal (window, owner_events, event_mask, 
-                               confine_to, cursor, FALSE);
-}
+      grab = _gdk_display_get_last_device_grab (_gdk_display, l->data);
+      if (grab)
+        {
+          grab->serial_end = 0;
+          grab->implicit_ungrab = TRUE;
+        }
 
-/* This is used to break any grabs in the case where we have to due to
- * the grab emulation. Instead of enforcing the desktop wide grab, we
- * break it when the app loses focus for example.
- */
-static void
-break_all_grabs (void)
-{
-  if (_gdk_quartz_keyboard_grab_window)
-    {
-      generate_grab_broken_event (_gdk_quartz_keyboard_grab_window,
-                                  TRUE, FALSE,
-                                  NULL);
-      g_object_unref (_gdk_quartz_keyboard_grab_window);
-      _gdk_quartz_keyboard_grab_window = NULL;
+      _gdk_display_device_grab_update (_gdk_display, l->data, NULL, 0);
     }
 
-  if (_gdk_quartz_pointer_grab_window)
-    {
-      generate_grab_broken_event (_gdk_quartz_pointer_grab_window,
-                                  FALSE, pointer_grab_implicit,
-                                  NULL);
-      pointer_ungrab_internal (FALSE);
-    }
+  g_list_free (list);
 }
 
 static void
@@ -311,64 +112,60 @@ fixup_event (GdkEvent *event)
 }
 
 static void
-append_event (GdkEvent *event)
+append_event (GdkEvent *event,
+              gboolean  windowing)
 {
+  GList *node;
+
   fixup_event (event);
-  _gdk_event_queue_append (_gdk_display, event);
+  node = _gdk_event_queue_append (_gdk_display, event);
+
+  if (windowing)
+    _gdk_windowing_got_event (_gdk_display, node, event, 0);
 }
 
 static gint
 gdk_event_apply_filters (NSEvent *nsevent,
                         GdkEvent *event,
-                        GList *filters)
+                        GList **filters)
 {
   GList *tmp_list;
   GdkFilterReturn result;
   
-  tmp_list = filters;
+  tmp_list = *filters;
 
   while (tmp_list)
     {
       GdkEventFilter *filter = (GdkEventFilter*) tmp_list->data;
-      
-      tmp_list = tmp_list->next;
-      result = filter->function (nsevent, event, filter->data);
-      if (result !=  GDK_FILTER_CONTINUE)
-       return result;
-    }
-
-  return GDK_FILTER_CONTINUE;
-}
+      GList *node;
 
-/* Checks if the passed in window is interested in the event mask, and
- * if so, it's returned. If not, the event can be propagated through
- * its ancestors until one with the right event mask is found, up to
- * the nearest toplevel.
- */
-static GdkWindow *
-find_window_interested_in_event_mask (GdkWindow    *window, 
-                                     GdkEventMask  event_mask,
-                                     gboolean      propagate)
-{
-  GdkWindowObject *private;
+      if ((filter->flags & GDK_EVENT_FILTER_REMOVED) != 0)
+        {
+          tmp_list = tmp_list->next;
+          continue;
+        }
 
-  private = GDK_WINDOW_OBJECT (window);
-  while (private)
-    {
-      if (private->event_mask & event_mask)
-       return (GdkWindow *)private;
+      filter->ref_count++;
+      result = filter->function (nsevent, event, filter->data);
 
-      if (!propagate)
-       return NULL;
+      /* get the next node after running the function since the
+         function may add or remove a next node */
+      node = tmp_list;
+      tmp_list = tmp_list->next;
 
-      /* Don't traverse beyond toplevels. */
-      if (GDK_WINDOW_TYPE (private) != GDK_WINDOW_CHILD)
-       break;
+      filter->ref_count--;
+      if (filter->ref_count == 0)
+        {
+          *filters = g_list_remove_link (*filters, node);
+          g_list_free_1 (node);
+          g_free (filter);
+        }
 
-      private = private->parent;
+      if (result !=  GDK_FILTER_CONTINUE)
+       return result;
     }
 
-  return NULL;
+  return GDK_FILTER_CONTINUE;
 }
 
 static guint32
@@ -382,7 +179,7 @@ get_time_from_ns_event (NSEvent *event)
 static int
 get_mouse_button_from_ns_event (NSEvent *event)
 {
-  int button;
+  NSInteger button;
 
   button = [event buttonNumber];
 
@@ -399,6 +196,25 @@ get_mouse_button_from_ns_event (NSEvent *event)
     }
 }
 
+static GdkModifierType
+get_mouse_button_modifiers_from_ns_buttons (NSUInteger nsbuttons)
+{
+  GdkModifierType modifiers = 0;
+
+  if (nsbuttons & (1 << 0))
+    modifiers |= GDK_BUTTON1_MASK;
+  if (nsbuttons & (1 << 1))
+    modifiers |= GDK_BUTTON3_MASK;
+  if (nsbuttons & (1 << 2))
+    modifiers |= GDK_BUTTON2_MASK;
+  if (nsbuttons & (1 << 3))
+    modifiers |= GDK_BUTTON4_MASK;
+  if (nsbuttons & (1 << 4))
+    modifiers |= GDK_BUTTON5_MASK;
+
+  return modifiers;
+}
+
 static GdkModifierType
 get_mouse_button_modifiers_from_ns_event (NSEvent *event)
 {
@@ -414,25 +230,30 @@ get_mouse_button_modifiers_from_ns_event (NSEvent *event)
 }
 
 static GdkModifierType
-get_keyboard_modifiers_from_ns_event (NSEvent *nsevent)
+get_keyboard_modifiers_from_ns_flags (NSUInteger nsflags)
 {
   GdkModifierType modifiers = 0;
-  int nsflags;
 
-  nsflags = [nsevent modifierFlags];
-  
   if (nsflags & NSAlphaShiftKeyMask)
     modifiers |= GDK_LOCK_MASK;
   if (nsflags & NSShiftKeyMask)
     modifiers |= GDK_SHIFT_MASK;
   if (nsflags & NSControlKeyMask)
     modifiers |= GDK_CONTROL_MASK;
-  if (nsflags & NSCommandKeyMask)
+  if (nsflags & NSAlternateKeyMask)
     modifiers |= GDK_MOD1_MASK;
+  if (nsflags & NSCommandKeyMask)
+    modifiers |= GDK_MOD2_MASK;
 
   return modifiers;
 }
 
+static GdkModifierType
+get_keyboard_modifiers_from_ns_event (NSEvent *nsevent)
+{
+  return get_keyboard_modifiers_from_ns_flags ([nsevent modifierFlags]);
+}
+
 /* Return an event mask from an NSEvent */
 static GdkEventMask
 get_event_mask_from_ns_event (NSEvent *nsevent)
@@ -508,19 +329,111 @@ get_event_mask_from_ns_event (NSEvent *nsevent)
   return 0;
 }
 
+static void
+get_window_point_from_screen_point (GdkWindow *window,
+                                    NSPoint    screen_point,
+                                    gint      *x,
+                                    gint      *y)
+{
+  NSPoint point;
+  NSWindow *nswindow;
+
+  nswindow = ((GdkWindowImplQuartz *)window->impl)->toplevel;
+
+  point = [nswindow convertScreenToBase:screen_point];
+
+  *x = point.x;
+  *y = window->height - point.y;
+}
+
+static GdkWindow *
+get_toplevel_from_ns_event (NSEvent *nsevent,
+                            NSPoint *screen_point,
+                            gint    *x,
+                            gint    *y)
+{
+  GdkWindow *toplevel;
+
+  if ([nsevent window])
+    {
+      GdkQuartzView *view;
+      NSPoint point;
+
+      view = (GdkQuartzView *)[[nsevent window] contentView];
+
+      toplevel = [view gdkWindow];
+
+      point = [nsevent locationInWindow];
+      *screen_point = [[nsevent window] convertBaseToScreen:point];
+
+      *x = point.x;
+      *y = toplevel->height - point.y;
+    }
+  else
+    {
+      /* Fallback used when no NSWindow set.  This happens e.g. when
+       * we allow motion events without a window set in gdk_event_translate()
+       * that occur immediately after the main menu bar was clicked/used.
+       */
+      *screen_point = [NSEvent mouseLocation];
+      toplevel = find_toplevel_under_pointer (_gdk_display,
+                                              *screen_point,
+                                              x, y);
+    }
+
+  return toplevel;
+}
+
 static GdkEvent *
 create_focus_event (GdkWindow *window,
                    gboolean   in)
 {
   GdkEvent *event;
+  GdkQuartzDeviceManagerCore *device_manager;
 
   event = gdk_event_new (GDK_FOCUS_CHANGE);
   event->focus_change.window = window;
   event->focus_change.in = in;
 
+  device_manager = GDK_QUARTZ_DEVICE_MANAGER_CORE (_gdk_display->device_manager);
+  gdk_event_set_device (event, device_manager->core_keyboard);
+
   return event;
 }
 
+
+static void
+generate_motion_event (GdkWindow *window)
+{
+  NSPoint screen_point;
+  GdkEvent *event;
+  gint x, y, x_root, y_root;
+
+  event = gdk_event_new (GDK_MOTION_NOTIFY);
+  event->any.window = NULL;
+  event->any.send_event = TRUE;
+
+  screen_point = [NSEvent mouseLocation];
+
+  _gdk_quartz_window_nspoint_to_gdk_xy (screen_point, &x_root, &y_root);
+  get_window_point_from_screen_point (window, screen_point, &x, &y);
+
+  event->any.type = GDK_MOTION_NOTIFY;
+  event->motion.window = window;
+  event->motion.time = GDK_CURRENT_TIME;
+  event->motion.x = x;
+  event->motion.y = y;
+  event->motion.x_root = x_root;
+  event->motion.y_root = y_root;
+  /* FIXME event->axes */
+  event->motion.state = _gdk_quartz_events_get_current_keyboard_modifiers () |
+                        _gdk_quartz_events_get_current_mouse_modifiers ();
+  event->motion.is_hint = FALSE;
+  event->motion.device = _gdk_display->core_pointer;
+
+  append_event (event, TRUE);
+}
+
 /* Note: Used to both set a new focus window and to unset the old one. */
 void
 _gdk_quartz_events_update_focus_window (GdkWindow *window,
@@ -531,14 +444,14 @@ _gdk_quartz_events_update_focus_window (GdkWindow *window,
   if (got_focus && window == current_keyboard_window)
     return;
 
-  /* FIXME: Don't do this when grabbed? Or make GdkQuartzWindow
+  /* FIXME: Don't do this when grabbed? Or make GdkQuartzNSWindow
    * disallow it in the first place instead?
    */
   
   if (!got_focus && window == current_keyboard_window)
     {
       event = create_focus_event (current_keyboard_window, FALSE);
-      append_event (event);
+      append_event (event, FALSE);
       g_object_unref (current_keyboard_window);
       current_keyboard_window = NULL;
     }
@@ -548,46 +461,66 @@ _gdk_quartz_events_update_focus_window (GdkWindow *window,
       if (current_keyboard_window)
        {
          event = create_focus_event (current_keyboard_window, FALSE);
-         append_event (event);
+         append_event (event, FALSE);
          g_object_unref (current_keyboard_window);
          current_keyboard_window = NULL;
        }
       
       event = create_focus_event (window, TRUE);
-      append_event (event);
+      append_event (event, FALSE);
       current_keyboard_window = g_object_ref (window);
+
+      /* We just became the active window.  Unlike X11, Mac OS X does
+       * not send us motion events while the window does not have focus
+       * ("is not key").  We send a dummy motion notify event now, so that
+       * everything in the window is set to correct state.
+       */
+      generate_motion_event (window);
     }
 }
 
-static void
-convert_window_coordinates_to_root (GdkWindow *window,
-                                   gdouble    x,
-                                   gdouble    y,
-                                   gdouble   *x_root,
-                                   gdouble   *y_root)
+void
+_gdk_quartz_events_send_enter_notify_event (GdkWindow *window)
 {
-  gint ox, oy;
+  NSPoint screen_point;
+  GdkEvent *event;
+  gint x, y, x_root, y_root;
 
-  *x_root = x;
-  *y_root = y;
-  
-  if (gdk_window_get_origin (window, &ox, &oy))
-    {
-      *x_root += ox;
-      *y_root += oy;
-    }
+  event = gdk_event_new (GDK_ENTER_NOTIFY);
+  event->any.window = NULL;
+  event->any.send_event = FALSE;
+
+  screen_point = [NSEvent mouseLocation];
+
+  _gdk_quartz_window_nspoint_to_gdk_xy (screen_point, &x_root, &y_root);
+  get_window_point_from_screen_point (window, screen_point, &x, &y);
+
+  event->crossing.window = window;
+  event->crossing.subwindow = NULL;
+  event->crossing.time = GDK_CURRENT_TIME;
+  event->crossing.x = x;
+  event->crossing.y = y;
+  event->crossing.x_root = x_root;
+  event->crossing.y_root = y_root;
+  event->crossing.mode = GDK_CROSSING_NORMAL;
+  event->crossing.detail = GDK_NOTIFY_ANCESTOR;
+  event->crossing.state = _gdk_quartz_events_get_current_keyboard_modifiers () |
+                          _gdk_quartz_events_get_current_mouse_modifiers ();
+
+  gdk_event_set_device (event, _gdk_display->core_pointer);
+
+  append_event (event, TRUE);
 }
 
 void
 _gdk_quartz_events_send_map_event (GdkWindow *window)
 {
-  GdkWindowObject *private = (GdkWindowObject *)window;
-  GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl);
+  GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl);
 
   if (!impl->toplevel)
     return;
 
-  if (private->event_mask & GDK_STRUCTURE_MASK)
+  if (window->event_mask & GDK_STRUCTURE_MASK)
     {
       GdkEvent event;
 
@@ -598,317 +531,172 @@ _gdk_quartz_events_send_map_event (GdkWindow *window)
     }
 }
 
-/* Get current mouse window */
-GdkWindow *
-_gdk_quartz_events_get_mouse_window (gboolean consider_grabs)
-{
-  if (!consider_grabs)
-    return current_mouse_window;
-
-  if (_gdk_quartz_pointer_grab_window && !pointer_grab_owner_events)
-    return _gdk_quartz_pointer_grab_window;
-  
-  return current_mouse_window;
-}
-
-/* Update mouse window */
-void
-_gdk_quartz_events_update_mouse_window (GdkWindow *window)
-{
-  if (window == current_mouse_window)
-    return;
-
-#ifdef G_ENABLE_DEBUG
-  if (_gdk_debug_flags & GDK_DEBUG_EVENTS)
-    _gdk_quartz_window_debug_highlight (window, 0);
-#endif /* G_ENABLE_DEBUG */  
-
-  if (window)
-    g_object_ref (window);
-  if (current_mouse_window)
-    g_object_unref (current_mouse_window);
-
-  current_mouse_window = window;
-}
-
-/* Update current cursor */
-void
-_gdk_quartz_events_update_cursor (GdkWindow *window)
+static GdkWindow *
+find_toplevel_under_pointer (GdkDisplay *display,
+                             NSPoint     screen_point,
+                             gint       *x,
+                             gint       *y)
 {
-  GdkWindowObject *private = GDK_WINDOW_OBJECT (window);
-  NSCursor *nscursor = nil;
-
-  while (private)
-    {
-      GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl);
-
-      nscursor = impl->nscursor;
-      if (nscursor)
-        break;
-
-      private = private->parent;
-    }
-
-  GDK_QUARTZ_ALLOC_POOL;
-
-  if (!nscursor)
-    nscursor = [NSCursor arrowCursor];
+  GdkWindow *toplevel;
+  GdkPointerWindowInfo *info;
 
-  if ([NSCursor currentCursor] != nscursor)
-    [nscursor set];
+  info = _gdk_display_get_pointer_info (display, display->core_pointer);
+  toplevel = info->toplevel_under_pointer;
+  if (toplevel && WINDOW_IS_TOPLEVEL (toplevel))
+    get_window_point_from_screen_point (toplevel, screen_point, x, y);
 
-  GDK_QUARTZ_RELEASE_POOL;
+  return toplevel;
 }
 
-/* Translates coordinates from an ancestor window + coords, to
- * coordinates that are relative the child window.
- */
-static void
-get_child_coordinates_from_ancestor (GdkWindow *ancestor_window,
-                                    gint       ancestor_x,
-                                    gint       ancestor_y,
-                                    GdkWindow *child_window, 
-                                    gint      *child_x, 
-                                    gint      *child_y)
+static GdkWindow *
+find_toplevel_for_keyboard_event (NSEvent *nsevent)
 {
-  GdkWindowObject *ancestor_private = GDK_WINDOW_OBJECT (ancestor_window);
-  GdkWindowObject *child_private = GDK_WINDOW_OBJECT (child_window);
-
-  while (child_private != ancestor_private)
-    {
-      ancestor_x -= child_private->x;
-      ancestor_y -= child_private->y;
+  GList *list, *l;
+  GdkWindow *window;
+  GdkDisplay *display;
+  GdkQuartzView *view;
+  GdkDeviceManager *device_manager;
 
-      child_private = child_private->parent;
-    }
+  view = (GdkQuartzView *)[[nsevent window] contentView];
+  window = [view gdkWindow];
 
-  *child_x = ancestor_x;
-  *child_y = ancestor_y;
-}
-
-/* Translates coordinates from a child window + coords, to
- * coordinates that are relative the ancestor window.
- */
-static void
-get_ancestor_coordinates_from_child (GdkWindow *child_window,
-                                    gint       child_x,
-                                    gint       child_y,
-                                    GdkWindow *ancestor_window, 
-                                    gint      *ancestor_x, 
-                                    gint      *ancestor_y)
-{
-  GdkWindowObject *child_private = GDK_WINDOW_OBJECT (child_window);
-  GdkWindowObject *ancestor_private = GDK_WINDOW_OBJECT (ancestor_window);
+  display = gdk_window_get_display (window);
 
-  while (child_private != ancestor_private)
+  device_manager = gdk_display_get_device_manager (display);
+  list = gdk_device_manager_list_devices (device_manager,
+                                          GDK_DEVICE_TYPE_MASTER);
+  for (l = list; l; l = l->next)
     {
-      child_x += child_private->x;
-      child_y += child_private->y;
-
-      child_private = child_private->parent;
-    }
+      GdkDeviceGrabInfo *grab;
+      GdkDevice *device = l->data;
 
-  *ancestor_x = child_x;
-  *ancestor_y = child_y;
-}
+      if (gdk_device_get_source(device) != GDK_SOURCE_KEYBOARD)
+        continue;
 
-/* Translates coordinates relative to one window (in_window) into
- * coordinates relative to another window (out_window).
- */
-static void
-get_converted_window_coordinates (GdkWindow *in_window,
-                                  gint       in_x,
-                                  gint       in_y,
-                                  GdkWindow *out_window, 
-                                  gint      *out_x, 
-                                  gint      *out_y)
-{
-  GdkWindow *in_toplevel;
-  GdkWindow *out_toplevel;
-  int in_origin_x, in_origin_y;
-  int out_origin_x, out_origin_y;
-
-  if (in_window == out_window)
-    {
-      *out_x = in_x;
-      *out_y = in_y;
-      return;
+      grab = _gdk_display_get_last_device_grab (display, device);
+      if (grab && grab->window && !grab->owner_events)
+        {
+          window = gdk_window_get_effective_toplevel (grab->window);
+          break;
+        }
     }
 
-  /* First translate to "in" toplevel coordinates, then on to "out"
-   * toplevel coordinates, and finally to "out" child (the passed in
-   * window) coordinates.
-   */
-
-  in_toplevel = gdk_window_get_toplevel (in_window);
-  out_toplevel  = gdk_window_get_toplevel (out_window);
+  g_list_free (list);
 
-  /* Translate in_x, in_y to "in" toplevel coordinates. */
-  get_ancestor_coordinates_from_child (in_window, in_x, in_y,
-                                       in_toplevel, &in_x, &in_y);
-
-  gdk_window_get_origin (in_toplevel, &in_origin_x, &in_origin_y);
-  gdk_window_get_origin (out_toplevel, &out_origin_x, &out_origin_y);
-
-  /* Translate in_x, in_y to "out" toplevel coordinates. */
-  in_x -= out_origin_x - in_origin_x;
-  in_y -= out_origin_y - in_origin_y;
-
-  get_child_coordinates_from_ancestor (out_toplevel, 
-                                       in_x, in_y,
-                                       out_window,
-                                       out_x, out_y);
+  return window;
 }
 
-/* Given a mouse NSEvent (must be a mouse event for a GDK window),
- * finds the subwindow over which the pointer is located. Returns
- * coordinates relative to the found window. If no window is found,
- * returns the root window, and root window coordinates.
- */
 static GdkWindow *
-find_mouse_window_for_ns_event (NSEvent *nsevent,
-                                gint    *x_ret,
-                                gint    *y_ret)
+find_toplevel_for_mouse_event (NSEvent    *nsevent,
+                               gint       *x,
+                               gint       *y)
 {
-  GdkWindow *event_toplevel;
-  GdkWindowImplQuartz *impl;
-  GdkWindowObject *private;
-  GdkWindow *mouse_toplevel;
-  GdkWindow *mouse_window;
-  NSPoint point;
-  gint x_tmp, y_tmp;
-
-  event_toplevel = [(GdkQuartzView *)[[nsevent window] contentView] gdkWindow];
-  impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (event_toplevel)->impl);
-  private = GDK_WINDOW_OBJECT (event_toplevel);
-  point = [nsevent locationInWindow];
+  NSPoint screen_point;
+  NSEventType event_type;
+  GdkWindow *toplevel;
+  GdkDisplay *display;
+  GdkDeviceGrabInfo *grab;
 
-  x_tmp = point.x;
-  y_tmp = private->height - point.y;
+  toplevel = get_toplevel_from_ns_event (nsevent, &screen_point, x, y);
 
-  mouse_toplevel = gdk_window_get_toplevel (current_mouse_window);
+  display = gdk_window_get_display (toplevel);
 
-  get_converted_window_coordinates (event_toplevel,
-                                    x_tmp, y_tmp,
-                                    mouse_toplevel,
-                                    &x_tmp, &y_tmp);
+  event_type = [nsevent type];
 
-  mouse_window = _gdk_quartz_window_find_child (mouse_toplevel, x_tmp, y_tmp);
-  if (mouse_window && mouse_window != mouse_toplevel)
-    {
-      get_child_coordinates_from_ancestor (mouse_toplevel,
-                                           x_tmp, y_tmp,
-                                           mouse_window,
-                                           &x_tmp, &y_tmp);
-    }
-  else if (!mouse_window)
+  /* From the docs for XGrabPointer:
+   *
+   * If owner_events is True and if a generated pointer event
+   * would normally be reported to this client, it is reported
+   * as usual. Otherwise, the event is reported with respect to
+   * the grab_window and is reported only if selected by
+   * event_mask. For either value of owner_events, unreported
+   * events are discarded.
+   */
+  grab = _gdk_display_get_last_device_grab (display,
+                                            display->core_pointer);
+  if (WINDOW_IS_TOPLEVEL (toplevel) && grab)
     {
-      /* This happens for events on the window title buttons and the
-       * desktop, treat those as being on the root window.
+      /* Implicit grabs do not go through XGrabPointer and thus the
+       * event mask should not be checked.
        */
-      get_converted_window_coordinates (mouse_toplevel,
-                                        x_tmp, y_tmp,
-                                        _gdk_root,
-                                        &x_tmp, &y_tmp);
-      mouse_window = _gdk_root;
-    }
+      if (!grab->implicit
+          && (grab->event_mask & get_event_mask_from_ns_event (nsevent)) == 0)
+        return NULL;
 
-  *x_ret = x_tmp;
-  *y_ret = y_tmp;
+      if (grab->owner_events)
+        {
+          /* For owner events, we need to use the toplevel under the
+           * pointer, not the window from the NSEvent, since that is
+           * reported with respect to the key window, which could be
+           * wrong.
+           */
+          GdkWindow *toplevel_under_pointer;
+          gint x_tmp, y_tmp;
+
+          toplevel_under_pointer = find_toplevel_under_pointer (display,
+                                                                screen_point,
+                                                                &x_tmp, &y_tmp);
+          if (toplevel_under_pointer)
+            {
+              toplevel = toplevel_under_pointer;
+              *x = x_tmp;
+              *y = y_tmp;
+            }
+
+          return toplevel;
+        }
+      else
+        {
+          /* Finally check the grab window. */
+          GdkWindow *grab_toplevel;
 
-  return mouse_window;
-}
+          grab_toplevel = gdk_window_get_effective_toplevel (grab->window);
+          get_window_point_from_screen_point (grab_toplevel, screen_point,
+                                              x, y);
 
-/* Trigger crossing events if necessary. This is used when showing a new
- * window, since the tracking rect API doesn't work reliably when a window
- * shows up under the mouse cursor. It's done by finding the topmost window
- * under the mouse pointer and synthesizing crossing events into that
- * window.
- */
-void
-_gdk_quartz_events_trigger_crossing_events (gboolean defer_to_mainloop)
-{
-  NSPoint point;
-  gint x, y; 
-  gint x_toplevel, y_toplevel;
-  GdkWindow *mouse_window;
-  GdkWindow *toplevel;
-  GdkWindowImplQuartz *impl;
-  GdkWindowObject *private;
-  guint flags = 0;
-  NSTimeInterval timestamp = 0;
-  NSEvent *current_event;
-  NSEvent *nsevent;
+          return grab_toplevel;
+        }
 
-  if (defer_to_mainloop)
-    {
-      nsevent = [NSEvent otherEventWithType:NSApplicationDefined
-                                   location:NSZeroPoint
-                              modifierFlags:0
-                                  timestamp:0
-                               windowNumber:0
-                                    context:nil
-                                    subtype:GDK_QUARTZ_EVENT_SUBTYPE_FAKE_CROSSING
-                                      data1:0
-                                      data2:0];
-      [NSApp postEvent:nsevent atStart:NO];
-      return;
+      return NULL;
     }
+  else 
+    {
+      /* The non-grabbed case. */
+      GdkWindow *toplevel_under_pointer;
+      gint x_tmp, y_tmp;
+
+      /* Ignore all events but mouse moved that might be on the title
+       * bar (above the content view). The reason is that otherwise
+       * gdk gets confused about getting e.g. button presses with no
+       * window (the title bar is not known to it).
+       */
+      if (event_type != NSMouseMoved)
+        if (*y < 0)
+          return NULL;
 
-  point = [NSEvent mouseLocation];
-  x = point.x;
-  y = _gdk_quartz_window_get_inverted_screen_y (point.y);
-
-  mouse_window = _gdk_quartz_window_find_child (_gdk_root, x, y);
-  if (!mouse_window || mouse_window == _gdk_root)
-    return;
-
-  toplevel = gdk_window_get_toplevel (mouse_window);
+      /* As for owner events, we need to use the toplevel under the
+       * pointer, not the window from the NSEvent.
+       */
+      toplevel_under_pointer = find_toplevel_under_pointer (display,
+                                                            screen_point,
+                                                            &x_tmp, &y_tmp);
+      if (toplevel_under_pointer
+          && WINDOW_IS_TOPLEVEL (toplevel_under_pointer))
+        {
+          GdkWindowImplQuartz *toplevel_impl;
 
-  /* We ignore crossing within the same toplevel since that is already
-   * handled elsewhere.
-   */
-  if (toplevel == gdk_window_get_toplevel (current_mouse_window))
-    return;
+          toplevel = toplevel_under_pointer;
 
-  get_converted_window_coordinates (_gdk_root,
-                                    x, y,
-                                    toplevel,
-                                    &x_toplevel, &y_toplevel);
+          toplevel_impl = (GdkWindowImplQuartz *)toplevel->impl;
 
-  get_converted_window_coordinates (_gdk_root,
-                                    x, y,
-                                    mouse_window,
-                                    &x, &y);
+          *x = x_tmp;
+          *y = y_tmp;
+        }
 
-  /* Fix up the event to be less fake if possible. */
-  current_event = [NSApp currentEvent];
-  if (current_event)
-    {
-      flags = [current_event modifierFlags];
-      timestamp = [current_event timestamp];
+      return toplevel;
     }
 
-  if (timestamp == 0)
-    timestamp = GetCurrentEventTime ();
-
-  impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (toplevel)->impl);
-  private = GDK_WINDOW_OBJECT (toplevel);
-  nsevent = [NSEvent otherEventWithType:NSApplicationDefined
-                               location:NSMakePoint (x_toplevel, private->height - y_toplevel)
-                          modifierFlags:flags
-                              timestamp:timestamp
-                           windowNumber:[impl->toplevel windowNumber]
-                                context:nil
-                                subtype:GDK_QUARTZ_EVENT_SUBTYPE_FAKE_CROSSING
-                                  data1:0
-                                  data2:0];
-
-#ifdef G_ENABLE_DEBUG
-  /*_gdk_quartz_window_debug_highlight (mouse_window, 0);*/
-#endif
-
-  /* FIXME: create an event, fill it, put on the queue... */
+  return NULL;
 }
 
 /* This function finds the correct window to send an event to, taking
@@ -917,22 +705,19 @@ _gdk_quartz_events_trigger_crossing_events (gboolean defer_to_mainloop)
 static GdkWindow *
 find_window_for_ns_event (NSEvent *nsevent, 
                           gint    *x, 
-                          gint    *y)
+                          gint    *y,
+                          gint    *x_root,
+                          gint    *y_root)
 {
+  GdkQuartzView *view;
   GdkWindow *toplevel;
-  GdkWindowObject *private;
-  GdkWindowImplQuartz *impl;
-  NSPoint point;
+  NSPoint screen_point;
   NSEventType event_type;
 
-  toplevel = [(GdkQuartzView *)[[nsevent window] contentView] gdkWindow];
-  private = GDK_WINDOW_OBJECT (toplevel);
-  impl = GDK_WINDOW_IMPL_QUARTZ (private->impl);
-
-  point = [nsevent locationInWindow];
+  view = (GdkQuartzView *)[[nsevent window] contentView];
 
-  *x = point.x;
-  *y = private->height - point.y;
+  toplevel = get_toplevel_from_ns_event (nsevent, &screen_point, x, y);
+  _gdk_quartz_window_nspoint_to_gdk_xy (screen_point, x_root, y_root);
 
   event_type = [nsevent type];
 
@@ -949,101 +734,22 @@ find_window_for_ns_event (NSEvent *nsevent,
     case NSLeftMouseDragged:
     case NSRightMouseDragged:
     case NSOtherMouseDragged:
-      {
-       GdkWindow *mouse_window;
-       GdkEventMask event_mask;
-       GdkWindow *real_window;
-
-       /* From the docs for XGrabPointer:
-        *
-        * If owner_events is True and if a generated pointer event
-        * would normally be reported to this client, it is reported
-        * as usual. Otherwise, the event is reported with respect to
-        * the grab_window and is reported only if selected by
-        * event_mask. For either value of owner_events, unreported
-        * events are discarded.
-        *
-        * This means we first try the owner, then the grab window,
-        * then give up.
-        */
-       if (0 && _gdk_quartz_pointer_grab_window) /* FIXME: Implement grabs? */
-         {
-           if (pointer_grab_owner_events)
-             {
-                mouse_window = find_mouse_window_for_ns_event (nsevent, x, y);
-               event_mask = get_event_mask_from_ns_event (nsevent);
-               real_window = find_window_interested_in_event_mask (mouse_window, event_mask, TRUE);
-               
-               if (mouse_window && real_window && mouse_window != real_window)
-                 get_ancestor_coordinates_from_child (mouse_window,
-                                                      *x, *y,
-                                                      real_window,
-                                                      x, y);
-
-               if (real_window)
-                 return real_window;
-             }
-
-           /* Finally check the grab window. */
-           if (pointer_grab_event_mask & get_event_mask_from_ns_event (nsevent))
-             {
-                GdkWindow *event_toplevel;
-               GdkWindow *grab_toplevel;
-               NSPoint point;
-               int x_tmp, y_tmp;
-
-                event_toplevel = [(GdkQuartzView *)[[nsevent window] contentView] gdkWindow];
-               grab_toplevel = gdk_window_get_toplevel (_gdk_quartz_pointer_grab_window);
-               point = [nsevent locationInWindow];
-
-               x_tmp = point.x;
-               y_tmp = GDK_WINDOW_OBJECT (grab_toplevel)->height - point.y;
-
-                /* Translate the coordinates so they are relative to
-                 * the grab window instead of the event toplevel for
-                 * the cases where they are not the same.
-                 */
-                get_converted_window_coordinates (event_toplevel,
-                                                  x_tmp, y_tmp,
-                                                  _gdk_quartz_pointer_grab_window,
-                                                  x, y);
-
-               return _gdk_quartz_pointer_grab_window;
-             }
-
-           return NULL;
-         }
-       else 
-         {
-           /* The non-grabbed case. */
-
-            /* Leave events above the window (e.g. possibly on the titlebar)
-             * to cocoa.
-             */
-            if (*y < 0)
-              return NULL;
-
-            /* FIXME: Also need to leave resize events to cocoa somehow? */
-
-            return toplevel;
-         }
-      }
-      break;
+      return find_toplevel_for_mouse_event (nsevent, x, y);
       
     case NSMouseEntered:
     case NSMouseExited:
-      return toplevel;
+      /* Only handle our own entered/exited events, not the ones for the
+       * titlebar buttons.
+       */
+      if ([view trackingRect] == [nsevent trackingNumber])
+        return toplevel;
+      else
+        return NULL;
 
     case NSKeyDown:
     case NSKeyUp:
     case NSFlagsChanged:
-      {
-       if (_gdk_quartz_keyboard_grab_window && !keyboard_grab_owner_events)
-         return _gdk_quartz_keyboard_grab_window;
-
-        return toplevel;
-      }
-      break;
+      return find_toplevel_for_keyboard_event (nsevent);
 
     default:
       /* Ignore everything else. */
@@ -1059,32 +765,26 @@ fill_crossing_event (GdkWindow       *toplevel,
                      NSEvent         *nsevent,
                      gint             x,
                      gint             y,
+                     gint             x_root,
+                     gint             y_root,
                      GdkEventType     event_type,
                      GdkCrossingMode  mode,
                      GdkNotifyType    detail)
 {
-  GdkWindowObject *private;
-  NSPoint point;
-
-  private = GDK_WINDOW_OBJECT (toplevel);
-
-  point = [nsevent locationInWindow];
-
   event->any.type = event_type;
   event->crossing.window = toplevel;
   event->crossing.subwindow = NULL;
   event->crossing.time = get_time_from_ns_event (nsevent);
   event->crossing.x = x;
   event->crossing.y = y;
+  event->crossing.x_root = x_root;
+  event->crossing.y_root = y_root;
   event->crossing.mode = mode;
   event->crossing.detail = detail;
-  event->crossing.state = get_keyboard_modifiers_from_ns_event (nsevent);
+  event->crossing.state = get_keyboard_modifiers_from_ns_event (nsevent) |
+                         _gdk_quartz_events_get_current_mouse_modifiers ();
 
-  convert_window_coordinates_to_root (toplevel,
-                                      event->crossing.x,
-                                      event->crossing.y,
-                                     &event->crossing.x_root,
-                                     &event->crossing.y_root);
+  gdk_event_set_device (event, _gdk_display->core_pointer);
 
   /* FIXME: Focus and button state? */
 }
@@ -1094,13 +794,15 @@ fill_button_event (GdkWindow *window,
                    GdkEvent  *event,
                    NSEvent   *nsevent,
                    gint       x,
-                   gint       y)
+                   gint       y,
+                   gint       x_root,
+                   gint       y_root)
 {
   GdkEventType type;
   gint state;
-  gint button;
 
-  state = get_keyboard_modifiers_from_ns_event (nsevent);
+  state = get_keyboard_modifiers_from_ns_event (nsevent) |
+         _gdk_quartz_events_get_current_mouse_modifiers ();
 
   switch ([nsevent type])
     {
@@ -1108,34 +810,31 @@ fill_button_event (GdkWindow *window,
     case NSRightMouseDown:
     case NSOtherMouseDown:
       type = GDK_BUTTON_PRESS;
+      state &= ~get_mouse_button_modifiers_from_ns_event (nsevent);
       break;
+
     case NSLeftMouseUp:
     case NSRightMouseUp:
     case NSOtherMouseUp:
       type = GDK_BUTTON_RELEASE;
       state |= get_mouse_button_modifiers_from_ns_event (nsevent);
       break;
+
     default:
       g_assert_not_reached ();
     }
-  
-  button = get_mouse_button_from_ns_event (nsevent);
 
   event->any.type = type;
   event->button.window = window;
   event->button.time = get_time_from_ns_event (nsevent);
   event->button.x = x;
   event->button.y = y;
+  event->button.x_root = x_root;
+  event->button.y_root = y_root;
   /* FIXME event->axes */
   event->button.state = state;
-  event->button.button = button;
+  event->button.button = get_mouse_button_from_ns_event (nsevent);
   event->button.device = _gdk_display->core_pointer;
-
-  convert_window_coordinates_to_root (window,
-                                      event->button.x,
-                                      event->button.y,
-                                     &event->button.x_root,
-                                     &event->button.y_root);
 }
 
 static void
@@ -1143,39 +842,22 @@ fill_motion_event (GdkWindow *window,
                    GdkEvent  *event,
                    NSEvent   *nsevent,
                    gint       x,
-                   gint       y)
+                   gint       y,
+                   gint       x_root,
+                   gint       y_root)
 {
-  GdkModifierType state;
-
-  state = get_keyboard_modifiers_from_ns_event (nsevent);
-
-  switch ([nsevent type])
-    {
-    case NSLeftMouseDragged:
-    case NSRightMouseDragged:
-    case NSOtherMouseDragged:
-      state |= get_mouse_button_modifiers_from_ns_event (nsevent);
-      break;
-
-    case NSMouseMoved:
-      break;
-    }
-
   event->any.type = GDK_MOTION_NOTIFY;
   event->motion.window = window;
   event->motion.time = get_time_from_ns_event (nsevent);
   event->motion.x = x;
   event->motion.y = y;
+  event->motion.x_root = x_root;
+  event->motion.y_root = y_root;
   /* FIXME event->axes */
-  event->motion.state = state;
+  event->motion.state = get_keyboard_modifiers_from_ns_event (nsevent) |
+                        _gdk_quartz_events_get_current_mouse_modifiers ();
   event->motion.is_hint = FALSE;
   event->motion.device = _gdk_display->core_pointer;
-
-  convert_window_coordinates_to_root (window,
-                                      event->motion.x,
-                                      event->motion.y,
-                                     &event->motion.x_root,
-                                      &event->motion.y_root);
 }
 
 static void
@@ -1184,13 +866,12 @@ fill_scroll_event (GdkWindow          *window,
                    NSEvent            *nsevent,
                    gint                x,
                    gint                y,
+                   gint                x_root,
+                   gint                y_root,
                    GdkScrollDirection  direction)
 {
-  GdkWindowObject *private;
   NSPoint point;
 
-  private = GDK_WINDOW_OBJECT (window);
-
   point = [nsevent locationInWindow];
 
   event->any.type = GDK_SCROLL;
@@ -1198,15 +879,11 @@ fill_scroll_event (GdkWindow          *window,
   event->scroll.time = get_time_from_ns_event (nsevent);
   event->scroll.x = x;
   event->scroll.y = y;
+  event->scroll.x_root = x_root;
+  event->scroll.y_root = y_root;
   event->scroll.state = get_keyboard_modifiers_from_ns_event (nsevent);
   event->scroll.direction = direction;
   event->scroll.device = _gdk_display->core_pointer;
-
-  convert_window_coordinates_to_root (window,
-                                      event->scroll.x,
-                                      event->scroll.y,
-                                     &event->scroll.x_root,
-                                     &event->scroll.y_root);
 }
 
 static void
@@ -1216,6 +893,7 @@ fill_key_event (GdkWindow    *window,
                 GdkEventType  type)
 {
   GdkEventPrivate *priv;
+  GdkQuartzDeviceManagerCore *device_manager;
   gchar buf[7];
   gunichar c = 0;
 
@@ -1228,9 +906,12 @@ fill_key_event (GdkWindow    *window,
   event->key.state = get_keyboard_modifiers_from_ns_event (nsevent);
   event->key.hardware_keycode = [nsevent keyCode];
   event->key.group = ([nsevent modifierFlags] & NSAlternateKeyMask) ? 1 : 0;
-  event->key.keyval = GDK_VoidSymbol;
+  event->key.keyval = GDK_KEY_VoidSymbol;
+
+  device_manager = GDK_QUARTZ_DEVICE_MANAGER_CORE (_gdk_display->device_manager);
+  gdk_event_set_device (event, device_manager->core_keyboard);
   
-  gdk_keymap_translate_keyboard_state (NULL,
+  gdk_keymap_translate_keyboard_state (gdk_keymap_get_for_display (_gdk_display),
                                       event->key.hardware_keycode,
                                       event->key.state, 
                                       event->key.group,
@@ -1249,23 +930,23 @@ fill_key_event (GdkWindow    *window,
 
       switch (event->key.keyval)
         {
-        case GDK_Meta_R:
-        case GDK_Meta_L:
-          mask = GDK_MOD1_MASK;
+        case GDK_KEY_Meta_R:
+        case GDK_KEY_Meta_L:
+          mask = GDK_MOD2_MASK;
           break;
-        case GDK_Shift_R:
-        case GDK_Shift_L:
+        case GDK_KEY_Shift_R:
+        case GDK_KEY_Shift_L:
           mask = GDK_SHIFT_MASK;
           break;
-        case GDK_Caps_Lock:
+        case GDK_KEY_Caps_Lock:
           mask = GDK_LOCK_MASK;
           break;
-        case GDK_Alt_R:
-        case GDK_Alt_L:
-          mask = GDK_MOD5_MASK;
+        case GDK_KEY_Alt_R:
+        case GDK_KEY_Alt_L:
+          mask = GDK_MOD1_MASK;
           break;
-        case GDK_Control_R:
-        case GDK_Control_L:
+        case GDK_KEY_Control_R:
+        case GDK_KEY_Control_L:
           mask = GDK_CONTROL_MASK;
           break;
         default:
@@ -1278,15 +959,22 @@ fill_key_event (GdkWindow    *window,
         event->key.state |= mask;
     }
 
-  event->key.state |= current_button_state;
+  event->key.state |= _gdk_quartz_events_get_current_mouse_modifiers ();
+
+  /* The X11 backend adds the first virtual modifier MOD2..MOD5 are
+   * mapped to. Since we only have one virtual modifier in the quartz
+   * backend, calling the standard function will do.
+   */
+  gdk_keymap_add_virtual_modifiers (gdk_keymap_get_for_display (_gdk_display),
+                                    &event->key.state);
 
   event->key.string = NULL;
 
   /* Fill in ->string since apps depend on it, taken from the x11 backend. */
-  if (event->key.keyval != GDK_VoidSymbol)
+  if (event->key.keyval != GDK_KEY_VoidSymbol)
     c = gdk_keyval_to_unicode (event->key.keyval);
 
-    if (c)
+  if (c)
     {
       gsize bytes_written;
       gint len;
@@ -1300,13 +988,13 @@ fill_key_event (GdkWindow    *window,
       if (event->key.string)
        event->key.length = bytes_written;
     }
-  else if (event->key.keyval == GDK_Escape)
+  else if (event->key.keyval == GDK_KEY_Escape)
     {
       event->key.length = 1;
       event->key.string = g_strdup ("\033");
     }
-  else if (event->key.keyval == GDK_Return ||
-         event->key.keyval == GDK_KP_Enter)
+  else if (event->key.keyval == GDK_KEY_Return ||
+         event->key.keyval == GDK_KEY_KP_Enter)
     {
       event->key.length = 1;
       event->key.string = g_strdup ("\r");
@@ -1331,59 +1019,41 @@ synthesize_crossing_event (GdkWindow *window,
                            GdkEvent  *event,
                            NSEvent   *nsevent,
                            gint       x,
-                           gint       y)
+                           gint       y,
+                           gint       x_root,
+                           gint       y_root)
 {
-  GdkWindowObject *private;
-
-  private = GDK_WINDOW_OBJECT (window);
-
-  /* FIXME: had this before csw:
-     _gdk_quartz_events_update_mouse_window (window);
-     if (window && !_gdk_quartz_pointer_grab_window)
-       _gdk_quartz_events_update_cursor (window);
-  */
-
   switch ([nsevent type])
     {
     case NSMouseEntered:
-      {
-        /* Enter events are considered always to be from the root window as
-         * we can't know for sure from what window we enter.
-         */
-        if (!(private->event_mask & GDK_ENTER_NOTIFY_MASK))
-          return FALSE;
-
-        fill_crossing_event (window, event, nsevent,
-                             x, y,
-                             GDK_ENTER_NOTIFY,
-                             GDK_CROSSING_NORMAL,
-                             GDK_NOTIFY_ANCESTOR);
-      }
+      /* Enter events are considered always to be from the root window as we
+       * can't know for sure from what window we enter.
+       */
+      if (!(window->event_mask & GDK_ENTER_NOTIFY_MASK))
+        return FALSE;
+
+      fill_crossing_event (window, event, nsevent,
+                           x, y,
+                           x_root, y_root,
+                           GDK_ENTER_NOTIFY,
+                           GDK_CROSSING_NORMAL,
+                           GDK_NOTIFY_ANCESTOR);
       return TRUE;
 
     case NSMouseExited:
-      {
-        /* Exited always is to the root window as far as we are concerned,
-         * since there is no way to reliably get information about what new
-         * window is entered when exiting one.
-         */
-        if (!(private->event_mask & GDK_LEAVE_NOTIFY_MASK))
-          return FALSE;
-
-        /*if (!mouse_window ||
-            gdk_window_get_toplevel (mouse_window) ==
-            gdk_window_get_toplevel (current_mouse_window))
-          {
-            mouse_window = _gdk_root;
-          }
-        */
-
-        fill_crossing_event (window, event, nsevent,
-                             x, y,
-                             GDK_LEAVE_NOTIFY,
-                             GDK_CROSSING_NORMAL,
-                             GDK_NOTIFY_ANCESTOR);
-      }
+      /* Exited always is to the root window as far as we are concerned,
+       * since there is no way to reliably get information about what new
+       * window is entered when exiting one.
+       */
+      if (!(window->event_mask & GDK_LEAVE_NOTIFY_MASK))
+        return FALSE;
+
+      fill_crossing_event (window, event, nsevent,
+                           x, y,
+                           x_root, y_root,
+                           GDK_LEAVE_NOTIFY,
+                           GDK_CROSSING_NORMAL,
+                           GDK_NOTIFY_ANCESTOR);
       return TRUE;
 
     default:
@@ -1393,61 +1063,126 @@ synthesize_crossing_event (GdkWindow *window,
   return FALSE;
 }
 
-GdkEventMask 
-_gdk_quartz_events_get_current_event_mask (void)
+GdkModifierType
+_gdk_quartz_events_get_current_keyboard_modifiers (void)
+{
+  if (gdk_quartz_osx_version () >= GDK_OSX_SNOW_LEOPARD)
+    {
+      return get_keyboard_modifiers_from_ns_flags ([NSClassFromString(@"NSEvent") modifierFlags]);
+    }
+  else
+    {
+      guint carbon_modifiers = GetCurrentKeyModifiers ();
+      GdkModifierType modifiers = 0;
+
+      if (carbon_modifiers & alphaLock)
+        modifiers |= GDK_LOCK_MASK;
+      if (carbon_modifiers & shiftKey)
+        modifiers |= GDK_SHIFT_MASK;
+      if (carbon_modifiers & controlKey)
+        modifiers |= GDK_CONTROL_MASK;
+      if (carbon_modifiers & optionKey)
+        modifiers |= GDK_MOD1_MASK;
+      if (carbon_modifiers & cmdKey)
+        modifiers |= GDK_MOD2_MASK;
+
+      return modifiers;
+    }
+}
+
+GdkModifierType
+_gdk_quartz_events_get_current_mouse_modifiers (void)
+{
+  if (gdk_quartz_osx_version () >= GDK_OSX_SNOW_LEOPARD)
+    {
+      return get_mouse_button_modifiers_from_ns_buttons ([NSClassFromString(@"NSEvent") pressedMouseButtons]);
+    }
+  else
+    {
+      return get_mouse_button_modifiers_from_ns_buttons (GetCurrentButtonState ());
+    }
+}
+
+/* Detect window resizing */
+
+static gboolean
+test_resize (NSEvent *event, GdkWindow *toplevel, gint x, gint y)
 {
-  return current_event_mask;
+  GdkWindowImplQuartz *toplevel_impl;
+  gboolean lion;
+
+  /* Resizing only begins if an NSLeftMouseButton event is received in
+   * the resizing area. Handle anything else.
+   */
+  if ([event type] != NSLeftMouseDown)
+    return FALSE;
+
+  toplevel_impl = (GdkWindowImplQuartz *)toplevel->impl;
+  if ([toplevel_impl->toplevel showsResizeIndicator])
+    {
+      NSRect frame;
+
+      /* If the resize indicator is visible and the event
+       * is in the lower right 15x15 corner, we leave these
+       * events to Cocoa as to be handled as resize events.
+       * Applications may have widgets in this area.  These
+       * will most likely be larger than 15x15 and for
+       * scroll bars there are also other means to move
+       * the scroll bar.  Since the resize indicator is
+       * the only way of resizing windows on Mac OS, it
+       * is too important to not make functional.
+       */
+      frame = [toplevel_impl->view bounds];
+      if (x > frame.size.width - GRIP_WIDTH &&
+          x < frame.size.width &&
+          y > frame.size.height - GRIP_HEIGHT &&
+          y < frame.size.height)
+        return TRUE;
+     }
+
+  /* If we're on Lion and within 5 pixels of an edge,
+   * then assume that the user wants to resize, and
+   * return NULL to let Quartz get on with it. We check
+   * 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.
+   */
+  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;
+
+  return FALSE;
 }
 
 static gboolean
 gdk_event_translate (GdkEvent *event,
                      NSEvent  *nsevent)
 {
+  NSEventType event_type;
   NSWindow *nswindow;
   GdkWindow *window;
   int x, y;
+  int x_root, y_root;
   gboolean return_val;
 
   /* There is no support for real desktop wide grabs, so we break
    * grabs when the application loses focus (gets deactivated).
    */
-  if ([nsevent type] == NSAppKitDefined)
+  event_type = [nsevent type];
+  if (event_type == NSAppKitDefined)
     {
       if ([nsevent subtype] == NSApplicationDeactivatedEventType)
-        break_all_grabs ();
+        break_all_grabs (get_time_from_ns_event (nsevent));
 
       /* This could potentially be used to break grabs when clicking
        * on the title. The subtype 20 is undocumented so it's probably
        * not a good idea: else if (subtype == 20) break_all_grabs ();
        */
-    }
 
-  /* Handle our generated "fake" crossing events. */
-  if ([nsevent type] == NSApplicationDefined &&
-      [nsevent subtype] == GDK_QUARTZ_EVENT_SUBTYPE_FAKE_CROSSING)
-    {
-      /* FIXME: This needs to actually fill in the event we have... */
-      _gdk_quartz_events_trigger_crossing_events (FALSE);
-      return FALSE; /* ...and return TRUE instead. */
-    }
-
-  /* Keep track of button state, since we don't get that information
-   * for key events. 
-   */
-  switch ([nsevent type])
-    {
-    case NSLeftMouseDown:
-    case NSRightMouseDown:
-    case NSOtherMouseDown:
-      current_button_state |= get_mouse_button_modifiers_from_ns_event (nsevent);
-      break;
-    case NSLeftMouseUp:
-    case NSRightMouseUp:
-    case NSOtherMouseUp:
-      current_button_state &= ~get_mouse_button_modifiers_from_ns_event (nsevent);
-      break;
-    default:
-      break;
+      /* Leave all AppKit events to AppKit. */
+      return FALSE;
     }
 
   if (_gdk_default_filters)
@@ -1455,7 +1190,7 @@ gdk_event_translate (GdkEvent *event,
       /* Apply global filters */
       GdkFilterReturn result;
 
-      result = gdk_event_apply_filters (nsevent, event, _gdk_default_filters);
+      result = gdk_event_apply_filters (nsevent, event, &_gdk_default_filters);
       if (result != GDK_FILTER_CONTINUE)
         {
           return_val = (result == GDK_FILTER_TRANSLATE) ? TRUE : FALSE;
@@ -1465,38 +1200,64 @@ gdk_event_translate (GdkEvent *event,
 
   nswindow = [nsevent window];
 
-  /* Ignore events for no window or ones not created by GDK. */
-  if (!nswindow || ![[nswindow contentView] isKindOfClass:[GdkQuartzView class]])
+  /* Ignore events for windows not created by GDK. */
+  if (nswindow && ![[nswindow contentView] isKindOfClass:[GdkQuartzView class]])
     return FALSE;
 
+  /* Ignore events for ones with no windows */
+  if (!nswindow)
+    {
+      GdkWindow *toplevel = NULL;
+
+      if (event_type == NSMouseMoved)
+        {
+          /* Motion events received after clicking the menu bar do not have the
+           * window field set.  Instead of giving up on the event immediately,
+           * we first check whether this event is within our window bounds.
+           */
+          NSPoint screen_point = [NSEvent mouseLocation];
+          gint x_tmp, y_tmp;
+
+          toplevel = find_toplevel_under_pointer (_gdk_display,
+                                                  screen_point,
+                                                  &x_tmp, &y_tmp);
+        }
+
+      if (!toplevel)
+        return FALSE;
+    }
+
   /* Ignore events and break grabs while the window is being
    * dragged. This is a workaround for the window getting events for
    * the window title.
    */
-  if ([(GdkQuartzWindow *)nswindow isInMove])
+  if ([(GdkQuartzNSWindow *)nswindow isInMove])
     {
-      break_all_grabs ();
+      break_all_grabs (get_time_from_ns_event (nsevent));
       return FALSE;
     }
 
   /* Find the right GDK window to send the event to, taking grabs and
    * event masks into consideration.
    */
-  window = find_window_for_ns_event (nsevent, &x, &y);
+  window = find_window_for_ns_event (nsevent, &x, &y, &x_root, &y_root);
   if (!window)
     return FALSE;
 
+  /* Quartz handles resizing on its own, so we want to stay out of the way. */
+  if (test_resize (nsevent, window, x, y))
+    return FALSE;
+
   /* Apply any window filters. */
   if (GDK_IS_WINDOW (window))
     {
-      GdkWindowObject *filter_private = (GdkWindowObject *) window;
       GdkFilterReturn result;
 
-      if (filter_private->filters)
+      if (window->filters)
        {
          g_object_ref (window);
 
-         result = gdk_event_apply_filters (nsevent, event, filter_private->filters);
+         result = gdk_event_apply_filters (nsevent, event, &window->filters);
 
          g_object_unref (window);
 
@@ -1508,61 +1269,51 @@ gdk_event_translate (GdkEvent *event,
        }
     }
 
-  /* We only activate the application on click if it's not already active,
-   * this matches most use cases of native apps (no click-through).
+  /* If the app is not active leave the event to AppKit so the window gets
+   * focused correctly and don't do click-through (so we behave like most
+   * native apps). If the app is active, we focus the window and then handle
+   * the event, also to match native apps.
    */
-  if (([nsevent type] == NSRightMouseDown ||
-       [nsevent type] == NSOtherMouseDown ||
-       [nsevent type] == NSLeftMouseDown) && ![NSApp isActive])
+  if ((event_type == NSRightMouseDown ||
+       event_type == NSOtherMouseDown ||
+       event_type == NSLeftMouseDown))
     {
-      [NSApp activateIgnoringOtherApps:YES];
-      return_val = FALSE;
-      goto done;
-    }
+      GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl);
 
-  current_event_mask = get_event_mask_from_ns_event (nsevent);
+      if (![NSApp isActive])
+        {
+          [NSApp activateIgnoringOtherApps:YES];
+          return FALSE;
+        }
+      else if (![impl->toplevel isKeyWindow])
+        {
+          GdkDeviceGrabInfo *grab;
+
+          grab = _gdk_display_get_last_device_grab (_gdk_display,
+                                                    _gdk_display->core_pointer);
+          if (!grab)
+            [impl->toplevel makeKeyWindow];
+        }
+    }
 
   return_val = TRUE;
 
-  switch ([nsevent type])
+  switch (event_type)
     {
     case NSLeftMouseDown:
     case NSRightMouseDown:
     case NSOtherMouseDown:
-      {
-       GdkEventMask event_mask;
-
-       /* Emulate implicit grab, when the window has both PRESS and RELEASE
-        * in its mask, like X.
-        */
-       event_mask = (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
-       if (0 && !_gdk_quartz_pointer_grab_window && /* FIXME: add back for grabs? */
-           (GDK_WINDOW_OBJECT (window)->event_mask & event_mask) == event_mask)
-         {
-           pointer_grab_internal (window, FALSE,
-                                  GDK_WINDOW_OBJECT (window)->event_mask,
-                                  NULL, NULL, TRUE);
-         }
-      }
-      
-      fill_button_event (window, event, nsevent, x, y);
-      break;
-
     case NSLeftMouseUp:
     case NSRightMouseUp:
     case NSOtherMouseUp:
-      fill_button_event (window, event, nsevent, x, y);
-      
-      /* Ungrab implicit grab */
-      if (0 && _gdk_quartz_pointer_grab_window && pointer_grab_implicit) /* FIXME: add back? */
-       pointer_ungrab_internal (TRUE);
+      fill_button_event (window, event, nsevent, x, y, x_root, y_root);
       break;
 
     case NSLeftMouseDragged:
     case NSRightMouseDragged:
     case NSOtherMouseDragged:
     case NSMouseMoved:
-      fill_motion_event (window, event, nsevent, x, y);
+      fill_motion_event (window, event, nsevent, x, y, x_root, y_root);
       break;
 
     case NSScrollWheel:
@@ -1578,7 +1329,7 @@ gdk_event_translate (GdkEvent *event,
             else
               direction = GDK_SCROLL_UP;
 
-            fill_scroll_event (window, event, nsevent, x, y, direction);
+            fill_scroll_event (window, event, nsevent, x, y, x_root, y_root, direction);
           }
 
         if (dx != 0)
@@ -1588,14 +1339,14 @@ gdk_event_translate (GdkEvent *event,
             else
               direction = GDK_SCROLL_LEFT;
 
-            fill_scroll_event (window, event, nsevent, x, y, direction);
+            fill_scroll_event (window, event, nsevent, x, y, x_root, y_root, direction);
           }
       }
       break;
 
     case NSMouseEntered:
     case NSMouseExited:
-      return_val = synthesize_crossing_event (window, event, nsevent, x, y);
+      return_val = synthesize_crossing_event (window, event, nsevent, x, y, x_root, y_root);
       break;
 
     case NSKeyDown:
@@ -1639,7 +1390,7 @@ gdk_event_translate (GdkEvent *event,
 }
 
 void
-_gdk_events_queue (GdkDisplay *display)
+_gdk_quartz_display_queue_events (GdkDisplay *display)
 {  
   NSEvent *nsevent;
 
@@ -1661,7 +1412,7 @@ _gdk_events_queue (GdkDisplay *display)
       if (gdk_event_translate (event, nsevent))
         {
          ((GdkEventPrivate *)event)->flags &= ~GDK_EVENT_PENDING;
-          _gdk_windowing_got_event (display, node, event);
+          _gdk_windowing_got_event (display, node, event, 0);
         }
       else
         {
@@ -1679,60 +1430,16 @@ _gdk_events_queue (GdkDisplay *display)
 }
 
 void
-gdk_flush (void)
-{
-  /* Not supported. */
-}
-
-void
-gdk_display_add_client_message_filter (GdkDisplay   *display,
-                                      GdkAtom       message_type,
-                                      GdkFilterFunc func,
-                                      gpointer      data)
-{
-  /* Not supported. */
-}
-
-void
-gdk_add_client_message_filter (GdkAtom       message_type,
-                              GdkFilterFunc func,
-                              gpointer      data)
-{
-  /* Not supported. */
-}
-
-void
-gdk_display_sync (GdkDisplay *display)
-{
-  /* Not supported. */
-}
-
-void
-gdk_display_flush (GdkDisplay *display)
-{
-  /* Not supported. */
-}
-
-gboolean
-gdk_event_send_client_message_for_display (GdkDisplay      *display,
-                                          GdkEvent        *event,
-                                          GdkNativeWindow  winid)
-{
-  /* Not supported. */
-  return FALSE;
-}
-
-void
-gdk_screen_broadcast_client_message (GdkScreen *screen,
-                                    GdkEvent  *event)
+_gdk_quartz_screen_broadcast_client_message (GdkScreen *screen,
+                                             GdkEvent  *event)
 {
   /* Not supported. */
 }
 
 gboolean
-gdk_screen_get_setting (GdkScreen   *screen,
-                       const gchar *name,
-                       GValue      *value)
+_gdk_quartz_screen_get_setting (GdkScreen   *screen,
+                                const gchar *name,
+                                GValue      *value)
 {
   if (strcmp (name, "gtk-double-click-time") == 0)
     {
@@ -1789,8 +1496,9 @@ gdk_screen_get_setting (GdkScreen   *screen,
 }
 
 void
-_gdk_windowing_event_data_copy (const GdkEvent *src,
-                                GdkEvent       *dst)
+_gdk_quartz_display_event_data_copy (GdkDisplay     *display,
+                                     const GdkEvent *src,
+                                     GdkEvent       *dst)
 {
   GdkEventPrivate *priv_src = (GdkEventPrivate *) src;
   GdkEventPrivate *priv_dst = (GdkEventPrivate *) dst;
@@ -1803,7 +1511,8 @@ _gdk_windowing_event_data_copy (const GdkEvent *src,
 }
 
 void
-_gdk_windowing_event_data_free (GdkEvent *event)
+_gdk_quartz_display_event_data_free (GdkDisplay *display,
+                                     GdkEvent   *event)
 {
   GdkEventPrivate *priv = (GdkEventPrivate *) event;