]> Pileus Git - ~andy/gtk/blobdiff - gdk/win32/gdkevents-win32.c
gdk/win32/gdkevents-win32.c: Fix build
[~andy/gtk] / gdk / win32 / gdkevents-win32.c
index f3a95953ba4c20af0986e08983eb61966a233eb8..afa20742d805339b4a9577d023a282ae14751174 100644 (file)
@@ -1,7 +1,8 @@
 /* GDK - The GIMP Drawing Kit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  * Copyright (C) 1998-2002 Tor Lillqvist
- * Copyright (C) 2007-2008 Cody Russell
+ * Copyright (C) 2001,2009 Hans Breuer
+ * Copyright (C) 2007-2009 Cody Russell
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -14,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 <glib/gprintf.h>
 
 #include "gdk.h"
+#include "gdkdisplayprivate.h"
 #include "gdkprivate-win32.h"
-#include "gdkinput-win32.h"
+#include "gdkwin32.h"
 #include "gdkkeysyms.h"
+#include "gdkdevicemanager-win32.h"
+#include "gdkdeviceprivate.h"
+#include "gdkdevice-wintab.h"
+#include "gdkwin32dnd.h"
+#include "gdkdndprivate.h"
 
 #include <windowsx.h>
 
 #define MK_XBUTTON2 64
 #endif
 
+/* Undefined flags: */
+#define SWP_NOCLIENTSIZE 0x0800
+#define SWP_NOCLIENTMOVE 0x1000
+#define SWP_STATECHANGED 0x8000
 /* 
  * Private function declarations
  */
 
+#define SYNAPSIS_ICON_WINDOW_CLASS "SynTrackCursorWindowClass"
+
 static gboolean gdk_event_translate (MSG        *msg,
                                     gint       *ret_valp);
 static void     handle_wm_paint     (MSG        *msg,
@@ -93,28 +104,13 @@ static gboolean gdk_event_dispatch (GSource     *source,
                                    GSourceFunc  callback,
                                    gpointer     user_data);
 
-static void append_event (GdkEvent *event);
-static gboolean is_modally_blocked (GdkWindow   *window);
-
 /* Private variable declarations
  */
 
-static GdkWindow *p_grab_window = NULL; /* Window that currently holds
-                                        * the pointer grab
-                                        */
-
-static GdkWindow *p_grab_confine_to = NULL;
-
-static GdkWindow *k_grab_window = NULL; /* Window the holds the
-                                        * keyboard grab
-                                        */
-
 static GList *client_filters;  /* Filters for client messages */
+extern gint       _gdk_input_ignore_core;
 
-static gboolean p_grab_automatic;
-static GdkEventMask p_grab_mask;
-static gboolean p_grab_owner_events, k_grab_owner_events;
-static HCURSOR p_grab_cursor;
+HCURSOR _gdk_win32_grab_cursor;
 
 static GSourceFuncs event_funcs = {
   gdk_event_prepare,
@@ -125,7 +121,8 @@ static GSourceFuncs event_funcs = {
 
 GPollFD event_poll_fd;
 
-static GdkWindow *current_window = NULL;
+static GdkWindow *mouse_window = NULL;
+static GdkWindow *mouse_window_ignored_leave = NULL;
 static gint current_x, current_y;
 static gint current_root_x, current_root_y;
 static UINT client_message;
@@ -138,7 +135,8 @@ static HKL latin_locale = NULL;
 #endif
 
 static gboolean in_ime_composition = FALSE;
-static UINT     resize_timer;
+static UINT     modal_timer;
+static UINT     sync_timer = 0;
 
 static int debug_indent = 0;
 
@@ -160,40 +158,19 @@ static void
 track_mouse_event (DWORD dwFlags,
                   HWND  hwnd)
 {
-  typedef BOOL (WINAPI *PFN_TrackMouseEvent) (LPTRACKMOUSEEVENT);
-  static PFN_TrackMouseEvent p_TrackMouseEvent = NULL;
-  static gboolean once = FALSE;
-
-  if (!once)
-    {
-      HMODULE user32;
-      HINSTANCE commctrl32;
+  TRACKMOUSEEVENT tme;
 
-      user32 = GetModuleHandle ("user32.dll");
-      if ((p_TrackMouseEvent = (PFN_TrackMouseEvent)GetProcAddress (user32, "TrackMouseEvent")) == NULL)
-        {
-          if ((commctrl32 = LoadLibrary ("commctrl32.dll")) != NULL)
-           p_TrackMouseEvent = (PFN_TrackMouseEvent)
-             GetProcAddress (commctrl32, "_TrackMouseEvent");
-        }
-      once = TRUE;
-    }
+  tme.cbSize = sizeof(TRACKMOUSEEVENT);
+  tme.dwFlags = dwFlags;
+  tme.hwndTrack = hwnd;
+  tme.dwHoverTime = HOVER_DEFAULT; /* not used */
 
-  if (p_TrackMouseEvent)
-    {
-      TRACKMOUSEEVENT tme;
-      tme.cbSize = sizeof(TRACKMOUSEEVENT);
-      tme.dwFlags = dwFlags;
-      tme.hwndTrack = hwnd;
-      tme.dwHoverTime = HOVER_DEFAULT; /* not used */
-
-      if (!p_TrackMouseEvent (&tme))
-        WIN32_API_FAILED ("TrackMouseEvent");
-      else if (dwFlags == TME_LEAVE)
-        GDK_NOTE (EVENTS, g_print(" (TrackMouseEvent %p)", hwnd));
-      else if (dwFlags == TME_CANCEL)
-       GDK_NOTE (EVENTS, g_print(" (cancel TrackMouseEvent %p)", hwnd));
-    }
+  if (!TrackMouseEvent (&tme))
+    WIN32_API_FAILED ("TrackMouseEvent");
+  else if (dwFlags == TME_LEAVE)
+    GDK_NOTE (EVENTS, g_print(" (TrackMouseEvent %p)", hwnd));
+  else if (dwFlags == TME_CANCEL)
+    GDK_NOTE (EVENTS, g_print(" (cancel TrackMouseEvent %p)", hwnd));
 }
 
 gulong
@@ -210,32 +187,56 @@ _gdk_win32_get_next_tick (gulong suggested_tick)
 }
 
 static void
-generate_focus_event (GdkWindow *window,
-                     gboolean   in)
+generate_focus_event (GdkDeviceManager *device_manager,
+                      GdkWindow        *window,
+                      gboolean          in)
 {
+  GdkDevice *device;
+  GdkDevice *source_device;
   GdkEvent *event;
 
+  device = GDK_DEVICE_MANAGER_WIN32 (device_manager)->core_keyboard;
+  source_device = GDK_DEVICE_MANAGER_WIN32 (device_manager)->system_keyboard;
+
   event = gdk_event_new (GDK_FOCUS_CHANGE);
   event->focus_change.window = window;
   event->focus_change.in = in;
+  gdk_event_set_device (event, device);
+  gdk_event_set_source_device (event, source_device);
 
-  append_event (event);
+  _gdk_win32_append_event (event);
 }
 
 static void
-generate_grab_broken_event (GdkWindow *window,
-                           gboolean   keyboard,
-                           GdkWindow *grab_window)
+generate_grab_broken_event (GdkDeviceManager *device_manager,
+                            GdkWindow        *window,
+                            gboolean          keyboard,
+                            GdkWindow        *grab_window)
 {
   GdkEvent *event = gdk_event_new (GDK_GRAB_BROKEN);
+  GdkDevice *device;
+  GdkDevice *source_device;
+
+  if (keyboard)
+    {
+      device = GDK_DEVICE_MANAGER_WIN32 (device_manager)->core_keyboard;
+      source_device = GDK_DEVICE_MANAGER_WIN32 (device_manager)->system_keyboard;
+    }
+  else
+    {
+      device = GDK_DEVICE_MANAGER_WIN32 (device_manager)->core_pointer;
+      source_device = GDK_DEVICE_MANAGER_WIN32 (device_manager)->system_pointer;
+    }
 
   event->grab_broken.window = window;
   event->grab_broken.send_event = 0;
   event->grab_broken.keyboard = keyboard;
   event->grab_broken.implicit = FALSE;
   event->grab_broken.grab_window = grab_window;
-         
-  append_event (event);
+  gdk_event_set_device (event, device);
+  gdk_event_set_source_device (event, device);
+
+  _gdk_win32_append_event (event);
 }
 
 static LRESULT 
@@ -291,8 +292,7 @@ _gdk_win32_window_procedure (HWND   hwnd,
   retval = inner_window_procedure (hwnd, message, wparam, lparam);
   debug_indent -= 2;
 
-  GDK_NOTE (EVENTS, g_print (" => %ld%s",
-                            retval, (debug_indent == 0 ? "\n" : "")));
+  GDK_NOTE (EVENTS, g_print (" => %I64d%s", (gint64) retval, (debug_indent == 0 ? "\n" : "")));
 
   return retval;
 }
@@ -389,6 +389,7 @@ _gdk_events_init (void)
 #endif
 
   source = g_source_new (&event_funcs, sizeof (GSource));
+  g_source_set_name (source, "GDK Win32 event source"); 
   g_source_set_priority (source, GDK_PRIORITY_EVENTS);
 
 #ifdef G_WITH_CYGWIN
@@ -406,37 +407,14 @@ _gdk_events_init (void)
 }
 
 gboolean
-gdk_events_pending (void)
+_gdk_win32_display_has_pending (GdkDisplay *display)
 {
-  MSG msg;
-  return (_gdk_event_queue_find_first (_gdk_display) ||
+  return (_gdk_event_queue_find_first (display) ||
          (modal_win32_dialog == NULL &&
-          PeekMessageW (&msg, NULL, 0, 0, PM_NOREMOVE)));
+          GetQueueStatus (QS_ALLINPUT) != 0));
 }
 
-GdkEvent*
-gdk_event_get_graphics_expose (GdkWindow *window)
-{
-  MSG msg;
-  GdkEvent *event = NULL;
-
-  g_return_val_if_fail (window != NULL, NULL);
-  
-  GDK_NOTE (EVENTS, g_print ("gdk_event_get_graphics_expose\n"));
-
-  if (PeekMessageW (&msg, GDK_WINDOW_HWND (window), WM_PAINT, WM_PAINT, PM_REMOVE))
-    {
-      handle_wm_paint (&msg, window, TRUE, &event);
-      if (event != NULL)
-       {
-         GDK_NOTE (EVENTS, g_print ("gdk_event_get_graphics_expose: got it!\n"));
-         return event;
-       }
-    }
-  
-  GDK_NOTE (EVENTS, g_print ("gdk_event_get_graphics_expose: nope\n"));
-  return NULL; 
-}
+#if 0 /* Unused, but might be useful to re-introduce in some debugging output? */
 
 static char *
 event_mask_string (GdkEventMask mask)
@@ -474,352 +452,53 @@ event_mask_string (GdkEventMask mask)
   return bfr;
 }
 
-GdkGrabStatus
-gdk_pointer_grab (GdkWindow    *window,
-                 gboolean      owner_events,
-                 GdkEventMask  event_mask,
-                 GdkWindow    *confine_to,
-                 GdkCursor    *cursor,
-                 guint32       time)
-{
-  HCURSOR hcursor;
-  GdkCursorPrivate *cursor_private;
-  gint return_val = GDK_GRAB_SUCCESS;
-
-  g_return_val_if_fail (window != NULL, 0);
-  g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
-  g_return_val_if_fail (confine_to == NULL || GDK_IS_WINDOW (confine_to), 0);
-  
-  cursor_private = (GdkCursorPrivate*) cursor;
-  
-  if (!cursor)
-    hcursor = NULL;
-  else if ((hcursor = CopyCursor (cursor_private->hcursor)) == NULL)
-    WIN32_API_FAILED ("CopyCursor");
-
-  return_val = _gdk_input_grab_pointer (window,
-                                       owner_events,
-                                       event_mask,
-                                       confine_to,
-                                       time);
-
-  if (return_val == GDK_GRAB_SUCCESS)
-    {
-      if (!GDK_WINDOW_DESTROYED (window))
-       {
-         GDK_NOTE (EVENTS, g_print ("%sgdk_pointer_grab: %p %s %p %s%s",
-                                    (debug_indent > 0 ? "\n" : ""),
-                                    GDK_WINDOW_HWND (window),
-                                    (owner_events ? "TRUE" : "FALSE"),
-                                    hcursor,
-                                    event_mask_string (event_mask),
-                                    (debug_indent == 0 ? "\n" : "")));
-
-         p_grab_mask = event_mask;
-         p_grab_owner_events = owner_events;
-         p_grab_automatic = FALSE;
-         
-         SetCapture (GDK_WINDOW_HWND (window));
-         return_val = GDK_GRAB_SUCCESS;
-       }
-      else
-       return_val = GDK_GRAB_ALREADY_GRABBED;
-    }
-  
-  if (return_val == GDK_GRAB_SUCCESS)
-    {
-      GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl);
-
-      if (p_grab_window != NULL && p_grab_window != window)
-       generate_grab_broken_event (p_grab_window, FALSE, window);
-      
-      assign_object (&p_grab_window, window);
-
-      if (p_grab_cursor != NULL)
-       {
-         if (GetCursor () == p_grab_cursor)
-           SetCursor (NULL);
-         DestroyCursor (p_grab_cursor);
-       }
-
-      p_grab_cursor = hcursor;
-
-      if (p_grab_cursor != NULL)
-       SetCursor (p_grab_cursor);
-      else if (impl->hcursor != NULL)
-       SetCursor (impl->hcursor);
-      else
-       SetCursor (LoadCursor (NULL, IDC_ARROW));
-
-      if (confine_to != NULL)
-       {
-         gint x, y, width, height;
-         RECT rect;
-
-         gdk_window_get_origin (confine_to, &x, &y);
-         gdk_drawable_get_size (confine_to, &width, &height);
-
-         x -= _gdk_offset_x;
-         y -= _gdk_offset_y;
-
-         rect.left = x;
-         rect.top = y;
-         rect.right = x + width;
-         rect.bottom = y + height;
-         API_CALL (ClipCursor, (&rect));
-         p_grab_confine_to = confine_to;
-       }
-
-      /* FIXME: Generate GDK_CROSSING_GRAB events */
-    }
-  
-  return return_val;
-}
-
-void
-gdk_display_pointer_ungrab (GdkDisplay *display,
-                            guint32     time)
-{
-  g_return_if_fail (display == _gdk_display);
-
-  GDK_NOTE (EVENTS, g_print ("%sgdk_display_pointer_ungrab%s",
-                            (debug_indent > 0 ? "\n" : ""),
-                            (debug_indent == 0 ? "\n" : "")));
-
-  _gdk_input_ungrab_pointer (time);
-
-  if (GetCapture () != NULL)
-    ReleaseCapture ();
-
-  /* FIXME: Generate GDK_CROSSING_UNGRAB events */
-
-  assign_object (&p_grab_window, NULL);
-  if (p_grab_cursor != NULL)
-    {
-      if (GetCursor () == p_grab_cursor)
-       SetCursor (NULL);
-      DestroyCursor (p_grab_cursor);
-      p_grab_cursor = NULL;
-    }
-
-  if (p_grab_confine_to != NULL)
-    {
-      API_CALL (ClipCursor, (NULL));
-      p_grab_confine_to = NULL;
-    }
-}
+#endif
 
 static GdkWindow *
-find_real_window_for_grabbed_mouse_event (GdkWindow* reported_window,
-                                         MSG*       msg)
-{
-  HWND hwnd;
-  POINTS points;
-  POINT pt;
-  GdkWindow* other_window = NULL;
-
-  points = MAKEPOINTS (msg->lParam);
-  pt.x = points.x;
-  pt.y = points.y;
-  ClientToScreen (msg->hwnd, &pt);
-
-  hwnd = WindowFromPoint (pt);
-
-  if (hwnd != NULL)
-    {
-      RECT rect;
-
-      GetClientRect (hwnd, &rect);
-      ScreenToClient (hwnd, &pt);
-      if (!PtInRect (&rect, pt))
-       return _gdk_root;
-
-      other_window = gdk_win32_handle_table_lookup ((GdkNativeWindow) hwnd);
-    }
-
-  if (other_window == NULL)
-    return _gdk_root;
-
-  return other_window;
-}
-
-static GdkWindow* 
 find_window_for_mouse_event (GdkWindow* reported_window,
                             MSG*       msg)
 {
-  if (p_grab_window == NULL || !p_grab_owner_events)
-    return reported_window;
-  else
-    return find_real_window_for_grabbed_mouse_event (reported_window, msg);
-}
-
-gboolean
-gdk_display_pointer_is_grabbed (GdkDisplay *display)
-{
-  g_return_val_if_fail (display == _gdk_display, FALSE);
-  GDK_NOTE (EVENTS, g_print ("gdk_pointer_is_grabbed: %s\n",
-                            p_grab_window != NULL ? "TRUE" : "FALSE"));
-  return p_grab_window != NULL;
-}
-
-gboolean
-gdk_pointer_grab_info_libgtk_only (GdkDisplay *display,
-                                  GdkWindow **grab_window,
-                                  gboolean   *owner_events)
-{
-  g_return_val_if_fail (display == _gdk_display, FALSE);
-
-  if (p_grab_window != NULL)
-    {
-      if (grab_window)
-        *grab_window = p_grab_window;
-      if (owner_events)
-        *owner_events = p_grab_owner_events;
+  POINT pt;
+  GdkDeviceManagerWin32 *device_manager;
+  GdkWindow *event_window;
+  HWND hwnd;
+  RECT rect;
+  GdkDeviceGrabInfo *grab;
 
-      return TRUE;
-    }
-  else
-    return FALSE;
-}
+  device_manager = GDK_DEVICE_MANAGER_WIN32 (gdk_display_get_device_manager (_gdk_display));
 
-GdkGrabStatus
-gdk_keyboard_grab (GdkWindow *window,
-                  gboolean   owner_events,
-                  guint32    time)
-{
-  GdkWindow *real_focus_window, *grab_focus_window;
+  grab = _gdk_display_get_last_device_grab (_gdk_display, device_manager->core_pointer);
+  if (grab == NULL)
+    return reported_window;
 
-  gint return_val;
-  
-  g_return_val_if_fail (window != NULL, 0);
-  g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
-  
-  GDK_NOTE (EVENTS, g_print ("gdk_keyboard_grab %p\n",
-                            GDK_WINDOW_HWND (window)));
+  pt = msg->pt;
 
-  if (!GDK_WINDOW_DESTROYED (window))
-    {
-      k_grab_owner_events = owner_events != 0;
-      return_val = GDK_GRAB_SUCCESS;
-    }
+  if (!grab->owner_events)
+    event_window = grab->native_window;
   else
-    return_val = GDK_GRAB_ALREADY_GRABBED;
-
-  if (return_val == GDK_GRAB_SUCCESS)
     {
-      if (k_grab_window != NULL && k_grab_window != window)
-       generate_grab_broken_event (k_grab_window, TRUE, window);
-
-      assign_object (&k_grab_window, window);
-
-      if (!k_grab_owner_events)
+      event_window = NULL;
+      hwnd = WindowFromPoint (pt);
+      if (hwnd != NULL)
        {
-         real_focus_window = gdk_win32_handle_table_lookup ((GdkNativeWindow) GetFocus ());
-         if (real_focus_window)
-           real_focus_window = gdk_window_get_toplevel (real_focus_window);
-         grab_focus_window = gdk_window_get_toplevel (k_grab_window);
-         if (real_focus_window != grab_focus_window)
-           {
-             /* Generate events for focus change from the window that really
-              * has focus to the grabber.
-              */
-             if (real_focus_window && !GDK_WINDOW_DESTROYED (real_focus_window)
-                 && (((GdkWindowObject *) real_focus_window)->event_mask
-                     & GDK_FOCUS_CHANGE_MASK))
-               generate_focus_event (real_focus_window, FALSE);
-
-             if (((GdkWindowObject *) grab_focus_window)->event_mask 
-                 & GDK_FOCUS_CHANGE_MASK)
-               generate_focus_event (grab_focus_window, TRUE);
-           }
-       }
-    }
-  
-  return return_val;
-}
-
-void
-gdk_display_keyboard_ungrab (GdkDisplay *display,
-                             guint32 time)
-{
-  GdkWindow *real_focus_window, *grab_focus_window;
-
-  g_return_if_fail (display == _gdk_display);
+         POINT client_pt = pt;
 
-  GDK_NOTE (EVENTS, g_print ("gdk_keyboard_ungrab\n"));
-
-  if (k_grab_window && !k_grab_owner_events)
-    {
-      real_focus_window = gdk_win32_handle_table_lookup ((GdkNativeWindow) GetFocus ());
-      if (real_focus_window)
-       real_focus_window = gdk_window_get_toplevel (real_focus_window);
-      if (!GDK_WINDOW_DESTROYED (k_grab_window))
-       grab_focus_window = gdk_window_get_toplevel (k_grab_window);
-      else
-       grab_focus_window = NULL;
-      if (real_focus_window != grab_focus_window)
-       {
-         /* Generate events for focus change from grabber to the window that
-          * really has focus. Important for example if a new window is created
-          * while focus is grabbed.
-          */
-         if (grab_focus_window
-             && (((GdkWindowObject *) grab_focus_window)->event_mask
-                 & GDK_FOCUS_CHANGE_MASK))
-           generate_focus_event (grab_focus_window, FALSE);
-
-         if (real_focus_window && !GDK_WINDOW_DESTROYED (real_focus_window)
-             && (((GdkWindowObject *) real_focus_window)->event_mask
-                 & GDK_FOCUS_CHANGE_MASK))
-           generate_focus_event (real_focus_window, TRUE);
+         ScreenToClient (hwnd, &client_pt);
+         GetClientRect (hwnd, &rect);
+         if (PtInRect (&rect, client_pt))
+           event_window = gdk_win32_handle_table_lookup (hwnd);
        }
+      if (event_window == NULL)
+       event_window = grab->native_window;
     }
 
-  assign_object (&k_grab_window, NULL);
-}
-
-gboolean
-gdk_keyboard_grab_info_libgtk_only (GdkDisplay *display,
-                                   GdkWindow **grab_window,
-                                   gboolean   *owner_events)
-{
-  g_return_val_if_fail (display == _gdk_display, FALSE);
-
-  if (k_grab_window)
-    {
-      if (grab_window)
-        *grab_window = k_grab_window;
-      if (owner_events)
-        *owner_events = k_grab_owner_events;
-
-      return TRUE;
-    }
-  else
-    return FALSE;
-}
-
-void 
-gdk_display_add_client_message_filter (GdkDisplay   *display,
-                                      GdkAtom       message_type,
-                                      GdkFilterFunc func,
-                                      gpointer      data)
-{
-  /* XXX */
-  gdk_add_client_message_filter (message_type, func, data);
-}
+  /* need to also adjust the coordinates to the new window */
+  ScreenToClient (GDK_WINDOW_HWND (event_window), &pt);
 
-void 
-gdk_add_client_message_filter (GdkAtom       message_type,
-                              GdkFilterFunc func,
-                              gpointer      data)
-{
-  GdkClientFilter *filter = g_new (GdkClientFilter, 1);
+  /* ATTENTION: need to update client coords */
+  msg->lParam = MAKELPARAM (pt.x, pt.y);
 
-  filter->type = message_type;
-  filter->function = func;
-  filter->data = data;
-  
-  client_filters = g_list_append (client_filters, filter);
+  return event_window;
 }
 
 static void
@@ -951,10 +630,11 @@ print_event_state (guint state)
 #undef CASE
 }
 
-static void
-print_event (GdkEvent *event)
+void
+_gdk_win32_print_event (const GdkEvent *event)
 {
   gchar *escaped, *kvname;
+  gchar *selection_name, *target_name, *property_name;
 
   g_print ("%s%*s===> ", (debug_indent > 0 ? "\n" : ""), debug_indent, "");
   switch (event->any.type)
@@ -991,7 +671,6 @@ print_event (GdkEvent *event)
     CASE (GDK_DROP_FINISHED);
     CASE (GDK_CLIENT_EVENT);
     CASE (GDK_VISIBILITY_NOTIFY);
-    CASE (GDK_NO_EXPOSE);
     CASE (GDK_SCROLL);
     CASE (GDK_WINDOW_STATE);
     CASE (GDK_SETTING);
@@ -1001,7 +680,7 @@ print_event (GdkEvent *event)
     default: g_assert_not_reached ();
     }
 
-  g_print (" %p ", GDK_WINDOW_HWND (event->any.window));
+  g_print (" %p ", event->any.window ? GDK_WINDOW_HWND (event->any.window) : NULL);
 
   switch (event->any.type)
     {
@@ -1070,6 +749,35 @@ print_event (GdkEvent *event)
               event->configure.x, event->configure.y,
               event->configure.width, event->configure.height);
       break;
+    case GDK_SELECTION_CLEAR:
+    case GDK_SELECTION_REQUEST:
+    case GDK_SELECTION_NOTIFY:
+      selection_name = gdk_atom_name (event->selection.selection);
+      target_name = gdk_atom_name (event->selection.target);
+      property_name = gdk_atom_name (event->selection.property);
+      g_print ("sel:%s tgt:%s prop:%s",
+              selection_name, target_name, property_name);
+      g_free (selection_name);
+      g_free (target_name);
+      g_free (property_name);
+      break;
+    case GDK_DRAG_ENTER:
+    case GDK_DRAG_LEAVE:
+    case GDK_DRAG_MOTION:
+    case GDK_DRAG_STATUS:
+    case GDK_DROP_START:
+    case GDK_DROP_FINISHED:
+      if (event->dnd.context != NULL)
+       g_print ("ctx:%p: %s %s src:%p dest:%p",
+                event->dnd.context,
+                _gdk_win32_drag_protocol_to_string (event->dnd.context->protocol),
+                event->dnd.context->is_source ? "SOURCE" : "DEST",
+                event->dnd.context->source_window == NULL ? NULL : GDK_WINDOW_HWND (event->dnd.context->source_window),
+                event->dnd.context->dest_window == NULL ? NULL : GDK_WINDOW_HWND (event->dnd.context->dest_window));
+      break;
+    case GDK_CLIENT_EVENT:
+      /* no more GdkEventClient */
+      break;
     case GDK_SCROLL:
       g_print ("(%.4g,%.4g) (%.4g,%.4g) %s ",
               event->scroll.x, event->scroll.y,
@@ -1134,15 +842,32 @@ fixup_event (GdkEvent *event)
        (event->any.type == GDK_LEAVE_NOTIFY)) &&
       (event->crossing.subwindow != NULL))
     g_object_ref (event->crossing.subwindow);
+  if (((event->any.type == GDK_SELECTION_CLEAR) ||
+       (event->any.type == GDK_SELECTION_NOTIFY) ||
+       (event->any.type == GDK_SELECTION_REQUEST)) &&
+      (event->selection.requestor != NULL))
+    g_object_ref (event->selection.requestor);
+  if ((event->any.type == GDK_OWNER_CHANGE) &&
+      (event->owner_change.owner != NULL))
+    g_object_ref (event->owner_change.owner);
   event->any.send_event = InSendMessage (); 
 }
 
-static void
-append_event (GdkEvent *event)
+void
+_gdk_win32_append_event (GdkEvent *event)
 {
+  GList *link;
+  
   fixup_event (event);
+#if 1
+  link = _gdk_event_queue_append (_gdk_display, event);
+  GDK_NOTE (EVENTS, _gdk_win32_print_event (event));
+  /* event morphing, the passed in may not be valid afterwards */
+  _gdk_windowing_got_event (_gdk_display, link, event, 0);
+#else
   _gdk_event_queue_append (_gdk_display, event);
-  GDK_NOTE (EVENTS, print_event (event));
+  GDK_NOTE (EVENTS, _gdk_win32_print_event (event));
+#endif
 }
 
 static void
@@ -1156,7 +881,7 @@ fill_key_event_string (GdkEvent *event)
    */
   
   c = 0;
-  if (event->key.keyval != GDK_VoidSymbol)
+  if (event->key.keyval != GDK_KEY_VoidSymbol)
     c = gdk_keyval_to_unicode (event->key.keyval);
 
   if (c)
@@ -1193,13 +918,13 @@ fill_key_event_string (GdkEvent *event)
       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");
@@ -1213,9 +938,9 @@ fill_key_event_string (GdkEvent *event)
 }
 
 static GdkFilterReturn
-apply_filters (GdkWindow  *window,
-              MSG        *msg,
-              GList      *filters)
+apply_event_filters (GdkWindow  *window,
+                    MSG        *msg,
+                    GList     **filters)
 {
   GdkFilterReturn result = GDK_FILTER_CONTINUE;
   GdkEvent *event;
@@ -1233,13 +958,34 @@ apply_filters (GdkWindow  *window,
    */
   node = _gdk_event_queue_append (_gdk_display, event);
   
-  tmp_list = filters;
+  tmp_list = *filters;
   while (tmp_list)
     {
       GdkEventFilter *filter = (GdkEventFilter *) tmp_list->data;
-      
-      tmp_list = tmp_list->next;
+      GList *node;
+
+      if ((filter->flags & GDK_EVENT_FILTER_REMOVED) != 0)
+        {
+          tmp_list = tmp_list->next;
+          continue;
+        }
+
+      filter->ref_count++;
       result = filter->function (msg, event, filter->data);
+
+      /* 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;
+
+      filter->ref_count--;
+      if (filter->ref_count == 0)
+        {
+          *filters = g_list_remove_link (*filters, node);
+          g_list_free_1 (node);
+          g_free (filter);
+        }
+
       if (result !=  GDK_FILTER_CONTINUE)
        break;
     }
@@ -1254,7 +1000,7 @@ apply_filters (GdkWindow  *window,
     {
       ((GdkEventPrivate *)event)->flags &= ~GDK_EVENT_PENDING;
       fixup_event (event);
-      GDK_NOTE (EVENTS, print_event (event));
+      GDK_NOTE (EVENTS, _gdk_win32_print_event (event));
     }
   return result;
 }
@@ -1275,7 +1021,7 @@ apply_filters (GdkWindow  *window,
 static void
 show_window_recurse (GdkWindow *window, gboolean hide_window)
 {
-  GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
+  GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
   GSList *children = impl->transient_children;
   GdkWindow *child = NULL;
 
@@ -1298,9 +1044,16 @@ show_window_recurse (GdkWindow *window, gboolean hide_window)
        {
          if (!hide_window)
            {
-             if (GDK_WINDOW_OBJECT (window)->state & GDK_WINDOW_STATE_ICONIFIED)
+             if (gdk_window_get_state (window) & GDK_WINDOW_STATE_ICONIFIED)
                {
-                 ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE);
+                 if (gdk_window_get_state (window) & GDK_WINDOW_STATE_MAXIMIZED)
+                   {
+                     ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWMAXIMIZED);
+                   }
+                 else
+                   {
+                     ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE);
+                   }
                }
            }
          else
@@ -1314,10 +1067,10 @@ show_window_recurse (GdkWindow *window, gboolean hide_window)
 }
 
 static void
-show_window_internal (GdkWindow *window, gboolean hide_window)
+do_show_window (GdkWindow *window, gboolean hide_window)
 {
   GdkWindow *tmp_window = NULL;
-  GdkWindowImplWin32 *tmp_impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
+  GdkWindowImplWin32 *tmp_impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
 
   if (!tmp_impl->changing_state)
     {
@@ -1325,7 +1078,7 @@ show_window_internal (GdkWindow *window, gboolean hide_window)
       while (tmp_impl->transient_owner != NULL)
        {
          tmp_window = tmp_impl->transient_owner;
-         tmp_impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (tmp_window)->impl);
+         tmp_impl = GDK_WINDOW_IMPL_WIN32 (tmp_window->impl);
        }
 
       /* If we couldn't find one, use the window provided. */
@@ -1335,334 +1088,239 @@ show_window_internal (GdkWindow *window, gboolean hide_window)
        }
 
       /* Recursively show/hide every window in the chain. */
-      show_window_recurse (tmp_window, hide_window);
+      if (tmp_window != window)
+       {
+         show_window_recurse (tmp_window, hide_window);
+       }
     }
 }
 
-static gboolean
-gdk_window_is_ancestor (GdkWindow *ancestor,
-                       GdkWindow *window)
-{
-  if (ancestor == NULL || window == NULL)
-    return FALSE;
-
-  return (gdk_window_get_parent (window) == ancestor ||
-         gdk_window_is_ancestor (ancestor, gdk_window_get_parent (window)));
-}
-
 static void
-synthesize_enter_or_leave_event (GdkWindow     *window,
-                                MSG            *msg,
-                                GdkEventType    type,
-                                GdkCrossingMode mode,
-                                GdkNotifyType detail,
-                                gint            x,
-                                gint            y)
+send_crossing_event (GdkDisplay                 *display,
+                    GdkWindow                  *window,
+                    GdkEventType                type,
+                    GdkCrossingMode             mode,
+                    GdkNotifyType               notify_type,
+                    GdkWindow                  *subwindow,
+                    POINT                      *screen_pt,
+                    GdkModifierType             mask,
+                    guint32                     time_)
 {
   GdkEvent *event;
-  gint xoffset, yoffset;
-  
-  event = gdk_event_new (type);
-  event->crossing.window = window;
-  event->crossing.subwindow = NULL;
-  event->crossing.time = _gdk_win32_get_next_tick (msg->time);
-  _gdk_windowing_window_get_offsets (window, &xoffset, &yoffset);
-  event->crossing.x = x + xoffset;
-  event->crossing.y = y + yoffset;
-  event->crossing.x_root = msg->pt.x + _gdk_offset_x;
-  event->crossing.y_root = msg->pt.y + _gdk_offset_y;
-  event->crossing.mode = mode;
-  event->crossing.detail = detail;
-  event->crossing.focus = TRUE; /* FIXME: Set correctly */
-  event->crossing.state = 0;   /* FIXME: Set correctly */
-  
-  append_event (event);
-  
-  if (type == GDK_ENTER_NOTIFY &&
-      ((GdkWindowObject *) window)->extension_events != 0)
-    _gdk_input_enter_event (window);
-}
-
-static void
-synthesize_leave_event (GdkWindow      *window,
-                       MSG            *msg,
-                       GdkCrossingMode mode,
-                       GdkNotifyType   detail)
-{
+  GdkDeviceGrabInfo *grab;
+  GdkDeviceManagerWin32 *device_manager;
   POINT pt;
 
-  if (p_grab_window != NULL && !p_grab_owner_events && !(p_grab_mask & GDK_LEAVE_NOTIFY_MASK))
-    return;
-
-  if (!(((GdkWindowObject *) window)->event_mask & GDK_LEAVE_NOTIFY_MASK))
-    return;
+  device_manager = GDK_DEVICE_MANAGER_WIN32 (gdk_display_get_device_manager (display));
 
-  /* Leave events are at (current_x,current_y) in current_window */
+  grab = _gdk_display_has_device_grab (display, device_manager->core_pointer, 0);
 
-  if (current_window != window)
+  if (grab != NULL &&
+      !grab->owner_events &&
+      mode != GDK_CROSSING_UNGRAB)
     {
-      pt.x = current_x;
-      pt.y = current_y;
-      ClientToScreen (GDK_WINDOW_HWND (current_window), &pt);
-      ScreenToClient (GDK_WINDOW_HWND (window), &pt);
-      synthesize_enter_or_leave_event (window, msg, GDK_LEAVE_NOTIFY, mode, detail, pt.x, pt.y);
+      /* !owner_event => only report events wrt grab window, ignore rest */
+      if ((GdkWindow *)window != grab->native_window)
+       return;
     }
-  else
-    synthesize_enter_or_leave_event (window, msg, GDK_LEAVE_NOTIFY, mode, detail, current_x, current_y);
 
-  /* This would only make sense if the WM_MOUSEMOVE messages would come
-   * before the respective WM_MOUSELEAVE message, which apparently they
-   * do not.
-  track_mouse_event (TME_CANCEL, msg->hwnd);
-   */
-}
+  pt = *screen_pt;
+  ScreenToClient (GDK_WINDOW_HWND (window), &pt);
   
-static void
-synthesize_enter_event (GdkWindow      *window,
-                       MSG            *msg,
-                       GdkCrossingMode mode,
-                       GdkNotifyType   detail)
+  event = gdk_event_new (type);
+  event->crossing.window = window;
+  event->crossing.subwindow = subwindow;
+  event->crossing.time = _gdk_win32_get_next_tick (time_);
+  event->crossing.x = pt.x;
+  event->crossing.y = pt.y;
+  event->crossing.x_root = screen_pt->x + _gdk_offset_x;
+  event->crossing.y_root = screen_pt->y + _gdk_offset_y;
+  event->crossing.mode = mode;
+  event->crossing.detail = notify_type;
+  event->crossing.mode = mode;
+  event->crossing.detail = notify_type;
+  event->crossing.focus = FALSE;
+  event->crossing.state = mask;
+  gdk_event_set_device (event, device_manager->core_pointer);
+  gdk_event_set_source_device (event, device_manager->system_pointer);
+
+  _gdk_win32_append_event (event);
+}
+
+static GdkWindow *
+get_native_parent (GdkWindow *window)
 {
-  POINT pt;
+  if (window->parent != NULL)
+    return window->parent->impl_window;
+  return NULL;
+}
 
-  if (p_grab_window != NULL && !p_grab_owner_events && !(p_grab_mask & GDK_ENTER_NOTIFY_MASK))
-    return;
+static GdkWindow *
+find_common_ancestor (GdkWindow *win1,
+                     GdkWindow *win2)
+{
+  GdkWindow *tmp;
+  GList *path1 = NULL, *path2 = NULL;
+  GList *list1, *list2;
 
-  if (!(((GdkWindowObject *) window)->event_mask & GDK_ENTER_NOTIFY_MASK))
-    return;
+  tmp = win1;
+  while (tmp != NULL && tmp->window_type != GDK_WINDOW_ROOT)
+    {
+      path1 = g_list_prepend (path1, tmp);
+      tmp = get_native_parent (tmp);
+    }
 
-  /* Enter events are at GET_X_LPARAM (msg->lParam), GET_Y_LPARAM
-   * (msg->lParam) in msg->hwnd
-   */
+  tmp = win2;
+  while (tmp != NULL && tmp->window_type != GDK_WINDOW_ROOT)
+    {
+      path2 = g_list_prepend (path2, tmp);
+      tmp = get_native_parent (tmp);
+    }
 
-  pt.x = GET_X_LPARAM (msg->lParam);
-  pt.y = GET_Y_LPARAM (msg->lParam);
-  if (msg->hwnd != GDK_WINDOW_HWND (window))
+  list1 = path1;
+  list2 = path2;
+  tmp = NULL;
+  while (list1 && list2 && (list1->data == list2->data))
     {
-      ClientToScreen (msg->hwnd, &pt);
-      ScreenToClient (GDK_WINDOW_HWND (window), &pt);
+      tmp = (GdkWindow *)list1->data;
+      list1 = g_list_next (list1);
+      list2 = g_list_next (list2);
     }
-  synthesize_enter_or_leave_event (window, msg, GDK_ENTER_NOTIFY, mode, detail, pt.x, pt.y);
+  g_list_free (path1);
+  g_list_free (path2);
 
-  track_mouse_event (TME_LEAVE, GDK_WINDOW_HWND (window));
-}
-  
-static void
-synthesize_enter_events (GdkWindow      *from,
-                        GdkWindow      *to,
-                        MSG            *msg,
-                        GdkCrossingMode mode,
-                        GdkNotifyType   detail)
-{
-  GdkWindow *prev = gdk_window_get_parent (to);
-  
-  if (prev != from)
-    synthesize_enter_events (from, prev, msg, mode, detail);
-  synthesize_enter_event (to, msg, mode, detail);
+  return tmp;
 }
-                        
-static void
-synthesize_leave_events (GdkWindow     *from,
-                        GdkWindow      *to,
-                        MSG            *msg,
-                        GdkCrossingMode mode,
-                        GdkNotifyType   detail)
-{
-  GdkWindow *next = gdk_window_get_parent (from);
-  
-  synthesize_leave_event (from, msg, mode, detail);
-  if (next != to)
-    synthesize_leave_events (next, to, msg, mode, detail);
-}
-                        
-static void
-synthesize_crossing_events (GdkWindow      *window,
-                           GdkCrossingMode mode,
-                           MSG            *msg)
-{
-  GdkWindow *intermediate, *tem, *common_ancestor;
 
-  if (gdk_window_is_ancestor (current_window, window))
-    {
-      /* Pointer has moved to an inferior window. */
-      synthesize_leave_event (current_window, msg, mode, GDK_NOTIFY_INFERIOR);
-      
-      /* If there are intermediate windows, generate ENTER_NOTIFY
-       * events for them
-       */
-      intermediate = gdk_window_get_parent (window);
-      if (intermediate != current_window)
-       {
-         synthesize_enter_events (current_window, intermediate, msg, mode, GDK_NOTIFY_VIRTUAL);
+void
+synthesize_crossing_events (GdkDisplay                 *display,
+                           GdkWindow                  *src,
+                           GdkWindow                  *dest,
+                           GdkCrossingMode             mode,
+                           POINT                      *screen_pt,
+                           GdkModifierType             mask,
+                           guint32                     time_,
+                           gboolean                    non_linear)
+{
+  GdkWindow *c;
+  GdkWindow *win, *last, *next;
+  GList *path, *list;
+  GdkWindow *a;
+  GdkWindow *b;
+  GdkNotifyType notify_type;
+
+  a = src;
+  b = dest;
+  if (a == b)
+    return; /* No crossings generated between src and dest */
+
+  c = find_common_ancestor (a, b);
+
+  non_linear |= (c != a) && (c != b);
+
+  if (a) /* There might not be a source (i.e. if no previous pointer_in_window) */
+    {
+      /* Traverse up from a to (excluding) c sending leave events */
+      if (non_linear)
+       notify_type = GDK_NOTIFY_NONLINEAR;
+      else if (c == a)
+       notify_type = GDK_NOTIFY_INFERIOR;
+      else
+       notify_type = GDK_NOTIFY_ANCESTOR;
+      send_crossing_event (display,
+                          a, GDK_LEAVE_NOTIFY,
+                          mode,
+                          notify_type,
+                          NULL,
+                          screen_pt,
+                          mask, time_);
+
+      if (c != a)
+       {
+         if (non_linear)
+           notify_type = GDK_NOTIFY_NONLINEAR_VIRTUAL;
+         else
+           notify_type = GDK_NOTIFY_VIRTUAL;
+
+         last = a;
+         win = get_native_parent (a);
+         while (win != c && win->window_type != GDK_WINDOW_ROOT)
+           {
+             send_crossing_event (display,
+                                  win, GDK_LEAVE_NOTIFY,
+                                  mode,
+                                  notify_type,
+                                  (GdkWindow *)last,
+                                  screen_pt,
+                                  mask, time_);
+
+             last = win;
+             win = get_native_parent (win);
+           }
        }
-      
-      synthesize_enter_event (window, msg, mode, GDK_NOTIFY_ANCESTOR);
     }
-  else if (gdk_window_is_ancestor (window, current_window))
-    {
-      /* Pointer has moved to an ancestor window. */
-      synthesize_leave_event (current_window, msg, mode, GDK_NOTIFY_ANCESTOR);
-      
-      /* If there are intermediate windows, generate LEAVE_NOTIFY
-       * events for them
-       */
-      intermediate = gdk_window_get_parent (current_window);
-      if (intermediate != window)
-       {
-         synthesize_leave_events (intermediate, window, msg, mode, GDK_NOTIFY_VIRTUAL);
-       }
 
-      synthesize_enter_event (window, msg, mode, GDK_NOTIFY_INFERIOR);
-    }
-  else if (current_window)
+  if (b) /* Might not be a dest, e.g. if we're moving out of the window */
     {
-      /* Find least common ancestor of current_window and window */
-      tem = current_window;
-      do {
-       common_ancestor = gdk_window_get_parent (tem);
-       tem = common_ancestor;
-      } while (common_ancestor &&
-              !gdk_window_is_ancestor (common_ancestor, window));
-      if (common_ancestor)
+      /* Traverse down from c to b */
+      if (c != b)
        {
-         synthesize_leave_event (current_window, msg, mode, GDK_NOTIFY_NONLINEAR);
-         intermediate = gdk_window_get_parent (current_window);
-         if (intermediate != common_ancestor)
+         path = NULL;
+         win = get_native_parent (b);
+         while (win != c && win->window_type != GDK_WINDOW_ROOT)
            {
-             synthesize_leave_events (intermediate, common_ancestor,
-                                      msg, mode, GDK_NOTIFY_NONLINEAR_VIRTUAL);
+             path = g_list_prepend (path, win);
+             win = get_native_parent (win);
            }
-         intermediate = gdk_window_get_parent (window);
-         if (intermediate != common_ancestor)
-           {
-             synthesize_enter_events (common_ancestor, intermediate,
-                                      msg, mode, GDK_NOTIFY_NONLINEAR_VIRTUAL);
-           }
-         synthesize_enter_event (window, msg, mode, GDK_NOTIFY_NONLINEAR);
-       }
-    }
-  else
-    {
-      /* Dunno where we are coming from */
-      synthesize_enter_event (window, msg, mode, GDK_NOTIFY_UNKNOWN);
-    }
-
-  assign_object (&current_window, window);
-}
-
-static void
-synthesize_expose_events (GdkWindow *window)
-{
-  RECT r;
-  HDC hdc;
-  GdkDrawableImplWin32 *impl = GDK_DRAWABLE_IMPL_WIN32 (((GdkWindowObject *) window)->impl);
-  GList *list = gdk_window_get_children (window);
-  GList *head = list;
-  GdkEvent *event;
-  int k;
-  
-  while (list)
-    {
-      synthesize_expose_events ((GdkWindow *) list->data);
-      list = list->next;
-    }
 
-  g_list_free (head);
+         if (non_linear)
+           notify_type = GDK_NOTIFY_NONLINEAR_VIRTUAL;
+         else
+           notify_type = GDK_NOTIFY_VIRTUAL;
 
-  if (((GdkWindowObject *) window)->input_only)
-    ;
-  else if (!(hdc = GetDC (impl->handle)))
-    WIN32_GDI_FAILED ("GetDC");
-  else
-    {
-      if ((k = GetClipBox (hdc, &r)) == ERROR)
-       WIN32_GDI_FAILED ("GetClipBox");
-      else if (k != NULLREGION)
-       {
-         event = gdk_event_new (GDK_EXPOSE);
-         event->expose.window = window;
-         event->expose.area.x = r.left;
-         event->expose.area.y = r.top;
-         event->expose.area.width = r.right - r.left;
-         event->expose.area.height = r.bottom - r.top;
-         event->expose.region = gdk_region_rectangle (&(event->expose.area));
-         event->expose.count = 0;
-  
-         append_event (event);
+         list = path;
+         while (list)
+           {
+             win = (GdkWindow *)list->data;
+             list = g_list_next (list);
+             if (list)
+               next = (GdkWindow *)list->data;
+             else
+               next = b;
+
+             send_crossing_event (display,
+                                  win, GDK_ENTER_NOTIFY,
+                                  mode,
+                                  notify_type,
+                                  next,
+                                  screen_pt,
+                                  mask, time_);
+           }
+         g_list_free (path);
        }
-      GDI_CALL (ReleaseDC, (impl->handle, hdc));
-    }
-}
-
-static void
-update_colors (GdkWindow *window,
-              gboolean   top)
-{
-  HDC hdc;
-  GdkDrawableImplWin32 *impl = GDK_DRAWABLE_IMPL_WIN32 (((GdkWindowObject *) window)->impl);
-  GList *list = gdk_window_get_children (window);
-  GList *head = list;
-
-  GDK_NOTE (COLORMAP, (top ? g_print ("update_colors:") : (void) 0));
-
-  while (list)
-    {
-      update_colors ((GdkWindow *) list->data, FALSE);
-      list = list->next;
-    }
-  g_list_free (head);
 
-  if (((GdkWindowObject *) window)->input_only ||
-      impl->colormap == NULL)
-    return;
 
-  if (!(hdc = GetDC (impl->handle)))
-    WIN32_GDI_FAILED ("GetDC");
-  else
-    {
-      GdkColormapPrivateWin32 *cmapp = GDK_WIN32_COLORMAP_DATA (impl->colormap);
-      HPALETTE holdpal;
-      gint k;
-      
-      if ((holdpal = SelectPalette (hdc, cmapp->hpal, TRUE)) == NULL)
-       WIN32_GDI_FAILED ("SelectPalette");
-      else if ((k = RealizePalette (hdc)) == GDI_ERROR)
-       WIN32_GDI_FAILED ("RealizePalette");
+      if (non_linear)
+       notify_type = GDK_NOTIFY_NONLINEAR;
+      else if (c == a)
+       notify_type = GDK_NOTIFY_ANCESTOR;
       else
-       {
-         GDK_NOTE (COLORMAP,
-                   (k > 0 ?
-                    g_print (" %p pal=%p: realized %d colors\n"
-                             "update_colors:",
-                             impl->handle, cmapp->hpal, k) :
-                    (void) 0,
-                    g_print (" %p", impl->handle)));
-         GDI_CALL (UpdateColors, (hdc));
-         SelectPalette (hdc, holdpal, TRUE);
-         RealizePalette (hdc);
-       }
-      GDI_CALL (ReleaseDC, (impl->handle, hdc));
+       notify_type = GDK_NOTIFY_INFERIOR;
+
+      send_crossing_event (display,
+                          b, GDK_ENTER_NOTIFY,
+                          mode,
+                          notify_type,
+                          NULL,
+                          screen_pt,
+                          mask, time_);
     }
-  GDK_NOTE (COLORMAP, (top ? g_print ("\n") : (void) 0));
-}
-
-static void
-translate_mouse_coords (GdkWindow *window1,
-                       GdkWindow *window2,
-                       MSG       *msg)
-{
-  POINT pt;
-
-  pt.x = GET_X_LPARAM (msg->lParam);
-  pt.y = GET_Y_LPARAM (msg->lParam);
-  ClientToScreen (GDK_WINDOW_HWND (window1), &pt);
-  ScreenToClient (GDK_WINDOW_HWND (window2), &pt);
-  msg->lParam = MAKELPARAM (pt.x, pt.y);
 }
 
 /* The check_extended flag controls whether to check if the windows want
  * events from extended input devices and if the message should be skipped
- * because an extended input device is active */
+ * because an extended input device is active
+ */
 static gboolean
 propagate (GdkWindow  **window,
           MSG         *msg,
@@ -1670,24 +1328,12 @@ propagate (GdkWindow  **window,
           gboolean     grab_owner_events,
           gint         grab_mask,
           gboolean   (*doesnt_want_it) (gint mask,
-                                        MSG *msg),
-          gboolean     check_extended)
+                                        MSG *msg))
 {
-  gboolean in_propagation = FALSE;
-
   if (grab_window != NULL && !grab_owner_events)
     {
       /* Event source is grabbed with owner_events FALSE */
 
-      /* See if the event should be ignored because an extended input device
-       * is used */
-      if (check_extended &&
-         ((GdkWindowObject *) grab_window)->extension_events != 0 &&
-         _gdk_input_ignore_core)
-       {
-         GDK_NOTE (EVENTS, g_print (" (ignored for grabber)"));
-         return FALSE;
-       }
       if ((*doesnt_want_it) (grab_mask, msg))
        {
          GDK_NOTE (EVENTS, g_print (" (grabber doesn't want it)"));
@@ -1700,18 +1346,13 @@ propagate (GdkWindow  **window,
          return TRUE;
        }
     }
+
+  /* If we come here, we know that if grab_window != NULL then
+   * grab_owner_events is TRUE
+   */
   while (TRUE)
     {
-      /* See if the event should be ignored because an extended input device
-       * is used */
-      if (check_extended &&
-         ((GdkWindowObject *) *window)->extension_events != 0 &&
-         _gdk_input_ignore_core)
-       {
-         GDK_NOTE (EVENTS, g_print (" (ignored)"));
-         return FALSE;
-       }
-      if ((*doesnt_want_it) (((GdkWindowObject *) *window)->event_mask, msg))
+      if ((*doesnt_want_it) ((*window)->event_mask, msg))
        {
          /* Owner doesn't want it, propagate to parent. */
          GdkWindow *parent = gdk_window_get_parent (*window);
@@ -1722,15 +1363,6 @@ propagate (GdkWindow  **window,
                {
                  /* Event source is grabbed with owner_events TRUE */
 
-                 /* See if the event should be ignored because an extended
-                  * input device is used */
-                 if (check_extended &&
-                     ((GdkWindowObject *) grab_window)->extension_events != 0 &&
-                     _gdk_input_ignore_core)
-                   {
-                     GDK_NOTE (EVENTS, g_print (" (ignored for grabber)"));
-                     return FALSE;
-                   }
                  if ((*doesnt_want_it) (grab_mask, msg))
                    {
                      /* Grabber doesn't want it either */
@@ -1754,7 +1386,6 @@ propagate (GdkWindow  **window,
          else
            {
              assign_object (window, parent);
-             in_propagation = TRUE;
              /* The only branch where we actually continue the loop */
            }
        }
@@ -1767,13 +1398,6 @@ static gboolean
 doesnt_want_key (gint mask,
                 MSG *msg)
 {
-  GdkWindow *modal_current = _gdk_modal_current ();
-  GdkWindow *window = (GdkWindow *) gdk_win32_handle_table_lookup ((GdkNativeWindow)msg->hwnd);
-  gboolean modally_blocked = modal_current != NULL ? gdk_window_get_toplevel (window) != modal_current : FALSE;
-
-  if (modally_blocked == TRUE)
-    return TRUE;
-
   return (((msg->message == WM_KEYUP || msg->message == WM_SYSKEYUP) &&
           !(mask & GDK_KEY_RELEASE_MASK)) ||
          ((msg->message == WM_KEYDOWN || msg->message == WM_SYSKEYDOWN) &&
@@ -1787,68 +1411,41 @@ doesnt_want_char (gint mask,
   return !(mask & (GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK));
 }
 
-static gboolean
-doesnt_want_button_press (gint mask,
-                         MSG *msg)
-{
-  return !(mask & GDK_BUTTON_PRESS_MASK);
-}
-
-static gboolean
-doesnt_want_button_release (gint mask,
-                           MSG *msg)
-{
-  return !(mask & GDK_BUTTON_RELEASE_MASK);
-}
-
-static gboolean
-doesnt_want_button_motion (gint mask,
-                          MSG *msg)
-{
-  return !((mask & GDK_POINTER_MOTION_MASK) ||
-          ((msg->wParam & (MK_LBUTTON|MK_MBUTTON|MK_RBUTTON)) && (mask & GDK_BUTTON_MOTION_MASK)) ||
-          ((msg->wParam & MK_LBUTTON) && (mask & GDK_BUTTON1_MOTION_MASK)) ||
-          ((msg->wParam & MK_MBUTTON) && (mask & GDK_BUTTON2_MOTION_MASK)) ||
-          ((msg->wParam & MK_RBUTTON) && (mask & GDK_BUTTON3_MOTION_MASK)));
-}
-
-static gboolean
-doesnt_want_scroll (gint mask,
-                   MSG *msg)
-{
-  /* As there are no separate scroll events in X11, button press
-   * events are used, so higher level code might be selecting for
-   * either GDK_BUTTON_PRESS_MASK or GDK_SCROLL_MASK when it wants GDK
-   * scroll events. Make sure this works in the Win32 backend, too.
-   */
-  return !(mask & (GDK_SCROLL_MASK|GDK_BUTTON_PRESS_MASK));
-}
-
-static void
-handle_configure_event (MSG       *msg,
-                       GdkWindow *window)
+void
+_gdk_win32_emit_configure_event (GdkWindow *window)
 {
+  GdkWindowImplWin32 *window_impl;
   RECT client_rect;
   POINT point;
+  HWND hwnd;
+
+  window_impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
+  if (window_impl->inhibit_configure)
+    return;
 
-  GetClientRect (msg->hwnd, &client_rect);
+  hwnd = GDK_WINDOW_HWND (window);
+
+  GetClientRect (hwnd, &client_rect);
   point.x = client_rect.left; /* always 0 */
   point.y = client_rect.top;
+
   /* top level windows need screen coords */
   if (gdk_window_get_parent (window) == _gdk_root)
     {
-      ClientToScreen (msg->hwnd, &point);
+      ClientToScreen (hwnd, &point);
       point.x += _gdk_offset_x;
       point.y += _gdk_offset_y;
     }
 
-  GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl)->width = client_rect.right - client_rect.left;
-  GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl)->height = client_rect.bottom - client_rect.top;
+  window->width = client_rect.right - client_rect.left;
+  window->height = client_rect.bottom - client_rect.top;
   
-  ((GdkWindowObject *) window)->x = point.x;
-  ((GdkWindowObject *) window)->y = point.y;
+  window->x = point.x;
+  window->y = point.y;
+
+  _gdk_window_update_size (window);
   
-  if (((GdkWindowObject *) window)->event_mask & GDK_STRUCTURE_MASK)
+  if (window->event_mask & GDK_STRUCTURE_MASK)
     {
       GdkEvent *event = gdk_event_new (GDK_CONFIGURE);
 
@@ -1860,16 +1457,16 @@ handle_configure_event (MSG       *msg,
       event->configure.x = point.x;
       event->configure.y = point.y;
 
-      append_event (event);
+      _gdk_win32_append_event (event);
     }
 }
 
-GdkRegion *
+cairo_region_t *
 _gdk_win32_hrgn_to_region (HRGN hrgn)
 {
   RGNDATA *rgndata;
   RECT *rects;
-  GdkRegion *result;
+  cairo_region_t *result;
   gint nbytes;
   guint i;
 
@@ -1888,7 +1485,7 @@ _gdk_win32_hrgn_to_region (HRGN hrgn)
       return NULL;
     }
 
-  result = gdk_region_new ();
+  result = cairo_region_create ();
   rects = (RECT *) rgndata->Buffer;
   for (i = 0; i < rgndata->rdh.nCount; i++)
     {
@@ -1899,7 +1496,7 @@ _gdk_win32_hrgn_to_region (HRGN hrgn)
       r.width = rects[i].right - r.x;
       r.height = rects[i].bottom - r.y;
 
-      gdk_region_union_with_rect (result, &r);
+      cairo_region_union_rectangle (result, &r);
     }
 
   g_free (rgndata);
@@ -1927,8 +1524,7 @@ handle_wm_paint (MSG        *msg,
   HRGN hrgn = CreateRectRgn (0, 0, 0, 0);
   HDC hdc;
   PAINTSTRUCT paintstruct;
-  GdkRegion *update_region;
-  gint xoffset, yoffset;
+  cairo_region_t *update_region;
 
   if (GetUpdateRgn (msg->hwnd, hrgn, FALSE) == ERROR)
     {
@@ -1947,29 +1543,6 @@ handle_wm_paint (MSG        *msg,
 
   EndPaint (msg->hwnd, &paintstruct);
 
-  /* HB: don't generate GDK_EXPOSE events for InputOnly
-   * windows -> backing store now works!
-   */
-  if (((GdkWindowObject *) window)->input_only)
-    {
-      DeleteObject (hrgn);
-      return;
-    }
-
-  if (!(((GdkWindowObject *) window)->event_mask & GDK_EXPOSURE_MASK))
-    {
-      GDK_NOTE (EVENTS, g_print (" (ignored)"));
-      DeleteObject (hrgn);
-      return;
-    }
-
-#if 0 /* we need to process exposes even with GDK_NO_BG
-   * Otherwise The GIMP canvas update is broken ....
-   */
-  if (((GdkWindowObject *) window)->bg_pixmap == GDK_NO_BG)
-    break;
-#endif
-
   if ((paintstruct.rcPaint.right == paintstruct.rcPaint.left) ||
       (paintstruct.rcPaint.bottom == paintstruct.rcPaint.top))
     {
@@ -2011,32 +1584,68 @@ handle_wm_paint (MSG        *msg,
     }
 
   update_region = _gdk_win32_hrgn_to_region (hrgn);
-
-  _gdk_windowing_window_get_offsets (window, &xoffset, &yoffset);
-  gdk_region_offset (update_region, xoffset, yoffset);
-  
-  _gdk_window_process_expose (window, update_region);
-  gdk_region_destroy (update_region);
+  if (!cairo_region_is_empty (update_region))
+    _gdk_window_invalidate_for_expose (window, update_region);
+  cairo_region_destroy (update_region);
 
   DeleteObject (hrgn);
 }
 
-static void
-handle_stuff_while_moving_or_resizing (void)
+static VOID CALLBACK 
+modal_timer_proc (HWND     hwnd,
+                 UINT     msg,
+                 UINT_PTR id,
+                 DWORD    time)
 {
-  int arbitrary_limit = 1;
-  while (g_main_context_pending (NULL) && arbitrary_limit--)
+  int arbitrary_limit = 10;
+
+  while (_modal_operation_in_progress &&
+        g_main_context_pending (NULL) &&
+        arbitrary_limit--)
     g_main_context_iteration (NULL, FALSE);
 }
 
+void
+_gdk_win32_begin_modal_call (void)
+{
+  g_assert (!_modal_operation_in_progress);
+
+  _modal_operation_in_progress = TRUE;
+
+  modal_timer = SetTimer (NULL, 0, 10, modal_timer_proc);
+  if (modal_timer == 0)
+    WIN32_API_FAILED ("SetTimer");
+}
+
+void
+_gdk_win32_end_modal_call (void)
+{
+  g_assert (_modal_operation_in_progress);
+
+  _modal_operation_in_progress = FALSE;
+
+  if (modal_timer != 0)
+    {
+      API_CALL (KillTimer, (NULL, modal_timer));
+      modal_timer = 0;
+   }
+}
+
 static VOID CALLBACK
-resize_timer_proc (HWND     hwnd,
-                  UINT     msg,
-                  UINT     id,
-                  DWORD    time)
+sync_timer_proc (HWND     hwnd,
+                UINT     msg,
+                UINT_PTR id,
+                DWORD    time)
 {
-  if (_sizemove_in_progress)
-    handle_stuff_while_moving_or_resizing ();
+  MSG message;
+  if (PeekMessageW (&message, hwnd, WM_PAINT, WM_PAINT, PM_REMOVE))
+    {
+      return;
+    }
+
+  RedrawWindow (hwnd, NULL, NULL, RDW_INVALIDATE|RDW_UPDATENOW|RDW_ALLCHILDREN);
+
+  KillTimer (hwnd, sync_timer);
 }
 
 static void
@@ -2048,37 +1657,180 @@ handle_display_change (void)
 }
 
 static void
-generate_button_event (GdkEventType type,
-                      gint         button,
-                      GdkWindow   *window,
-                      GdkWindow   *orig_window,
-                      MSG         *msg)
+generate_button_event (GdkEventType      type,
+                       gint              button,
+                       GdkWindow        *window,
+                       MSG              *msg)
 {
   GdkEvent *event = gdk_event_new (type);
-  gint xoffset, yoffset;
+  GdkDeviceManagerWin32 *device_manager;
+
+  if (_gdk_input_ignore_core)
+    return;
+
+  device_manager = GDK_DEVICE_MANAGER_WIN32 (gdk_display_get_device_manager (_gdk_display));
 
   event->button.window = window;
   event->button.time = _gdk_win32_get_next_tick (msg->time);
-  if (window != orig_window)
-    translate_mouse_coords (orig_window, window, msg);
   event->button.x = current_x = (gint16) GET_X_LPARAM (msg->lParam);
   event->button.y = current_y = (gint16) GET_Y_LPARAM (msg->lParam);
-  _gdk_windowing_window_get_offsets (window, &xoffset, &yoffset);
-  event->button.x += xoffset;
-  event->button.y += yoffset;
   event->button.x_root = msg->pt.x + _gdk_offset_x;
   event->button.y_root = msg->pt.y + _gdk_offset_y;
   event->button.axes = NULL;
   event->button.state = build_pointer_event_state (msg);
   event->button.button = button;
-  event->button.device = _gdk_display->core_pointer;
+  gdk_event_set_device (event, device_manager->core_pointer);
+  gdk_event_set_source_device (event, device_manager->system_pointer);
+
+  _gdk_win32_append_event (event);
+}
+
+static void
+ensure_stacking_on_unminimize (MSG *msg)
+{
+  HWND rover;
+  HWND lowest_transient = NULL;
+
+  rover = msg->hwnd;
+  while ((rover = GetNextWindow (rover, GW_HWNDNEXT)))
+    {
+      GdkWindow *rover_gdkw = gdk_win32_handle_table_lookup (rover);
+
+      /* Checking window group not implemented yet */
+      if (rover_gdkw)
+       {
+         GdkWindowImplWin32 *rover_impl =
+           GDK_WINDOW_IMPL_WIN32 (rover_gdkw->impl);
+
+         if (GDK_WINDOW_IS_MAPPED (rover_gdkw) &&
+             (rover_impl->type_hint == GDK_WINDOW_TYPE_HINT_UTILITY ||
+              rover_impl->type_hint == GDK_WINDOW_TYPE_HINT_DIALOG ||
+              rover_impl->transient_owner != NULL))
+           {
+             lowest_transient = rover;
+           }
+       }
+    }
+  if (lowest_transient != NULL)
+    {
+      GDK_NOTE (EVENTS, g_print (" restacking: %p", lowest_transient));
+      SetWindowPos (msg->hwnd, lowest_transient, 0, 0, 0, 0,
+                   SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
+    }
+}
+
+static gboolean
+ensure_stacking_on_window_pos_changing (MSG       *msg,
+                                       GdkWindow *window)
+{
+  GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
+  WINDOWPOS *windowpos = (WINDOWPOS *) msg->lParam;
+
+  if (GetActiveWindow () == msg->hwnd &&
+      impl->type_hint != GDK_WINDOW_TYPE_HINT_UTILITY &&
+      impl->type_hint != GDK_WINDOW_TYPE_HINT_DIALOG &&
+      impl->transient_owner == NULL)
+    {
+      /* Make sure the window stays behind any transient-type windows
+       * of the same window group.
+       *
+       * If the window is not active and being activated, we let
+       * Windows bring it to the top and rely on the WM_ACTIVATEAPP
+       * handling to bring any utility windows on top of it.
+       */
+      HWND rover;
+      gboolean restacking;
+
+      rover = windowpos->hwndInsertAfter;
+      restacking = FALSE;
+      while (rover)
+       {
+         GdkWindow *rover_gdkw = gdk_win32_handle_table_lookup (rover);
+
+         /* Checking window group not implemented yet */
+         if (rover_gdkw)
+           {
+             GdkWindowImplWin32 *rover_impl =
+               GDK_WINDOW_IMPL_WIN32 (rover_gdkw->impl);
+
+             if (GDK_WINDOW_IS_MAPPED (rover_gdkw) &&
+                 (rover_impl->type_hint == GDK_WINDOW_TYPE_HINT_UTILITY ||
+                  rover_impl->type_hint == GDK_WINDOW_TYPE_HINT_DIALOG ||
+                  rover_impl->transient_owner != NULL))
+               {
+                 restacking = TRUE;
+                 windowpos->hwndInsertAfter = rover;
+               }
+           }
+         rover = GetNextWindow (rover, GW_HWNDNEXT);
+       }
 
-  append_event (event);
+      if (restacking)
+       {
+         GDK_NOTE (EVENTS, g_print (" restacking: %p", windowpos->hwndInsertAfter));
+         return TRUE;
+       }
+    }
+  return FALSE;
+}
+
+static void
+ensure_stacking_on_activate_app (MSG       *msg,
+                                GdkWindow *window)
+{
+  GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
+
+  if (impl->type_hint == GDK_WINDOW_TYPE_HINT_UTILITY ||
+      impl->type_hint == GDK_WINDOW_TYPE_HINT_DIALOG ||
+      impl->transient_owner != NULL)
+    {
+      SetWindowPos (msg->hwnd, HWND_TOP, 0, 0, 0, 0,
+                   SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
+      return;
+    }
+
+  if (IsWindowVisible (msg->hwnd) &&
+      msg->hwnd == GetActiveWindow ())
+    {
+      /* This window is not a transient-type window and it is the
+       * activated window. Make sure this window is as visible as
+       * possible, just below the lowest transient-type window of this
+       * app.
+       */
+      HWND rover;
 
-  if (type == GDK_BUTTON_PRESS)
-    _gdk_event_button_generate (_gdk_display, event);
+      rover = msg->hwnd;
+      while ((rover = GetNextWindow (rover, GW_HWNDPREV)))
+       {
+         GdkWindow *rover_gdkw = gdk_win32_handle_table_lookup (rover);
+
+         /* Checking window group not implemented yet */
+         if (rover_gdkw)
+           {
+             GdkWindowImplWin32 *rover_impl =
+               GDK_WINDOW_IMPL_WIN32 (rover_gdkw->impl);
+
+             if (GDK_WINDOW_IS_MAPPED (rover_gdkw) &&
+                 (rover_impl->type_hint == GDK_WINDOW_TYPE_HINT_UTILITY ||
+                  rover_impl->type_hint == GDK_WINDOW_TYPE_HINT_DIALOG ||
+                  rover_impl->transient_owner != NULL))
+               {
+                 GDK_NOTE (EVENTS, g_print (" restacking: %p", rover));
+                 SetWindowPos (msg->hwnd, rover, 0, 0, 0, 0,
+                               SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
+                 break;
+               }
+           }
+       }
+    }
 }
 
+#define GDK_ANY_BUTTON_MASK (GDK_BUTTON1_MASK | \
+                            GDK_BUTTON2_MASK | \
+                            GDK_BUTTON3_MASK | \
+                            GDK_BUTTON4_MASK | \
+                            GDK_BUTTON5_MASK)
+
 static gboolean
 gdk_event_translate (MSG  *msg,
                     gint *ret_valp)
@@ -2090,6 +1842,8 @@ gdk_event_translate (MSG  *msg,
   HCURSOR hcursor;
   BYTE key_state[256];
   HIMC himc;
+  WINDOWPOS *windowpos;
+  gboolean ignore_leave;
 
   GdkEvent *event;
 
@@ -2100,9 +1854,14 @@ gdk_event_translate (MSG  *msg,
   GdkWindowImplWin32 *impl;
 
   GdkWindow *orig_window, *new_window;
-  gint xoffset, yoffset;
 
-  static gint update_colors_counter = 0;
+  GdkDeviceManager *device_manager;
+  GdkDeviceManagerWin32 *device_manager_win32;
+
+  GdkDeviceGrabInfo *keyboard_grab = NULL;
+  GdkDeviceGrabInfo *pointer_grab = NULL;
+  GdkWindow *grab_window = NULL;
+
   gint button;
   GdkAtom target;
 
@@ -2115,7 +1874,7 @@ gdk_event_translate (MSG  *msg,
     {
       /* Apply global filters */
 
-      GdkFilterReturn result = apply_filters (NULL, msg, _gdk_default_filters);
+      GdkFilterReturn result = apply_event_filters (NULL, msg, &_gdk_default_filters);
       
       /* If result is GDK_FILTER_CONTINUE, we continue as if nothing
        * happened. If it is GDK_FILTER_REMOVE or GDK_FILTER_TRANSLATE,
@@ -2125,7 +1884,7 @@ gdk_event_translate (MSG  *msg,
        return TRUE;
     }
 
-  window = gdk_win32_handle_table_lookup ((GdkNativeWindow) msg->hwnd);
+  window = gdk_win32_handle_table_lookup (msg->hwnd);
   orig_window = window;
 
   if (window == NULL)
@@ -2133,22 +1892,9 @@ gdk_event_translate (MSG  *msg,
       /* XXX Handle WM_QUIT here ? */
       if (msg->message == WM_QUIT)
        {
-         GDK_NOTE (EVENTS, g_print (" %d", msg->wParam));
+         GDK_NOTE (EVENTS, g_print (" %d", (int) msg->wParam));
          exit (msg->wParam);
        }
-      else if (msg->message == WM_MOVE ||
-              msg->message == WM_SIZE)
-       {
-         /* It's quite normal to get these messages before we have
-          * had time to register the window in our lookup table, or
-          * when the window is being destroyed and we already have
-          * removed it. Repost the same message to our queue so that
-          * we will get it later when we are prepared.
-          */
-         GDK_NOTE (EVENTS, g_print (" (posted)"));
-       
-         PostMessageW (msg->hwnd, msg->message, msg->wParam, msg->lParam);
-       }
       else if (msg->message == WM_CREATE)
        {
          window = (UNALIGNED GdkWindow*) (((LPCREATESTRUCTW) msg->lParam)->lpCreateParams);
@@ -2160,7 +1906,15 @@ gdk_event_translate (MSG  *msg,
        }
       return FALSE;
     }
-  
+
+  device_manager = gdk_display_get_device_manager (_gdk_display);
+  device_manager_win32 = GDK_DEVICE_MANAGER_WIN32 (device_manager);
+
+  keyboard_grab = _gdk_display_get_last_device_grab (_gdk_display,
+                                                     device_manager_win32->core_keyboard);
+  pointer_grab = _gdk_display_get_last_device_grab (_gdk_display,
+                                                    device_manager_win32->core_pointer);
+
   g_object_ref (window);
 
   /* window's refcount has now been increased, so code below should
@@ -2170,11 +1924,11 @@ gdk_event_translate (MSG  *msg,
    */
 #define return GOTO_DONE_INSTEAD
   
-  if (!GDK_WINDOW_DESTROYED (window) && ((GdkWindowObject *) window)->filters)
+  if (!GDK_WINDOW_DESTROYED (window) && window->filters)
     {
       /* Apply per-window filters */
 
-      GdkFilterReturn result = apply_filters (window, msg, ((GdkWindowObject *) window)->filters);
+      GdkFilterReturn result = apply_event_filters (window, msg, &window->filters);
 
       if (result == GDK_FILTER_REMOVE || result == GDK_FILTER_TRANSLATE)
        {
@@ -2187,9 +1941,15 @@ gdk_event_translate (MSG  *msg,
     {
       GList *tmp_list;
       GdkFilterReturn result = GDK_FILTER_CONTINUE;
+      GList *node;
 
       GDK_NOTE (EVENTS, g_print (" client_message"));
 
+      event = gdk_event_new (GDK_NOTHING);
+      ((GdkEventPrivate *)event)->flags |= GDK_EVENT_PENDING;
+
+      node = _gdk_event_queue_append (_gdk_display, event);
+
       tmp_list = client_filters;
       while (tmp_list)
        {
@@ -2199,38 +1959,33 @@ gdk_event_translate (MSG  *msg,
 
          if (filter->type == GDK_POINTER_TO_ATOM (msg->wParam))
            {
-             GList *filter_list = g_list_append (NULL, filter);
-             
              GDK_NOTE (EVENTS, g_print (" (match)"));
 
-             result = apply_filters (window, msg, filter_list);
-
-             g_list_free (filter_list);
+             result = (*filter->function) (msg, event, filter->data);
 
              if (result != GDK_FILTER_CONTINUE)
                break;
            }
        }
 
-      if (result == GDK_FILTER_REMOVE || result == GDK_FILTER_TRANSLATE)
+      switch (result)
        {
+       case GDK_FILTER_REMOVE:
+         _gdk_event_queue_remove_link (_gdk_display, node);
+         g_list_free_1 (node);
+         gdk_event_free (event);
          return_val = TRUE;
          goto done;
-       }
-      else
-       {
-         /* Send unknown client messages on to Gtk for it to use */
-
-         event = gdk_event_new (GDK_CLIENT_EVENT);
-         event->client.window = window;
-         event->client.message_type = GDK_POINTER_TO_ATOM (msg->wParam);
-         event->client.data_format = 32;
-         event->client.data.l[0] = msg->lParam;
-         for (i = 1; i < 5; i++)
-           event->client.data.l[i] = 0;
-         
-         append_event (event);
-         
+
+       case GDK_FILTER_TRANSLATE:
+         ((GdkEventPrivate *)event)->flags &= ~GDK_EVENT_PENDING;
+         GDK_NOTE (EVENTS, _gdk_win32_print_event (event));
+         return_val = TRUE;
+         goto done;
+
+       case GDK_FILTER_CONTINUE:
+         /* No more: Send unknown client messages on to Gtk for it to use */
+         GDK_NOTE (EVENTS, _gdk_win32_print_event (event));
          return_val = TRUE;
          goto done;
        }
@@ -2247,9 +2002,9 @@ gdk_event_translate (MSG  *msg,
       _gdk_input_codepage = atoi (buf);
       _gdk_keymap_serial++;
       GDK_NOTE (EVENTS,
-               g_print (" cs:%lu hkl:%lx%s cp:%d",
+               g_print (" cs:%lu hkl:%p%s cp:%d",
                         (gulong) msg->wParam,
-                        msg->lParam, _gdk_input_locale_is_ime ? " (IME)" : "",
+                        (gpointer) msg->lParam, _gdk_input_locale_is_ime ? " (IME)" : "",
                         _gdk_input_codepage));
       break;
 
@@ -2258,7 +2013,7 @@ gdk_event_translate (MSG  *msg,
       GDK_NOTE (EVENTS,
                g_print (" %s ch:%.02x %s",
                         _gdk_win32_key_to_string (msg->lParam),
-                        msg->wParam,
+                        (int) msg->wParam,
                         decode_key_lparam (msg->lParam)));
 
       /* If posted without us having keyboard focus, ignore */
@@ -2269,7 +2024,7 @@ gdk_event_translate (MSG  *msg,
       /* Let the system handle Alt-Tab, Alt-Space and Alt-F4 unless
        * the keyboard is grabbed.
        */
-      if (k_grab_window == NULL &&
+      if (!keyboard_grab &&
          (msg->wParam == VK_TAB ||
           msg->wParam == VK_SPACE ||
           msg->wParam == VK_F4))
@@ -2283,7 +2038,7 @@ gdk_event_translate (MSG  *msg,
       GDK_NOTE (EVENTS, 
                g_print (" %s ch:%.02x %s",
                         _gdk_win32_key_to_string (msg->lParam),
-                        msg->wParam,
+                        (int) msg->wParam,
                         decode_key_lparam (msg->lParam)));
 
     keyup_or_down:
@@ -2293,9 +2048,12 @@ gdk_event_translate (MSG  *msg,
          in_ime_composition)
        break;
 
-      if (!propagate (&window, msg,
-                     k_grab_window, k_grab_owner_events, GDK_ALL_EVENTS_MASK,
-                     doesnt_want_key, FALSE))
+      if (keyboard_grab &&
+          !propagate (&window, msg,
+                     keyboard_grab->window,
+                     keyboard_grab->owner_events,
+                     GDK_ALL_EVENTS_MASK,
+                     doesnt_want_key))
        break;
 
       if (GDK_WINDOW_DESTROYED (window))
@@ -2306,10 +2064,12 @@ gdk_event_translate (MSG  *msg,
                             GDK_KEY_PRESS : GDK_KEY_RELEASE);
       event->key.window = window;
       event->key.time = _gdk_win32_get_next_tick (msg->time);
-      event->key.keyval = GDK_VoidSymbol;
+      event->key.keyval = GDK_KEY_VoidSymbol;
       event->key.string = NULL;
       event->key.length = 0;
       event->key.hardware_keycode = msg->wParam;
+      gdk_event_set_device (event, device_manager_win32->core_keyboard);
+      gdk_event_set_source_device (event, device_manager_win32->system_keyboard);
       if (HIWORD (msg->lParam) & KF_EXTENDED)
        {
          switch (msg->wParam)
@@ -2337,12 +2097,16 @@ gdk_event_translate (MSG  *msg,
       
       build_key_event_state (event, key_state);
 
-      gdk_keymap_translate_keyboard_state (NULL,
-                                          event->key.hardware_keycode,
-                                          event->key.state,
-                                          event->key.group,
-                                          &event->key.keyval,
-                                          NULL, NULL, NULL);
+      if (msg->wParam == VK_PACKET &&
+         ToUnicode (VK_PACKET, HIWORD (msg->lParam), key_state, wbuf, 1, 0) == 1)
+       event->key.keyval = gdk_unicode_to_keyval (wbuf[0]);
+      else
+       gdk_keymap_translate_keyboard_state (_gdk_win32_display_get_keymap (_gdk_display),
+                                            event->key.hardware_keycode,
+                                            event->key.state,
+                                            event->key.group,
+                                            &event->key.keyval,
+                                            NULL, NULL, NULL);
 
       fill_key_event_string (event);
 
@@ -2350,7 +2114,7 @@ gdk_event_translate (MSG  *msg,
       if (msg->wParam == VK_MENU)
        event->key.state &= ~GDK_MOD1_MASK;
 
-      append_event (event);
+      _gdk_win32_append_event (event);
 
       return_val = TRUE;
       break;
@@ -2390,14 +2154,17 @@ gdk_event_translate (MSG  *msg,
        * WM_IME_CHAR might work on NT4 or Win9x with ActiveIMM, but
        * use WM_IME_COMPOSITION there, too, to simplify the code.
        */
-      GDK_NOTE (EVENTS, g_print (" %#lx", msg->lParam));
+      GDK_NOTE (EVENTS, g_print (" %#lx", (long) msg->lParam));
 
       if (!(msg->lParam & GCS_RESULTSTR))
        break;
 
-      if (!propagate (&window, msg,
-                     k_grab_window, k_grab_owner_events, GDK_ALL_EVENTS_MASK,
-                     doesnt_want_char, FALSE))
+      if (keyboard_grab &&
+          !propagate (&window, msg,
+                     keyboard_grab->window,
+                     keyboard_grab->owner_events,
+                     GDK_ALL_EVENTS_MASK,
+                     doesnt_want_char))
        break;
 
       if (GDK_WINDOW_DESTROYED (window))
@@ -2414,24 +2181,28 @@ gdk_event_translate (MSG  *msg,
 
       for (i = 0; i < ccount; i++)
        {
-         if (((GdkWindowObject *) window)->event_mask & GDK_KEY_PRESS_MASK)
+         if (window->event_mask & GDK_KEY_PRESS_MASK)
            {
              /* Build a key press event */
              event = gdk_event_new (GDK_KEY_PRESS);
              event->key.window = window;
+             gdk_event_set_device (event, device_manager_win32->core_keyboard);
+             gdk_event_set_source_device (event, device_manager_win32->system_keyboard);
              build_wm_ime_composition_event (event, msg, wbuf[i], key_state);
 
-             append_event (event);
+             _gdk_win32_append_event (event);
            }
          
-         if (((GdkWindowObject *) window)->event_mask & GDK_KEY_RELEASE_MASK)
+         if (window->event_mask & GDK_KEY_RELEASE_MASK)
            {
              /* Build a key release event.  */
              event = gdk_event_new (GDK_KEY_RELEASE);
              event->key.window = window;
+             gdk_event_set_device (event, device_manager_win32->core_keyboard);
+             gdk_event_set_source_device (event, device_manager_win32->system_keyboard);
              build_wm_ime_composition_event (event, msg, wbuf[i], key_state);
 
-             append_event (event);
+             _gdk_win32_append_event (event);
            }
        }
       return_val = TRUE;
@@ -2461,42 +2232,17 @@ gdk_event_translate (MSG  *msg,
                         GET_X_LPARAM (msg->lParam), GET_Y_LPARAM (msg->lParam)));
 
       assign_object (&window, find_window_for_mouse_event (window, msg));
-
-      if (p_grab_window != NULL)
-       {
-         GdkWindow *real_window = find_real_window_for_grabbed_mouse_event (window, msg);
-
-         if (real_window != current_window)
-           synthesize_crossing_events (real_window, GDK_CROSSING_NORMAL, msg);
-       }
-      else
-       {
-         if (window != current_window)
-           synthesize_crossing_events (window, GDK_CROSSING_NORMAL, msg);
-       }
-
-      if (!propagate (&window, msg,
-                     p_grab_window, p_grab_owner_events, p_grab_mask,
-                     doesnt_want_button_press, TRUE))
-       break;
-
+      /* TODO_CSW?: there used to some synthesize and propagate */
       if (GDK_WINDOW_DESTROYED (window))
        break;
 
-      /* Emulate X11's automatic active grab */
-      if (!p_grab_window)
+      if (pointer_grab == NULL)
        {
-         /* No explicit active grab, let's start one automatically */
-         GDK_NOTE (EVENTS, g_print (" (automatic grab)"));
-         gdk_pointer_grab (window,
-                           FALSE,
-                           ((GdkWindowObject *) window)->event_mask,
-                           NULL, NULL, 0);
-         p_grab_automatic = TRUE;
+         SetCapture (GDK_WINDOW_HWND (window));
        }
 
       generate_button_event (GDK_BUTTON_PRESS, button,
-                            window, orig_window, msg);
+                            window, msg);
 
       return_val = TRUE;
       break;
@@ -2526,56 +2272,104 @@ gdk_event_translate (MSG  *msg,
 
       assign_object (&window, find_window_for_mouse_event (window, msg));
 
-      if (p_grab_window != NULL)
+      if (pointer_grab != NULL && pointer_grab->implicit)
        {
-         GdkWindow *real_window = find_real_window_for_grabbed_mouse_event (window, msg);
+         gint state = build_pointer_event_state (msg);
 
-         if (real_window != current_window)
-           synthesize_crossing_events (real_window, GDK_CROSSING_NORMAL, msg);
-       }
-      else
-       {
-         if (window != current_window)
-           synthesize_crossing_events (window, GDK_CROSSING_NORMAL, msg);
-       }
+         /* We keep the implicit grab until no buttons at all are held down */
+         if ((state & GDK_ANY_BUTTON_MASK & ~(GDK_BUTTON1_MASK << (button - 1))) == 0)
+           {
+             ReleaseCapture ();
 
-#if 0
-      if (((GdkWindowObject *) window)->extension_events != 0 &&
-         _gdk_input_ignore_core)
-       {
-         GDK_NOTE (EVENTS, g_print (" (ignored)"));
-         break;
-       }
-#endif
+             new_window = NULL;
+             hwnd = WindowFromPoint (msg->pt);
+             if (hwnd != NULL)
+               {
+                 POINT client_pt = msg->pt;
 
-      if (!propagate (&window, msg,
-                     p_grab_window, p_grab_owner_events, p_grab_mask,
-                     doesnt_want_button_release, TRUE))
-       {
-       }
-      else if (!GDK_WINDOW_DESTROYED (window))
-       {
-         generate_button_event (GDK_BUTTON_RELEASE, button,
-                                window, orig_window, msg);
+                 ScreenToClient (hwnd, &client_pt);
+                 GetClientRect (hwnd, &rect);
+                 if (PtInRect (&rect, client_pt))
+                   new_window = gdk_win32_handle_table_lookup (hwnd);
+               }
+             synthesize_crossing_events (_gdk_display,
+                                         pointer_grab->native_window, new_window,
+                                         GDK_CROSSING_UNGRAB,
+                                         &msg->pt,
+                                         0, /* TODO: Set right mask */
+                                         msg->time,
+                                         FALSE);
+             assign_object (&mouse_window, new_window);
+             mouse_window_ignored_leave = NULL;
+           }
        }
 
-      if (p_grab_window != NULL &&
-         p_grab_automatic &&
-         (msg->wParam & (MK_LBUTTON | MK_MBUTTON | MK_RBUTTON)) == 0)
-       {
-         /* Terminate automatic grab */
-         gdk_pointer_ungrab (0);
-       }
+      generate_button_event (GDK_BUTTON_RELEASE, button,
+                            window, msg);
 
       return_val = TRUE;
       break;
 
     case WM_MOUSEMOVE:
       GDK_NOTE (EVENTS,
-               g_print (" %#x (%d,%d)",
-                        msg->wParam,
+               g_print (" %p (%d,%d)",
+                        (gpointer) msg->wParam,
                         GET_X_LPARAM (msg->lParam), GET_Y_LPARAM (msg->lParam)));
 
+      new_window = window;
+
+      if (pointer_grab != NULL)
+       {
+         POINT pt;
+         pt = msg->pt;
+
+         new_window = NULL;
+         hwnd = WindowFromPoint (pt);
+         if (hwnd != NULL)
+           {
+             POINT client_pt = pt;
+
+             ScreenToClient (hwnd, &client_pt);
+             GetClientRect (hwnd, &rect);
+             if (PtInRect (&rect, client_pt))
+               new_window = gdk_win32_handle_table_lookup (hwnd);
+           }
+
+         if (!pointer_grab->owner_events &&
+             new_window != NULL &&
+             new_window != pointer_grab->native_window)
+           new_window = NULL;
+       }
+
+      if (mouse_window != new_window)
+       {
+         GDK_NOTE (EVENTS, g_print (" mouse_sinwod %p -> %p",
+                                    mouse_window ? GDK_WINDOW_HWND (mouse_window) : NULL, 
+                                    new_window ? GDK_WINDOW_HWND (new_window) : NULL));
+         synthesize_crossing_events (_gdk_display,
+                                     mouse_window, new_window,
+                                     GDK_CROSSING_NORMAL,
+                                     &msg->pt,
+                                     0, /* TODO: Set right mask */
+                                     msg->time,
+                                     FALSE);
+         assign_object (&mouse_window, new_window);
+         mouse_window_ignored_leave = NULL;
+         if (new_window != NULL)
+           track_mouse_event (TME_LEAVE, GDK_WINDOW_HWND (new_window));
+       }
+      else if (new_window != NULL && 
+              new_window == mouse_window_ignored_leave)
+       {
+         /* If we ignored a leave event for this window and we're now getting
+            input again we need to re-arm the mouse tracking, as that was
+            cancelled by the mouseleave. */
+         mouse_window_ignored_leave = NULL;
+         track_mouse_event (TME_LEAVE, GDK_WINDOW_HWND (new_window));
+       }
+
+      assign_object (&window, find_window_for_mouse_event (window, msg));
+
       /* If we haven't moved, don't create any GDK event. Windows
        * sends WM_MOUSEMOVE messages after a new window is shows under
        * the mouse, even if the mouse hasn't moved. This disturbs gtk.
@@ -2587,64 +2381,24 @@ gdk_event_translate (MSG  *msg,
       current_root_x = msg->pt.x + _gdk_offset_x;
       current_root_y = msg->pt.y + _gdk_offset_y;
 
-      assign_object (&window, find_window_for_mouse_event (window, msg));
-
-      if (p_grab_window != NULL)
+      if (!_gdk_input_ignore_core)
        {
-         GdkWindow *real_window = find_real_window_for_grabbed_mouse_event (window, msg);
+         event = gdk_event_new (GDK_MOTION_NOTIFY);
+         event->motion.window = window;
+         event->motion.time = _gdk_win32_get_next_tick (msg->time);
+         event->motion.x = current_x = (gint16) GET_X_LPARAM (msg->lParam);
+         event->motion.y = current_y = (gint16) GET_Y_LPARAM (msg->lParam);
+         event->motion.x_root = current_root_x;
+         event->motion.y_root = current_root_y;
+         event->motion.axes = NULL;
+         event->motion.state = build_pointer_event_state (msg);
+         event->motion.is_hint = FALSE;
+         gdk_event_set_device (event, device_manager_win32->core_pointer);
+         gdk_event_set_source_device (event, device_manager_win32->system_pointer);
 
-         if (real_window != current_window)
-           {
-             if (p_grab_owner_events)
-               {
-                 synthesize_crossing_events (real_window, GDK_CROSSING_NORMAL, msg);
-               }
-             else if (current_window == p_grab_window)
-               {
-                 synthesize_leave_event (p_grab_window, msg, GDK_CROSSING_NORMAL, GDK_NOTIFY_ANCESTOR);
-                 assign_object (&current_window, _gdk_root);
-               }
-             else if (real_window == p_grab_window)
-               {
-                 synthesize_enter_event (p_grab_window, msg, GDK_CROSSING_NORMAL, GDK_NOTIFY_ANCESTOR);
-                 assign_object (&current_window, p_grab_window);
-               }
-           }
-       }
-      else
-       {
-         if (window != current_window)
-           synthesize_crossing_events (window, GDK_CROSSING_NORMAL, msg);
+         _gdk_win32_append_event (event);
        }
 
-      if (!propagate (&window, msg,
-                     p_grab_window, p_grab_owner_events, p_grab_mask,
-                     doesnt_want_button_motion, TRUE))
-       break;
-
-      if (GDK_WINDOW_DESTROYED (window))
-       break;
-
-      if (window != orig_window)
-       translate_mouse_coords (orig_window, window, msg);
-
-      event = gdk_event_new (GDK_MOTION_NOTIFY);
-      event->motion.window = window;
-      event->motion.time = _gdk_win32_get_next_tick (msg->time);
-      event->motion.x = current_x = (gint16) GET_X_LPARAM (msg->lParam);
-      event->motion.y = current_y = (gint16) GET_Y_LPARAM (msg->lParam);
-      _gdk_windowing_window_get_offsets (window, &xoffset, &yoffset);
-      event->motion.x += xoffset;
-      event->motion.y += yoffset;
-      event->motion.x_root = current_root_x;
-      event->motion.y_root = current_root_y;
-      event->motion.axes = NULL;
-      event->motion.state = build_pointer_event_state (msg);
-      event->motion.is_hint = FALSE;
-      event->motion.device = _gdk_display->core_pointer;
-
-      append_event (event);
-
       return_val = TRUE;
       break;
 
@@ -2652,42 +2406,52 @@ gdk_event_translate (MSG  *msg,
       GDK_NOTE (EVENTS,
                g_print (" (%d,%d)",
                         GET_X_LPARAM (msg->lParam), GET_Y_LPARAM (msg->lParam)));
-      if (current_window != NULL &&
-         (((GdkWindowObject *) current_window)->event_mask & GDK_LEAVE_NOTIFY_MASK))
-       {
-         synthesize_crossing_events (_gdk_root, GDK_CROSSING_NORMAL, msg);
-       }
-
       break;
 
     case WM_MOUSELEAVE:
       GDK_NOTE (EVENTS, g_print (" %d (%ld,%ld)",
                                 HIWORD (msg->wParam), msg->pt.x, msg->pt.y));
 
-      if (!gdk_win32_handle_table_lookup ((GdkNativeWindow) WindowFromPoint (msg->pt)))
+      new_window = NULL;
+      hwnd = WindowFromPoint (msg->pt);
+      ignore_leave = FALSE;
+      if (hwnd != NULL)
        {
-         GdkNotifyType detail;
+         char classname[64];
 
-         if (GDK_WINDOW_TYPE (current_window) != GDK_WINDOW_CHILD)
-           detail = GDK_NOTIFY_ANCESTOR;
-         else
-           detail = GDK_NOTIFY_UNKNOWN;
+         POINT client_pt = msg->pt;
 
-         /* we are only interested if we don't know the new window */
-         synthesize_enter_or_leave_event (current_window, msg, 
-                                          GDK_LEAVE_NOTIFY, GDK_CROSSING_NORMAL, detail,
-                                          current_x, current_y);
-         assign_object (&current_window, _gdk_root);
-       }
-      else
-       {
-         GDK_NOTE (EVENTS, g_print (" (ignored)"));
+         /* The synapitics trackpad drivers have this irritating
+            feature where it pops up a window right under the pointer
+            when you scroll. We ignore the leave and enter events for 
+            this window */
+         if (GetClassNameA (hwnd, classname, sizeof(classname)) &&
+             strcmp (classname, SYNAPSIS_ICON_WINDOW_CLASS) == 0)
+           ignore_leave = TRUE;
+
+         ScreenToClient (hwnd, &client_pt);
+         GetClientRect (hwnd, &rect);
+         if (PtInRect (&rect, client_pt))
+           new_window = gdk_win32_handle_table_lookup (hwnd);
        }
+
+      if (!ignore_leave)
+       synthesize_crossing_events (_gdk_display,
+                                   mouse_window, new_window,
+                                   GDK_CROSSING_NORMAL,
+                                   &msg->pt,
+                                   0, /* TODO: Set right mask */
+                                   msg->time,
+                                   FALSE);
+      assign_object (&mouse_window, new_window);
+      mouse_window_ignored_leave = ignore_leave ? new_window : NULL;
+
+
       return_val = TRUE;
       break;
 
     case WM_MOUSEWHEEL:
-      GDK_NOTE (EVENTS, g_print (" %d", HIWORD (msg->wParam)));
+      GDK_NOTE (EVENTS, g_print (" %d", (short) HIWORD (msg->wParam)));
 
       /* WM_MOUSEWHEEL is delivered to the focus window. Work around
        * that. Also, the position is in screen coordinates, not client
@@ -2699,9 +2463,33 @@ gdk_event_translate (MSG  *msg,
 
       if ((hwnd = WindowFromPoint (point)) == NULL)
        break;
+      
+      {
+       char classname[64];
+
+       /* The synapitics trackpad drivers have this irritating
+          feature where it pops up a window right under the pointer
+          when you scroll. We backtrack and to the toplevel and
+          find the innermost child instead. */
+       if (GetClassNameA (hwnd, classname, sizeof(classname)) &&
+           strcmp (classname, SYNAPSIS_ICON_WINDOW_CLASS) == 0)
+         {
+           HWND hwndc;
+
+           /* Find our toplevel window */
+           hwnd = GetAncestor (msg->hwnd, GA_ROOT);
+
+           /* Walk back up to the outermost child at the desired point */
+           do {
+             ScreenToClient (hwnd, &point);
+             hwndc = ChildWindowFromPoint (hwnd, point);
+             ClientToScreen (hwnd, &point);
+           } while (hwndc != hwnd && (hwnd = hwndc, 1));
+         }
+      }
 
       msg->hwnd = hwnd;
-      if ((new_window = gdk_win32_handle_table_lookup ((GdkNativeWindow) msg->hwnd)) == NULL)
+      if ((new_window = gdk_win32_handle_table_lookup (msg->hwnd)) == NULL)
        break;
 
       if (new_window != window)
@@ -2709,14 +2497,6 @@ gdk_event_translate (MSG  *msg,
          assign_object (&window, new_window);
        }
 
-      if (!propagate (&window, msg,
-                     p_grab_window, p_grab_owner_events, p_grab_mask,
-                     doesnt_want_scroll, TRUE))
-       break;
-
-      if (GDK_WINDOW_DESTROYED (window))
-       break;
-
       ScreenToClient (msg->hwnd, &point);
 
       event = gdk_event_new (GDK_SCROLL);
@@ -2724,93 +2504,95 @@ gdk_event_translate (MSG  *msg,
       event->scroll.direction = (((short) HIWORD (msg->wParam)) > 0) ?
        GDK_SCROLL_UP : GDK_SCROLL_DOWN;
       event->scroll.time = _gdk_win32_get_next_tick (msg->time);
-      _gdk_windowing_window_get_offsets (window, &xoffset, &yoffset);
-      event->scroll.x = (gint16) point.x + xoffset;
-      event->scroll.y = (gint16) point.y + yoffset;
+      event->scroll.x = (gint16) point.x;
+      event->scroll.y = (gint16) point.y;
       event->scroll.x_root = (gint16) GET_X_LPARAM (msg->lParam) + _gdk_offset_x;
       event->scroll.y_root = (gint16) GET_Y_LPARAM (msg->lParam) + _gdk_offset_y;
       event->scroll.state = build_pointer_event_state (msg);
-      event->scroll.device = _gdk_display->core_pointer;
+      gdk_event_set_device (event, device_manager_win32->core_pointer);
+      gdk_event_set_source_device (event, device_manager_win32->system_pointer);
 
-      append_event (event);
+      _gdk_win32_append_event (event);
       
       return_val = TRUE;
       break;
 
-    case WM_QUERYNEWPALETTE:
-      if (gdk_visual_get_system ()->type == GDK_VISUAL_PSEUDO_COLOR)
-       {
-         synthesize_expose_events (window);
-         update_colors_counter = 0;
-       }
-      return_val = TRUE;
+    case WM_HSCROLL:
+      /* Just print more debugging information, don't actually handle it. */
+      GDK_NOTE (EVENTS,
+               (g_print (" %s",
+                         (LOWORD (msg->wParam) == SB_ENDSCROLL ? "ENDSCROLL" :
+                          (LOWORD (msg->wParam) == SB_LEFT ? "LEFT" :
+                           (LOWORD (msg->wParam) == SB_RIGHT ? "RIGHT" :
+                            (LOWORD (msg->wParam) == SB_LINELEFT ? "LINELEFT" :
+                             (LOWORD (msg->wParam) == SB_LINERIGHT ? "LINERIGHT" :
+                              (LOWORD (msg->wParam) == SB_PAGELEFT ? "PAGELEFT" :
+                               (LOWORD (msg->wParam) == SB_PAGERIGHT ? "PAGERIGHT" :
+                                (LOWORD (msg->wParam) == SB_THUMBPOSITION ? "THUMBPOSITION" :
+                                 (LOWORD (msg->wParam) == SB_THUMBTRACK ? "THUMBTRACK" :
+                                  "???")))))))))),
+                (LOWORD (msg->wParam) == SB_THUMBPOSITION ||
+                 LOWORD (msg->wParam) == SB_THUMBTRACK) ?
+                (g_print (" %d", HIWORD (msg->wParam)), 0) : 0));
       break;
 
-    case WM_PALETTECHANGED:
-      GDK_NOTE (EVENTS_OR_COLORMAP, g_print (" %p", (HWND) msg->wParam));
-      if (gdk_visual_get_system ()->type != GDK_VISUAL_PSEUDO_COLOR)
-       break;
-
-      return_val = TRUE;
-
-      if (msg->hwnd == (HWND) msg->wParam)
-       break;
-
-      if (++update_colors_counter == 5)
-       {
-         synthesize_expose_events (window);
-         update_colors_counter = 0;
-         break;
-       }
-      
-      update_colors (window, TRUE);
+    case WM_VSCROLL:
+      /* Just print more debugging information, don't actually handle it. */
+      GDK_NOTE (EVENTS,
+               (g_print (" %s",
+                         (LOWORD (msg->wParam) == SB_ENDSCROLL ? "ENDSCROLL" :
+                          (LOWORD (msg->wParam) == SB_BOTTOM ? "BOTTOM" :
+                           (LOWORD (msg->wParam) == SB_TOP ? "TOP" :
+                            (LOWORD (msg->wParam) == SB_LINEDOWN ? "LINDOWN" :
+                             (LOWORD (msg->wParam) == SB_LINEUP ? "LINEUP" :
+                              (LOWORD (msg->wParam) == SB_PAGEDOWN ? "PAGEDOWN" :
+                               (LOWORD (msg->wParam) == SB_PAGEUP ? "PAGEUP" :
+                                (LOWORD (msg->wParam) == SB_THUMBPOSITION ? "THUMBPOSITION" :
+                                 (LOWORD (msg->wParam) == SB_THUMBTRACK ? "THUMBTRACK" :
+                                  "???")))))))))),
+                (LOWORD (msg->wParam) == SB_THUMBPOSITION ||
+                 LOWORD (msg->wParam) == SB_THUMBTRACK) ?
+                (g_print (" %d", HIWORD (msg->wParam)), 0) : 0));
       break;
 
      case WM_MOUSEACTIVATE:
        {
-        GdkWindow *tmp;
-
         if (gdk_window_get_window_type (window) == GDK_WINDOW_TEMP 
-            || !((GdkWindowObject *)window)->accept_focus)
+            || !window->accept_focus)
           {
             *ret_valp = MA_NOACTIVATE;
             return_val = TRUE;
           }
 
-        tmp = _gdk_modal_current ();
-
-        if (tmp != NULL)
+        if (_gdk_modal_blocked (gdk_window_get_toplevel (window)))
           {
-            if (gdk_window_get_toplevel (window) != tmp)
-              {
-                *ret_valp = MA_NOACTIVATEANDEAT;
-                return_val = TRUE;
-              }
+            *ret_valp = MA_NOACTIVATEANDEAT;
+            return_val = TRUE;
           }
        }
 
        break;
 
     case WM_KILLFOCUS:
-      if (p_grab_window != NULL && !GDK_WINDOW_DESTROYED (p_grab_window))
-       generate_grab_broken_event (p_grab_window, FALSE, NULL);
-
-      if (k_grab_window != NULL && !GDK_WINDOW_DESTROYED (k_grab_window) 
-         && k_grab_window != p_grab_window)
-       generate_grab_broken_event (k_grab_window, TRUE, NULL);
+      if (keyboard_grab != NULL &&
+         !GDK_WINDOW_DESTROYED (keyboard_grab->window))
+       {
+         generate_grab_broken_event (device_manager, keyboard_grab->window, TRUE, NULL);
+       }
 
       /* fallthrough */
     case WM_SETFOCUS:
-      if (k_grab_window != NULL && !k_grab_owner_events)
+      if (keyboard_grab != NULL &&
+         !keyboard_grab->owner_events)
        break;
 
-      if (!(((GdkWindowObject *) window)->event_mask & GDK_FOCUS_CHANGE_MASK))
+      if (!(window->event_mask & GDK_FOCUS_CHANGE_MASK))
        break;
 
       if (GDK_WINDOW_DESTROYED (window))
        break;
 
-      generate_focus_event (window, (msg->message == WM_SETFOCUS));
+      generate_focus_event (device_manager, window, (msg->message == WM_SETFOCUS));
       return_val = TRUE;
       break;
 
@@ -2824,6 +2606,12 @@ gdk_event_translate (MSG  *msg,
       *ret_valp = 1;
       break;
 
+    case WM_SYNCPAINT:
+      sync_timer = SetTimer (GDK_WINDOW_HWND (window),
+                            1,
+                            200, sync_timer_proc);
+      break;
+
     case WM_PAINT:
       handle_wm_paint (msg, window, FALSE, NULL);
       break;
@@ -2832,13 +2620,16 @@ gdk_event_translate (MSG  *msg,
       GDK_NOTE (EVENTS, g_print (" %#x %#x",
                                 LOWORD (msg->lParam), HIWORD (msg->lParam)));
 
-      if (p_grab_window == NULL && LOWORD (msg->lParam) != HTCLIENT)
+      if (pointer_grab != NULL)
+        grab_window = pointer_grab->window;
+
+      if (grab_window == NULL && LOWORD (msg->lParam) != HTCLIENT)
        break;
 
-      if (p_grab_window != NULL && p_grab_cursor != NULL)
-       hcursor = p_grab_cursor;
+      if (grab_window != NULL && _gdk_win32_grab_cursor != NULL)
+       hcursor = _gdk_win32_grab_cursor;
       else if (!GDK_WINDOW_DESTROYED (window))
-       hcursor = GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl)->hcursor;
+       hcursor = GDK_WINDOW_IMPL_WIN32 (window->impl)->hcursor;
       else
        hcursor = NULL;
 
@@ -2851,159 +2642,183 @@ gdk_event_translate (MSG  *msg,
        }
       break;
 
-    case WM_SHOWWINDOW:
-      GDK_NOTE (EVENTS, g_print (" %d", msg->wParam));
-
-      if (!(((GdkWindowObject *) window)->event_mask & GDK_STRUCTURE_MASK))
-       break;
+    case WM_SYSCOMMAND:
+      switch (msg->wParam)
+       {
+       case SC_MINIMIZE:
+       case SC_RESTORE:
+         do_show_window (window, msg->wParam == SC_MINIMIZE ? TRUE : FALSE);
+         break;
+       }
 
-      if (msg->lParam == SW_OTHERUNZOOM ||
-         msg->lParam == SW_OTHERZOOM)
-       break;
+      break;
 
-      if (GDK_WINDOW_DESTROYED (window))
-       break;
+    case WM_ENTERSIZEMOVE:
+    case WM_ENTERMENULOOP:
+      if (msg->message == WM_ENTERSIZEMOVE)
+       _modal_move_resize_window = msg->hwnd;
 
-      event = gdk_event_new (msg->wParam ? GDK_MAP : GDK_UNMAP);
-      event->any.window = window;
+      _gdk_win32_begin_modal_call ();
+      break;
 
-      append_event (event);
+    case WM_EXITSIZEMOVE:
+    case WM_EXITMENULOOP:
+      if (_modal_operation_in_progress)
+       {
+         _modal_move_resize_window = NULL;
+         _gdk_win32_end_modal_call ();
+       }
+      break;
 
-      if (event->any.type == GDK_UNMAP)
+    case WM_CAPTURECHANGED:
+      /* Sometimes we don't get WM_EXITSIZEMOVE, for instance when you
+        select move/size in the menu and then click somewhere without
+        moving/resizing. We work around this using WM_CAPTURECHANGED. */
+      if (_modal_operation_in_progress)
        {
-         impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
+         _modal_move_resize_window = NULL;
+         _gdk_win32_end_modal_call ();
+       }
+      break;
 
-         if (impl->transient_owner && GetForegroundWindow () == GDK_WINDOW_HWND (window))
-           {
-             SetForegroundWindow (GDK_WINDOW_HWND (impl->transient_owner));
-           }
+    case WM_WINDOWPOSCHANGING:
+      GDK_NOTE (EVENTS, (windowpos = (WINDOWPOS *) msg->lParam,
+                        g_print (" %s %s %dx%d@%+d%+d now below %p",
+                                 _gdk_win32_window_pos_bits_to_string (windowpos->flags),
+                                 (windowpos->hwndInsertAfter == HWND_BOTTOM ? "BOTTOM" :
+                                  (windowpos->hwndInsertAfter == HWND_NOTOPMOST ? "NOTOPMOST" :
+                                   (windowpos->hwndInsertAfter == HWND_TOP ? "TOP" :
+                                    (windowpos->hwndInsertAfter == HWND_TOPMOST ? "TOPMOST" :
+                                     (sprintf (buf, "%p", windowpos->hwndInsertAfter),
+                                      buf))))),
+                                 windowpos->cx, windowpos->cy, windowpos->x, windowpos->y,
+                                 GetNextWindow (msg->hwnd, GW_HWNDPREV))));
 
-         if (p_grab_window == window)
-           {
-             gdk_pointer_ungrab (msg->time);
-           }
+      if (GDK_WINDOW_IS_MAPPED (window))
+       return_val = ensure_stacking_on_window_pos_changing (msg, window);
+      break;
 
-         if (k_grab_window == window)
+    case WM_WINDOWPOSCHANGED:
+      windowpos = (WINDOWPOS *) msg->lParam;
+      GDK_NOTE (EVENTS, g_print (" %s %s %dx%d@%+d%+d",
+                                _gdk_win32_window_pos_bits_to_string (windowpos->flags),
+                                (windowpos->hwndInsertAfter == HWND_BOTTOM ? "BOTTOM" :
+                                 (windowpos->hwndInsertAfter == HWND_NOTOPMOST ? "NOTOPMOST" :
+                                  (windowpos->hwndInsertAfter == HWND_TOP ? "TOP" :
+                                   (windowpos->hwndInsertAfter == HWND_TOPMOST ? "TOPMOST" :
+                                    (sprintf (buf, "%p", windowpos->hwndInsertAfter),
+                                     buf))))),
+                                windowpos->cx, windowpos->cy, windowpos->x, windowpos->y));
+
+      /* Break grabs on unmap or minimize */
+      if (windowpos->flags & SWP_HIDEWINDOW || 
+         ((windowpos->flags & SWP_STATECHANGED) && IsIconic (msg->hwnd)))
+       {
+         if (pointer_grab != NULL)
            {
-             gdk_keyboard_ungrab (msg->time);
+             if (pointer_grab->window == window)
+               gdk_pointer_ungrab (msg->time);
            }
-       }
-
-      return_val = TRUE;
-      break;
 
-    case WM_SYSCOMMAND:
+         if (keyboard_grab != NULL &&
+             keyboard_grab->window == window)
+           gdk_keyboard_ungrab (msg->time);
+       }
 
-      switch (msg->wParam)
+      /* Send MAP events  */
+      if ((windowpos->flags & SWP_SHOWWINDOW) &&
+         !GDK_WINDOW_DESTROYED (window))
        {
-       case SC_MINIMIZE:
-       case SC_RESTORE:
-         show_window_internal (window, msg->wParam == SC_MINIMIZE ? TRUE : FALSE);
-         break;
+         event = gdk_event_new (GDK_MAP);
+         event->any.window = window;
+         _gdk_win32_append_event (event);
        }
 
-      break;
-
-    case WM_SIZE:
-      GDK_NOTE (EVENTS,
-               g_print (" %s %dx%d",
-                        (msg->wParam == SIZE_MAXHIDE ? "MAXHIDE" :
-                         (msg->wParam == SIZE_MAXIMIZED ? "MAXIMIZED" :
-                          (msg->wParam == SIZE_MAXSHOW ? "MAXSHOW" :
-                           (msg->wParam == SIZE_MINIMIZED ? "MINIMIZED" :
-                            (msg->wParam == SIZE_RESTORED ? "RESTORED" : "?"))))),
-                        LOWORD (msg->lParam), HIWORD (msg->lParam)));
-
-      if (msg->wParam == SIZE_MINIMIZED)
+      /* Update window state */
+      if (windowpos->flags & (SWP_STATECHANGED | SWP_SHOWWINDOW | SWP_HIDEWINDOW))
        {
-         /* Don't generate any GDK event. This is *not* an UNMAP. */
+         GdkWindowState set_bits, unset_bits, old_state, new_state;
 
-         if (p_grab_window == window)
-           gdk_pointer_ungrab (msg->time);
+         old_state = window->state;
 
-         if (k_grab_window == window)
-           gdk_keyboard_ungrab (msg->time);
+         set_bits = 0;
+         unset_bits = 0;
 
-         gdk_synthesize_window_state (window,
-                                      GDK_WINDOW_STATE_WITHDRAWN,
-                                      GDK_WINDOW_STATE_ICONIFIED);
-         show_window_internal (window, TRUE);
-       }
-      else if ((msg->wParam == SIZE_RESTORED ||
-               msg->wParam == SIZE_MAXIMIZED) &&
-              GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD)
-       {
-         GdkWindowState withdrawn_bit =
-           IsWindowVisible (msg->hwnd) ? GDK_WINDOW_STATE_WITHDRAWN : 0;
+         if (IsWindowVisible (msg->hwnd))
+           unset_bits |= GDK_WINDOW_STATE_WITHDRAWN;
+         else
+           set_bits |= GDK_WINDOW_STATE_WITHDRAWN;
 
-         if (!GDK_WINDOW_DESTROYED (window))
-           handle_configure_event (msg, window);
-         
-         if (msg->wParam == SIZE_RESTORED)
-           {
-             gdk_synthesize_window_state (window,
-                                          GDK_WINDOW_STATE_ICONIFIED |
-                                          GDK_WINDOW_STATE_MAXIMIZED |
-                                          withdrawn_bit,
-                                          0);
+         if (IsIconic (msg->hwnd))
+           set_bits |= GDK_WINDOW_STATE_ICONIFIED;
+         else
+           unset_bits |= GDK_WINDOW_STATE_ICONIFIED;
 
-             if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_TEMP && !GDK_WINDOW_IS_MAPPED (window))
-               {
-                 show_window_internal (window, FALSE);
-               }
-           }
-         else if (msg->wParam == SIZE_MAXIMIZED)
-           {
-             gdk_synthesize_window_state (window,
-                                          GDK_WINDOW_STATE_ICONIFIED |
-                                          withdrawn_bit,
-                                          GDK_WINDOW_STATE_MAXIMIZED);
-           }
+         if (IsZoomed (msg->hwnd))
+           set_bits |= GDK_WINDOW_STATE_MAXIMIZED;
+         else
+           unset_bits |= GDK_WINDOW_STATE_MAXIMIZED;
 
-         if (((GdkWindowObject *) window)->resize_count > 1)
-           ((GdkWindowObject *) window)->resize_count -= 1;
-         
-         if (((GdkWindowObject *) window)->extension_events != 0)
-           _gdk_input_configure_event (window);
+         gdk_synthesize_window_state (window, unset_bits, set_bits);
 
-         return_val = TRUE;
-       }
-      break;
+         new_state = window->state;
 
-    case WM_ENTERSIZEMOVE:
-      _sizemove_in_progress = TRUE;
-      resize_timer = SetTimer (NULL, 0, 20, resize_timer_proc);
-      break;
+         /* Whenever one window changes iconified state we need to also
+          * change the iconified state in all transient related windows,
+          * as windows doesn't give icons for transient childrens. 
+          */
+         if ((old_state & GDK_WINDOW_STATE_ICONIFIED) != 
+             (new_state & GDK_WINDOW_STATE_ICONIFIED))
+           do_show_window (window, (new_state & GDK_WINDOW_STATE_ICONIFIED));
 
-    case WM_EXITSIZEMOVE:
-      _sizemove_in_progress = FALSE;
-      KillTimer (NULL, resize_timer);
-      break;
 
-    case WM_WINDOWPOSCHANGED :
-      /* Once we've entered the moving or sizing modal loop, we won't
-       * return to the main loop until we're done sizing or moving.
-       */
-      if (_sizemove_in_progress &&
-        GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&
-        !GDK_WINDOW_DESTROYED (window))
+         /* When un-minimizing, make sure we're stacked under any 
+            transient-type windows. */
+         if (!(old_state & GDK_WINDOW_STATE_ICONIFIED) &&
+             (new_state & GDK_WINDOW_STATE_ICONIFIED))
+           ensure_stacking_on_unminimize (msg);
+       }
+
+      /* Show, New size or position => configure event */
+      if (!(windowpos->flags & SWP_NOCLIENTMOVE) ||
+         !(windowpos->flags & SWP_NOCLIENTSIZE) ||
+         (windowpos->flags & SWP_SHOWWINDOW))
        {
-         if (((GdkWindowObject *) window)->event_mask & GDK_STRUCTURE_MASK)
-           {
-             if (((GdkWindowObject *) window)->resize_count > 1)
-               ((GdkWindowObject *) window)->resize_count -= 1;
-             
-             handle_configure_event (msg, window);
-             g_main_context_iteration (NULL, FALSE);
+         if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&
+             !IsIconic (msg->hwnd) &&
+             !GDK_WINDOW_DESTROYED (window))
+           _gdk_win32_emit_configure_event (window);
+       }
 
-             /* Dispatch main loop - to realize resizes... */
-             handle_stuff_while_moving_or_resizing ();
-             
-             /* Claim as handled, so that WM_SIZE and WM_MOVE are avoided */
-             return_val = TRUE;
-             *ret_valp = 1;
-           }
+      if ((windowpos->flags & SWP_HIDEWINDOW) &&
+         !GDK_WINDOW_DESTROYED (window))
+       {
+         /* Send UNMAP events  */
+         event = gdk_event_new (GDK_UNMAP);
+         event->any.window = window;
+         _gdk_win32_append_event (event);
+
+         /* Make transient parent the forground window when window unmaps */
+         impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
+
+         if (impl->transient_owner &&
+             GetForegroundWindow () == GDK_WINDOW_HWND (window))
+           SetForegroundWindow (GDK_WINDOW_HWND (impl->transient_owner));
+       }
+
+      if (!(windowpos->flags & SWP_NOCLIENTSIZE))
+       {
+         if (window->resize_count > 1)
+           window->resize_count -= 1;
        }
+
+      /* Call modal timer immediate so that we repaint faster after a resize. */
+      if (_modal_operation_in_progress)
+       modal_timer_proc (0,0,0,0);
+
+      /* Claim as handled, so that WM_SIZE and WM_MOVE are avoided */
+      return_val = TRUE;
+      *ret_valp = 0;
       break;
 
     case WM_SIZING:
@@ -3023,7 +2838,7 @@ gdk_event_translate (MSG  *msg,
                                 _gdk_win32_rect_to_string (&rect),
                                 _gdk_win32_rect_to_string (drag)));
 
-      impl = GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl);
+      impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
       orig_drag = *drag;
       if (impl->hint_flags & GDK_HINT_RESIZE_INC)
        {
@@ -3226,7 +3041,7 @@ gdk_event_translate (MSG  *msg,
       if (GDK_WINDOW_DESTROYED (window))
        break;
 
-      impl = GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl);
+      impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
       mmi = (MINMAXINFO*) msg->lParam;
       GDK_NOTE (EVENTS, g_print (" (mintrack:%ldx%ld maxtrack:%ldx%ld "
                                 "maxpos:%+ld%+ld maxsize:%ldx%ld)",
@@ -3275,20 +3090,9 @@ gdk_event_translate (MSG  *msg,
                                     mmi->ptMaxSize.x, mmi->ptMaxSize.y));
          return_val = TRUE;
        }
-      break;
-
-    case WM_MOVE:
-      GDK_NOTE (EVENTS, g_print (" (%d,%d)",
-                                GET_X_LPARAM (msg->lParam), GET_Y_LPARAM (msg->lParam)));
-
-      if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&
-         !IsIconic (msg->hwnd))
-       {
-         if (!GDK_WINDOW_DESTROYED (window))
-           handle_configure_event (msg, window);
-
-         return_val = TRUE;
-       }
+      mmi->ptMaxTrackSize.x = 30000;
+      mmi->ptMaxTrackSize.y = 30000;
+      return_val = TRUE;
       break;
 
     case WM_CLOSE:
@@ -3298,9 +3102,9 @@ gdk_event_translate (MSG  *msg,
       event = gdk_event_new (GDK_DELETE);
       event->any.window = window;
 
-      append_event (event);
+      _gdk_win32_append_event (event);
 
-      impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
+      impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
 
       if (impl->transient_owner && GetForegroundWindow() == GDK_WINDOW_HWND (window))
        {
@@ -3310,14 +3114,15 @@ gdk_event_translate (MSG  *msg,
       return_val = TRUE;
       break;
 
-    case WM_DESTROY:
-      if (window == current_window)
-       assign_object (&current_window, _gdk_root);
-
-      if (p_grab_window == window)
-       gdk_pointer_ungrab (msg->time);
+    case WM_NCDESTROY:
+      if (pointer_grab != NULL)
+       {
+         if (pointer_grab->window == window)
+           gdk_pointer_ungrab (msg->time);
+       }
 
-      if (k_grab_window == window)
+      if (keyboard_grab &&
+          keyboard_grab->window == window)
        gdk_keyboard_ungrab (msg->time);
 
       if ((window != NULL) && (msg->hwnd != GetDesktopWindow ()))
@@ -3329,7 +3134,7 @@ gdk_event_translate (MSG  *msg,
       event = gdk_event_new (GDK_DESTROY);
       event->any.window = window;
 
-      append_event (event);
+      _gdk_win32_append_event (event);
 
       return_val = TRUE;
       break;
@@ -3345,7 +3150,7 @@ gdk_event_translate (MSG  *msg,
          event->selection.window = window;
          event->selection.selection = GDK_SELECTION_CLIPBOARD;
          event->selection.time = _gdk_win32_get_next_tick (msg->time);
-          append_event (event);
+          _gdk_win32_append_event (event);
        }
       else
        {
@@ -3365,59 +3170,67 @@ gdk_event_translate (MSG  *msg,
        }
 
       /* We need to render to clipboard immediately, don't call
-       * append_event()
+       * _gdk_win32_append_event()
        */
-      if (_gdk_event_func)
-       {
-         event = gdk_event_new (GDK_SELECTION_REQUEST);
-         event->selection.window = window;
-         event->selection.send_event = FALSE;
-         event->selection.selection = GDK_SELECTION_CLIPBOARD;
-         event->selection.target = target;
-         event->selection.property = _gdk_selection_property;
-         event->selection.requestor = (guint32) msg->hwnd;
-         event->selection.time = msg->time;
-
-         fixup_event (event);
-         GDK_NOTE (EVENTS, g_print (" (calling gdk_event_func)"));
-         GDK_NOTE (EVENTS, print_event (event));
-         (*_gdk_event_func) (event, _gdk_event_data);
-         gdk_event_free (event);
+      event = gdk_event_new (GDK_SELECTION_REQUEST);
+      event->selection.window = window;
+      event->selection.send_event = FALSE;
+      event->selection.selection = GDK_SELECTION_CLIPBOARD;
+      event->selection.target = target;
+      event->selection.property = _gdk_selection;
+      event->selection.requestor = gdk_win32_handle_table_lookup (msg->hwnd);
+      event->selection.time = msg->time;
 
-         /* Now the clipboard owner should have rendered */
-         if (!_delayed_rendering_data)
-           {
-             GDK_NOTE (EVENTS, g_print (" (no _delayed_rendering_data?)"));
-           }
-         else
-           {
-             if (msg->wParam == CF_DIB)
-               {
-                 _delayed_rendering_data =
-                   _gdk_win32_selection_convert_to_dib (_delayed_rendering_data,
-                                                        target);
-                 if (!_delayed_rendering_data)
-                   {
-                     g_warning ("Cannot convert to DIB from delayed rendered image");
-                     break;
-                   }
-               }
+      fixup_event (event);
+      GDK_NOTE (EVENTS, g_print (" (calling _gdk_event_emit)"));
+      GDK_NOTE (EVENTS, _gdk_win32_print_event (event));
+      _gdk_event_emit (event);
+      gdk_event_free (event);
 
-             /* The requestor is holding the clipboard, no
-              * OpenClipboard() is required/possible
-              */
-             API_CALL (SetClipboardData, (msg->wParam, _delayed_rendering_data));
-             _delayed_rendering_data = NULL;
-           }
-       }
+      /* Now the clipboard owner should have rendered */
+      if (!_delayed_rendering_data)
+        {
+          GDK_NOTE (EVENTS, g_print (" (no _delayed_rendering_data?)"));
+        }
+      else
+        {
+          if (msg->wParam == CF_DIB)
+            {
+              _delayed_rendering_data =
+                _gdk_win32_selection_convert_to_dib (_delayed_rendering_data,
+                                                     target);
+              if (!_delayed_rendering_data)
+                {
+                  g_warning ("Cannot convert to DIB from delayed rendered image");
+                  break;
+                }
+            }
+
+          /* The requestor is holding the clipboard, no
+           * OpenClipboard() is required/possible
+           */
+          GDK_NOTE (DND,
+                    g_print (" SetClipboardData(%s,%p)",
+                             _gdk_win32_cf_to_string (msg->wParam),
+                             _delayed_rendering_data));
+
+          API_CALL (SetClipboardData, (msg->wParam, _delayed_rendering_data));
+          _delayed_rendering_data = NULL;
+        }
       break;
 
     case WM_ACTIVATE:
-
+      GDK_NOTE (EVENTS, g_print (" %s%s %p",
+                                (LOWORD (msg->wParam) == WA_ACTIVE ? "ACTIVE" :
+                                 (LOWORD (msg->wParam) == WA_CLICKACTIVE ? "CLICKACTIVE" :
+                                  (LOWORD (msg->wParam) == WA_INACTIVE ? "INACTIVE" : "???"))),
+                                HIWORD (msg->wParam) ? " minimized" : "",
+                                (HWND) msg->lParam));
       /* We handle mouse clicks for modally-blocked windows under WM_MOUSEACTIVATE,
        * but we still need to deal with alt-tab, or with SetActiveWindow() type
-       * situations. */
-      if (is_modally_blocked (window) && msg->wParam == WA_ACTIVE)
+       * situations.
+       */
+      if (_gdk_modal_blocked (window) && LOWORD (msg->wParam) == WA_ACTIVE)
        {
          GdkWindow *modal_current = _gdk_modal_current ();
          SetActiveWindow (GDK_WINDOW_HWND (modal_current));
@@ -3426,6 +3239,11 @@ gdk_event_translate (MSG  *msg,
          break;
        }
 
+      if (LOWORD (msg->wParam) == WA_INACTIVE)
+       gdk_synthesize_window_state (window, GDK_WINDOW_STATE_FOCUSED, 0);
+      else
+       gdk_synthesize_window_state (window, 0, GDK_WINDOW_STATE_FOCUSED);
+
       /* Bring any tablet contexts to the top of the overlap order when
        * one of our windows is activated.
        * NOTE: It doesn't seem to work well if it is done in WM_ACTIVATEAPP
@@ -3435,24 +3253,31 @@ gdk_event_translate (MSG  *msg,
        _gdk_input_set_tablet_active ();
       break;
 
+    case WM_ACTIVATEAPP:
+      GDK_NOTE (EVENTS, g_print (" %s thread: %I64d",
+                                msg->wParam ? "YES" : "NO",
+                                (gint64) msg->lParam));
+      if (msg->wParam && GDK_WINDOW_IS_MAPPED (window))
+       ensure_stacking_on_activate_app (msg, window);
+      break;
 
       /* Handle WINTAB events here, as we know that gdkinput.c will
        * use the fixed WT_DEFBASE as lcMsgBase, and we thus can use the
        * constants as case labels.
        */
     case WT_PACKET:
-      GDK_NOTE (EVENTS, g_print (" %d %#lx",
-                                msg->wParam, msg->lParam));
+      GDK_NOTE (EVENTS, g_print (" %d %p",
+                                (int) msg->wParam, (gpointer) msg->lParam));
       goto wintab;
       
     case WT_CSRCHANGE:
-      GDK_NOTE (EVENTS, g_print (" %d %#lx",
-                                msg->wParam, msg->lParam));
+      GDK_NOTE (EVENTS, g_print (" %d %p",
+                                (int) msg->wParam, (gpointer) msg->lParam));
       goto wintab;
       
     case WT_PROXIMITY:
-      GDK_NOTE (EVENTS, g_print (" %#x %d %d",
-                                msg->wParam,
+      GDK_NOTE (EVENTS, g_print (" %p %d %d",
+                                (gpointer) msg->wParam,
                                 LOWORD (msg->lParam),
                                 HIWORD (msg->lParam)));
       /* Fall through */
@@ -3463,7 +3288,7 @@ gdk_event_translate (MSG  *msg,
       g_object_ref (window);
 
       if (_gdk_input_other_event (event, msg, window))
-       append_event (event);
+       _gdk_win32_append_event (event);
       else
        gdk_event_free (event);
 
@@ -3480,7 +3305,7 @@ done:
 }
 
 void
-_gdk_events_queue (GdkDisplay *display)
+_gdk_win32_display_queue_events (GdkDisplay *display)
 {
   MSG msg;
 
@@ -3499,18 +3324,20 @@ static gboolean
 gdk_event_prepare (GSource *source,
                   gint    *timeout)
 {
-  MSG msg;
   gboolean retval;
 
-  GDK_THREADS_ENTER ();
+  gdk_threads_enter ();
 
   *timeout = -1;
 
-  retval = (_gdk_event_queue_find_first (_gdk_display) != NULL ||
-           (modal_win32_dialog == NULL &&
-            PeekMessageW (&msg, NULL, 0, 0, PM_NOREMOVE)));
+  if (_gdk_display->event_pause_count > 0)
+    retval = FALSE;
+  else
+    retval = (_gdk_event_queue_find_first (_gdk_display) != NULL ||
+              (modal_win32_dialog == NULL &&
+               GetQueueStatus (QS_ALLINPUT) != 0));
 
-  GDK_THREADS_LEAVE ();
+  gdk_threads_leave ();
 
   return retval;
 }
@@ -3518,23 +3345,20 @@ gdk_event_prepare (GSource *source,
 static gboolean
 gdk_event_check (GSource *source)
 {
-  MSG msg;
   gboolean retval;
   
-  GDK_THREADS_ENTER ();
-
-  if (event_poll_fd.revents & G_IO_IN)
-    {
-      retval = (_gdk_event_queue_find_first (_gdk_display) != NULL ||
-               (modal_win32_dialog == NULL &&
-                PeekMessageW (&msg, NULL, 0, 0, PM_NOREMOVE)));
-    }
+  gdk_threads_enter ();
+
+  if (_gdk_display->event_pause_count > 0)
+    retval = FALSE;
+  else if (event_poll_fd.revents & G_IO_IN)
+    retval = (_gdk_event_queue_find_first (_gdk_display) != NULL ||
+              (modal_win32_dialog == NULL &&
+               GetQueueStatus (QS_ALLINPUT) != 0));
   else
-    {
-      retval = FALSE;
-    }
+    retval = FALSE;
 
-  GDK_THREADS_LEAVE ();
+  gdk_threads_leave ();
 
   return retval;
 }
@@ -3546,20 +3370,27 @@ gdk_event_dispatch (GSource     *source,
 {
   GdkEvent *event;
  
-  GDK_THREADS_ENTER ();
+  gdk_threads_enter ();
 
-  _gdk_events_queue (_gdk_display);
+  _gdk_win32_display_queue_events (_gdk_display);
   event = _gdk_event_unqueue (_gdk_display);
 
   if (event)
     {
-      if (_gdk_event_func)
-       (*_gdk_event_func) (event, _gdk_event_data);
+      _gdk_event_emit (event);
       
       gdk_event_free (event);
+
+      /* Do drag & drop if it is still pending */
+      if (_dnd_source_state == GDK_WIN32_DND_PENDING) 
+       {
+         _dnd_source_state = GDK_WIN32_DND_DRAGGING;
+         _gdk_win32_dnd_do_dragdrop ();
+         _dnd_source_state = GDK_WIN32_DND_NONE;
+       }
     }
   
-  GDK_THREADS_LEAVE ();
+  gdk_threads_leave ();
 
   return TRUE;
 }
@@ -3569,99 +3400,3 @@ gdk_win32_set_modal_dialog_libgtk_only (HWND window)
 {
   modal_win32_dialog = window;
 }
-
-static gboolean
-is_modally_blocked (GdkWindow *window)
-{
-  GdkWindow *modal_current = _gdk_modal_current ();
-  return modal_current != NULL ? gdk_window_get_toplevel (window) != modal_current : FALSE;
-}
-
-static void
-check_for_too_much_data (GdkEvent *event)
-{
-  if (event->client.data.l[1] ||
-      event->client.data.l[2] ||
-      event->client.data.l[3] ||
-      event->client.data.l[4])
-    {
-      g_warning ("Only four bytes of data are passed in client messages on Win32\n");
-    }
-}
-
-gboolean
-gdk_event_send_client_message_for_display (GdkDisplay     *display,
-                                           GdkEvent       *event, 
-                                           GdkNativeWindow winid)
-{
-  check_for_too_much_data (event);
-
-  return PostMessageW ((HWND) winid, client_message,
-                      (WPARAM) event->client.message_type,
-                      event->client.data.l[0]);
-}
-
-void
-gdk_screen_broadcast_client_message (GdkScreen *screen, 
-                                    GdkEvent  *event)
-{
-  check_for_too_much_data (event);
-
-  PostMessageW (HWND_BROADCAST, client_message,
-              (WPARAM) event->client.message_type,
-               event->client.data.l[0]);
-}
-
-void
-gdk_flush (void)
-{
-#if 0
-  MSG msg;
-
-  /* Process all messages currently available */
-  while (PeekMessageW (&msg, NULL, 0, 0, PM_REMOVE))
-    {
-      TranslateMessage (&msg);
-      DispatchMessageW (&msg);
-    }
-#endif
-
-  GdiFlush ();
-}
-
-void
-gdk_display_sync (GdkDisplay * display)
-{
-  MSG msg;
-
-  g_return_if_fail (display == _gdk_display);
-
-  /* Process all messages currently available */
-  while (PeekMessageW (&msg, NULL, 0, 0, PM_REMOVE))
-    DispatchMessageW (&msg);
-}
-
-void
-gdk_display_flush (GdkDisplay * display)
-{
-  g_return_if_fail (display == _gdk_display);
-
-  /* Nothing */
-}
-
-gboolean
-gdk_net_wm_supports (GdkAtom property)
-{
-  return FALSE;
-}
-
-void
-_gdk_windowing_event_data_copy (const GdkEvent *src,
-                                GdkEvent       *dst)
-{
-}
-
-void
-_gdk_windowing_event_data_free (GdkEvent *event)
-{
-}