]> 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 219da60b03ff57e5fad1255b36171d3d3c8274b8..afa20742d805339b4a9577d023a282ae14751174 100644 (file)
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
 #include <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,
@@ -94,15 +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 GList *client_filters;  /* Filters for client messages */
+extern gint       _gdk_input_ignore_core;
 
-static HCURSOR p_grab_cursor;
+HCURSOR _gdk_win32_grab_cursor;
 
 static GSourceFuncs event_funcs = {
   gdk_event_prepare,
@@ -113,7 +121,8 @@ static GSourceFuncs event_funcs = {
 
 GPollFD event_poll_fd;
 
-static GdkWindow *current_toplevel = 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;
@@ -149,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
@@ -199,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 
@@ -377,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
@@ -394,12 +407,11 @@ _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));
 }
 
 #if 0 /* Unused, but might be useful to re-introduce in some debugging output? */
@@ -442,183 +454,51 @@ event_mask_string (GdkEventMask mask)
 
 #endif
 
-GdkGrabStatus
-_gdk_windowing_pointer_grab (GdkWindow    *window,
-                            GdkWindow    *native_window,
-                            gboolean   owner_events,
-                            GdkEventMask       event_mask,
-                            GdkWindow    *confine_to,
-                            GdkCursor    *cursor,
-                            guint32    time)
-{
-  HCURSOR hcursor;
-  GdkCursorPrivate *cursor_private;
-  gint return_val;
-
-  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 (native_window,
-                                       owner_events,
-                                       event_mask,
-                                       confine_to,
-                                       time);
-
-  if (return_val == GDK_GRAB_SUCCESS)
-    {
-      GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) native_window)->impl);
-
-      SetCapture (GDK_WINDOW_HWND (native_window));
-      /* TODO_CSW: grab brokens, confine window, input_grab */
-      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));
-
-    }
-
-  return return_val;
-}
-
-void
-gdk_display_pointer_ungrab (GdkDisplay *display,
-                            guint32     time)
-{
-  GdkPointerGrabInfo *info;
-
-  info = _gdk_display_get_last_pointer_grab (display);
-  if (info)
-    {
-      info->serial_end = 0;
-      ReleaseCapture ();
-    }
-  /* TODO_CSW: cursor, confines, etc */
-
-  _gdk_display_pointer_grab_update (display, 0);
-}
-
-
 static GdkWindow *
 find_window_for_mouse_event (GdkWindow* reported_window,
                             MSG*       msg)
 {
-  HWND hwnd;
-  POINTS points;
   POINT pt;
-  GdkWindow* other_window = NULL;
+  GdkDeviceManagerWin32 *device_manager;
+  GdkWindow *event_window;
+  HWND hwnd;
+  RECT rect;
+  GdkDeviceGrabInfo *grab;
 
-  if (!_gdk_display_get_last_pointer_grab (_gdk_display))
-    return reported_window;
+  device_manager = GDK_DEVICE_MANAGER_WIN32 (gdk_display_get_device_manager (_gdk_display));
 
-  points = MAKEPOINTS (msg->lParam);
-  pt.x = points.x;
-  pt.y = points.y;
-  ClientToScreen (msg->hwnd, &pt);
+  grab = _gdk_display_get_last_device_grab (_gdk_display, device_manager->core_pointer);
+  if (grab == NULL)
+    return reported_window;
 
-  hwnd = WindowFromPoint (pt);
+  pt = msg->pt;
 
-  if (hwnd != NULL)
+  if (!grab->owner_events)
+    event_window = grab->native_window;
+  else
     {
-      RECT rect;
-
-      GetClientRect (hwnd, &rect);
-      ScreenToClient (hwnd, &pt);
-      if (!PtInRect (&rect, pt))
-       return _gdk_root;
+      event_window = NULL;
+      hwnd = WindowFromPoint (pt);
+      if (hwnd != NULL)
+       {
+         POINT client_pt = pt;
 
-      other_window = gdk_win32_handle_table_lookup ((GdkNativeWindow) hwnd);
+         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;
     }
 
-  if (other_window == NULL)
-    return _gdk_root;
-
   /* need to also adjust the coordinates to the new window */
-  pt.x = points.x;
-  pt.y = points.y;
-  ClientToScreen (msg->hwnd, &pt);
-  ScreenToClient (GDK_WINDOW_HWND (other_window), &pt);
+  ScreenToClient (GDK_WINDOW_HWND (event_window), &pt);
+
   /* ATTENTION: need to update client coords */
   msg->lParam = MAKELPARAM (pt.x, pt.y);
 
-  return other_window;
-}
-
-GdkGrabStatus
-gdk_keyboard_grab (GdkWindow *window,
-                  gboolean   owner_events,
-                  guint32    time)
-{
-  GdkDisplay *display;
-  GdkWindow  *toplevel;
-
-  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%s\n",
-                            GDK_WINDOW_HWND (window), owner_events ? " OWNER_EVENTS" : ""));
-
-  display = gdk_drawable_get_display (window);
-  toplevel = gdk_window_get_toplevel (window);
-
-  _gdk_display_set_has_keyboard_grab (display,
-                                     window,
-                                     toplevel,
-                                     owner_events,
-                                     0,
-                                     time);
-
-  return GDK_GRAB_SUCCESS;
-}
-
-void
-gdk_display_keyboard_ungrab (GdkDisplay *display,
-                             guint32 time)
-{
-  GDK_NOTE (EVENTS, g_print ("gdk_display_keyboard_ungrab\n"));
-  _gdk_display_unset_has_keyboard_grab (display, 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);
-}
-
-void
-gdk_add_client_message_filter (GdkAtom       message_type,
-                              GdkFilterFunc func,
-                              gpointer      data)
-{
-  GdkClientFilter *filter = g_new (GdkClientFilter, 1);
-
-  filter->type = message_type;
-  filter->function = func;
-  filter->data = data;
-  
-  client_filters = g_list_append (client_filters, filter);
+  return event_window;
 }
 
 static void
@@ -791,7 +671,6 @@ _gdk_win32_print_event (const 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);
@@ -897,14 +776,7 @@ _gdk_win32_print_event (const GdkEvent *event)
                 event->dnd.context->dest_window == NULL ? NULL : GDK_WINDOW_HWND (event->dnd.context->dest_window));
       break;
     case GDK_CLIENT_EVENT:
-      g_print ("%s %d %ld %ld %ld %ld %ld",
-              gdk_atom_name (event->client.message_type),
-              event->client.data_format,
-              event->client.data.l[0],
-              event->client.data.l[1],
-              event->client.data.l[2],
-              event->client.data.l[3],
-              event->client.data.l[4]);
+      /* no more GdkEventClient */
       break;
     case GDK_SCROLL:
       g_print ("(%.4g,%.4g) (%.4g,%.4g) %s ",
@@ -970,11 +842,19 @@ 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;
   
@@ -1001,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)
@@ -1038,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");
@@ -1060,7 +940,7 @@ fill_key_event_string (GdkEvent *event)
 static GdkFilterReturn
 apply_event_filters (GdkWindow  *window,
                     MSG        *msg,
-                    GList      *filters)
+                    GList     **filters)
 {
   GdkFilterReturn result = GDK_FILTER_CONTINUE;
   GdkEvent *event;
@@ -1078,13 +958,34 @@ apply_event_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;
     }
@@ -1120,7 +1021,7 @@ apply_event_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;
 
@@ -1143,9 +1044,9 @@ 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)
                {
-                 if (GDK_WINDOW_OBJECT (window)->state & GDK_WINDOW_STATE_MAXIMIZED)
+                 if (gdk_window_get_state (window) & GDK_WINDOW_STATE_MAXIMIZED)
                    {
                      ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWMAXIMIZED);
                    }
@@ -1169,7 +1070,7 @@ static void
 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)
     {
@@ -1177,7 +1078,7 @@ do_show_window (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. */
@@ -1195,132 +1096,225 @@ do_show_window (GdkWindow *window, gboolean hide_window)
 }
 
 static void
-synthesize_enter_or_leave_event (GdkWindow     *window,
-                                MSG            *msg,
-                                GdkEventType    type,
-                                GdkCrossingMode mode,
-                                GdkNotifyType detail)
+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;
+  GdkDeviceGrabInfo *grab;
+  GdkDeviceManagerWin32 *device_manager;
   POINT pt;
 
-  pt = msg->pt;
+  device_manager = GDK_DEVICE_MANAGER_WIN32 (gdk_display_get_device_manager (display));
+
+  grab = _gdk_display_has_device_grab (display, device_manager->core_pointer, 0);
+
+  if (grab != NULL &&
+      !grab->owner_events &&
+      mode != GDK_CROSSING_UNGRAB)
+    {
+      /* !owner_event => only report events wrt grab window, ignore rest */
+      if ((GdkWindow *)window != grab->native_window)
+       return;
+    }
+
+  pt = *screen_pt;
   ScreenToClient (GDK_WINDOW_HWND (window), &pt);
   
   event = gdk_event_new (type);
   event->crossing.window = window;
-  event->crossing.subwindow = NULL;
-  event->crossing.time = _gdk_win32_get_next_tick (msg->time);
+  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 = msg->pt.x + _gdk_offset_x;
-  event->crossing.y_root = msg->pt.y + _gdk_offset_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 = detail;
-  event->crossing.focus = TRUE; /* FIXME: Set correctly */
-  event->crossing.state = 0;   /* FIXME: Set correctly */
+  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);
 
-  append_event (event);
-  
-  if (type == GDK_ENTER_NOTIFY &&
-      ((GdkWindowObject *) window)->extension_events != 0)
-    _gdk_input_enter_event (window);
+  _gdk_win32_append_event (event);
 }
-                        
-static void
-synthesize_expose_events (GdkWindow *window)
+
+static GdkWindow *
+get_native_parent (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;
-    }
+  if (window->parent != NULL)
+    return window->parent->impl_window;
+  return NULL;
+}
 
-  g_list_free (head);
+static GdkWindow *
+find_common_ancestor (GdkWindow *win1,
+                     GdkWindow *win2)
+{
+  GdkWindow *tmp;
+  GList *path1 = NULL, *path2 = NULL;
+  GList *list1, *list2;
 
-  if (((GdkWindowObject *) window)->input_only)
-    ;
-  else if (!(hdc = GetDC (impl->handle)))
-    WIN32_GDI_FAILED ("GetDC");
-  else
+  tmp = win1;
+  while (tmp != NULL && tmp->window_type != GDK_WINDOW_ROOT)
     {
-      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);
-       }
-      GDI_CALL (ReleaseDC, (impl->handle, hdc));
+      path1 = g_list_prepend (path1, tmp);
+      tmp = get_native_parent (tmp);
     }
-}
-
-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));
+  tmp = win2;
+  while (tmp != NULL && tmp->window_type != GDK_WINDOW_ROOT)
+    {
+      path2 = g_list_prepend (path2, tmp);
+      tmp = get_native_parent (tmp);
+    }
 
-  while (list)
+  list1 = path1;
+  list2 = path2;
+  tmp = NULL;
+  while (list1 && list2 && (list1->data == list2->data))
     {
-      update_colors ((GdkWindow *) list->data, FALSE);
-      list = list->next;
+      tmp = (GdkWindow *)list1->data;
+      list1 = g_list_next (list1);
+      list2 = g_list_next (list2);
     }
-  g_list_free (head);
+  g_list_free (path1);
+  g_list_free (path2);
 
-  if (((GdkWindowObject *) window)->input_only ||
-      impl->colormap == NULL)
-    return;
+  return tmp;
+}
 
-  if (!(hdc = GetDC (impl->handle)))
-    WIN32_GDI_FAILED ("GetDC");
-  else
+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) */
     {
-      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");
+      /* 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);
+           }
+       }
+    }
+
+  if (b) /* Might not be a dest, e.g. if we're moving out of the window */
+    {
+      /* Traverse down from c to b */
+      if (c != b)
        {
-         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);
+         path = NULL;
+         win = get_native_parent (b);
+         while (win != c && win->window_type != GDK_WINDOW_ROOT)
+           {
+             path = g_list_prepend (path, win);
+             win = get_native_parent (win);
+           }
+
+         if (non_linear)
+           notify_type = GDK_NOTIFY_NONLINEAR_VIRTUAL;
+         else
+           notify_type = GDK_NOTIFY_VIRTUAL;
+
+         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));
+
+
+      if (non_linear)
+       notify_type = GDK_NOTIFY_NONLINEAR;
+      else if (c == a)
+       notify_type = GDK_NOTIFY_ANCESTOR;
+      else
+       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));
 }
 
 /* The check_extended flag controls whether to check if the windows want
@@ -1334,23 +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))
 {
   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)"));
@@ -1369,14 +1352,7 @@ propagate (GdkWindow  **window,
    */
   while (TRUE)
     {
-      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);
@@ -1387,13 +1363,6 @@ propagate (GdkWindow  **window,
                {
                  /* Event source is grabbed with owner_events TRUE */
 
-                 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 */
@@ -1442,37 +1411,41 @@ doesnt_want_char (gint mask,
   return !(mask & (GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_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;
-  GdkWindowObject *window_object;
+  HWND hwnd;
+
+  window_impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
+  if (window_impl->inhibit_configure)
+    return;
+
+  hwnd = GDK_WINDOW_HWND (window);
 
-  GetClientRect (msg->hwnd, &client_rect);
+  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;
     }
 
-  window_object = GDK_WINDOW_OBJECT (window);
-
-  window_object->width = client_rect.right - client_rect.left;
-  window_object->height = client_rect.bottom - client_rect.top;
+  window->width = client_rect.right - client_rect.left;
+  window->height = client_rect.bottom - client_rect.top;
   
-  window_object->x = point.x;
-  window_object->y = point.y;
+  window->x = point.x;
+  window->y = point.y;
 
   _gdk_window_update_size (window);
   
-  if (window_object->event_mask & GDK_STRUCTURE_MASK)
+  if (window->event_mask & GDK_STRUCTURE_MASK)
     {
       GdkEvent *event = gdk_event_new (GDK_CONFIGURE);
 
@@ -1484,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;
 
@@ -1512,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++)
     {
@@ -1523,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);
@@ -1551,7 +1524,7 @@ handle_wm_paint (MSG        *msg,
   HRGN hrgn = CreateRectRgn (0, 0, 0, 0);
   HDC hdc;
   PAINTSTRUCT paintstruct;
-  GdkRegion *update_region;
+  cairo_region_t *update_region;
 
   if (GetUpdateRgn (msg->hwnd, hrgn, FALSE) == ERROR)
     {
@@ -1611,9 +1584,9 @@ handle_wm_paint (MSG        *msg,
     }
 
   update_region = _gdk_win32_hrgn_to_region (hrgn);
-  if (!gdk_region_empty (update_region))
+  if (!cairo_region_is_empty (update_region))
     _gdk_window_invalidate_for_expose (window, update_region);
-  gdk_region_destroy (update_region);
+  cairo_region_destroy (update_region);
 
   DeleteObject (hrgn);
 }
@@ -1624,7 +1597,7 @@ modal_timer_proc (HWND     hwnd,
                  UINT_PTR id,
                  DWORD    time)
 {
-  int arbitrary_limit = 1;
+  int arbitrary_limit = 10;
 
   while (_modal_operation_in_progress &&
         g_main_context_pending (NULL) &&
@@ -1684,12 +1657,18 @@ handle_display_change (void)
 }
 
 static void
-generate_button_event (GdkEventType type,
-                      gint         button,
-                      GdkWindow   *window,
-                      MSG         *msg)
+generate_button_event (GdkEventType      type,
+                       gint              button,
+                       GdkWindow        *window,
+                       MSG              *msg)
 {
   GdkEvent *event = gdk_event_new (type);
+  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);
@@ -1700,9 +1679,10 @@ generate_button_event (GdkEventType type,
   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);
 
-  append_event (event);
+  _gdk_win32_append_event (event);
 }
 
 static void
@@ -1720,7 +1700,7 @@ ensure_stacking_on_unminimize (MSG *msg)
       if (rover_gdkw)
        {
          GdkWindowImplWin32 *rover_impl =
-           (GdkWindowImplWin32 *)((GdkWindowObject *)rover_gdkw)->impl;
+           GDK_WINDOW_IMPL_WIN32 (rover_gdkw->impl);
 
          if (GDK_WINDOW_IS_MAPPED (rover_gdkw) &&
              (rover_impl->type_hint == GDK_WINDOW_TYPE_HINT_UTILITY ||
@@ -1743,7 +1723,7 @@ static gboolean
 ensure_stacking_on_window_pos_changing (MSG       *msg,
                                        GdkWindow *window)
 {
-  GdkWindowImplWin32 *impl = (GdkWindowImplWin32 *)((GdkWindowObject *) window)->impl;
+  GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
   WINDOWPOS *windowpos = (WINDOWPOS *) msg->lParam;
 
   if (GetActiveWindow () == msg->hwnd &&
@@ -1771,7 +1751,7 @@ ensure_stacking_on_window_pos_changing (MSG       *msg,
          if (rover_gdkw)
            {
              GdkWindowImplWin32 *rover_impl =
-               (GdkWindowImplWin32 *)((GdkWindowObject *)rover_gdkw)->impl;
+               GDK_WINDOW_IMPL_WIN32 (rover_gdkw->impl);
 
              if (GDK_WINDOW_IS_MAPPED (rover_gdkw) &&
                  (rover_impl->type_hint == GDK_WINDOW_TYPE_HINT_UTILITY ||
@@ -1798,7 +1778,7 @@ static void
 ensure_stacking_on_activate_app (MSG       *msg,
                                 GdkWindow *window)
 {
-  GdkWindowImplWin32 *impl = (GdkWindowImplWin32 *)((GdkWindowObject *) window)->impl;
+  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 ||
@@ -1828,7 +1808,7 @@ ensure_stacking_on_activate_app (MSG       *msg,
          if (rover_gdkw)
            {
              GdkWindowImplWin32 *rover_impl =
-               (GdkWindowImplWin32 *)((GdkWindowObject *)rover_gdkw)->impl;
+               GDK_WINDOW_IMPL_WIN32 (rover_gdkw->impl);
 
              if (GDK_WINDOW_IS_MAPPED (rover_gdkw) &&
                  (rover_impl->type_hint == GDK_WINDOW_TYPE_HINT_UTILITY ||
@@ -1845,6 +1825,12 @@ ensure_stacking_on_activate_app (MSG       *msg,
     }
 }
 
+#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)
@@ -1857,6 +1843,7 @@ gdk_event_translate (MSG  *msg,
   BYTE key_state[256];
   HIMC himc;
   WINDOWPOS *windowpos;
+  gboolean ignore_leave;
 
   GdkEvent *event;
 
@@ -1866,12 +1853,15 @@ gdk_event_translate (MSG  *msg,
   GdkWindow *window = NULL;
   GdkWindowImplWin32 *impl;
 
-  GdkWindow *orig_window, *new_window, *toplevel;
+  GdkWindow *orig_window, *new_window;
 
-  GdkPointerGrabInfo *grab = NULL;
+  GdkDeviceManager *device_manager;
+  GdkDeviceManagerWin32 *device_manager_win32;
+
+  GdkDeviceGrabInfo *keyboard_grab = NULL;
+  GdkDeviceGrabInfo *pointer_grab = NULL;
   GdkWindow *grab_window = NULL;
 
-  static gint update_colors_counter = 0;
   gint button;
   GdkAtom target;
 
@@ -1884,7 +1874,7 @@ gdk_event_translate (MSG  *msg,
     {
       /* Apply global filters */
 
-      GdkFilterReturn result = apply_event_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,
@@ -1894,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)
@@ -1905,19 +1895,6 @@ gdk_event_translate (MSG  *msg,
          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);
@@ -1929,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
@@ -1939,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_event_filters (window, msg, ((GdkWindowObject *) window)->filters);
+      GdkFilterReturn result = apply_event_filters (window, msg, &window->filters);
 
       if (result == GDK_FILTER_REMOVE || result == GDK_FILTER_TRANSLATE)
        {
@@ -1999,15 +1984,7 @@ gdk_event_translate (MSG  *msg,
          goto done;
 
        case GDK_FILTER_CONTINUE:
-         /* Send unknown client messages on to Gtk for it to use */
-
-         event->client.type = 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;
+         /* 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;
@@ -2047,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 (_gdk_display->keyboard_grab.window == NULL &&
+      if (!keyboard_grab &&
          (msg->wParam == VK_TAB ||
           msg->wParam == VK_SPACE ||
           msg->wParam == VK_F4))
@@ -2071,11 +2048,12 @@ gdk_event_translate (MSG  *msg,
          in_ime_composition)
        break;
 
-      if (!propagate (&window, msg,
-                     _gdk_display->keyboard_grab.window,
-                     _gdk_display->keyboard_grab.owner_events,
+      if (keyboard_grab &&
+          !propagate (&window, msg,
+                     keyboard_grab->window,
+                     keyboard_grab->owner_events,
                      GDK_ALL_EVENTS_MASK,
-                     doesnt_want_key, FALSE))
+                     doesnt_want_key))
        break;
 
       if (GDK_WINDOW_DESTROYED (window))
@@ -2086,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)
@@ -2117,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);
 
@@ -2130,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;
@@ -2175,11 +2159,12 @@ gdk_event_translate (MSG  *msg,
       if (!(msg->lParam & GCS_RESULTSTR))
        break;
 
-      if (!propagate (&window, msg,
-                     _gdk_display->keyboard_grab.window,
-                     _gdk_display->keyboard_grab.owner_events,
+      if (keyboard_grab &&
+          !propagate (&window, msg,
+                     keyboard_grab->window,
+                     keyboard_grab->owner_events,
                      GDK_ALL_EVENTS_MASK,
-                     doesnt_want_char, FALSE))
+                     doesnt_want_char))
        break;
 
       if (GDK_WINDOW_DESTROYED (window))
@@ -2196,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;
@@ -2247,7 +2236,11 @@ gdk_event_translate (MSG  *msg,
       if (GDK_WINDOW_DESTROYED (window))
        break;
 
-      /* TODO_CSW? Emulate X11's automatic active grab */
+      if (pointer_grab == NULL)
+       {
+         SetCapture (GDK_WINDOW_HWND (window));
+       }
+
       generate_button_event (GDK_BUTTON_PRESS, button,
                             window, msg);
 
@@ -2278,14 +2271,38 @@ 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 0
-      if (((GdkWindowObject *) window)->extension_events != 0 &&
-         _gdk_input_ignore_core)
+
+      if (pointer_grab != NULL && pointer_grab->implicit)
        {
-         GDK_NOTE (EVENTS, g_print (" (ignored)"));
-         break;
+         gint state = build_pointer_event_state (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 ();
+
+             new_window = NULL;
+             hwnd = WindowFromPoint (msg->pt);
+             if (hwnd != NULL)
+               {
+                 POINT client_pt = msg->pt;
+
+                 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;
+           }
        }
-#endif
 
       generate_button_event (GDK_BUTTON_RELEASE, button,
                             window, msg);
@@ -2299,21 +2316,59 @@ gdk_event_translate (MSG  *msg,
                         (gpointer) msg->wParam,
                         GET_X_LPARAM (msg->lParam), GET_Y_LPARAM (msg->lParam)));
 
-      assign_object (&window, find_window_for_mouse_event (window, msg));
-      toplevel = gdk_window_get_toplevel (window);
-      if (current_toplevel != toplevel)
+      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 (" toplevel %p -> %p", 
-             current_toplevel ? GDK_WINDOW_HWND (current_toplevel) : NULL, 
-             toplevel ? GDK_WINDOW_HWND (toplevel) : NULL));
-         if (current_toplevel)
-           synthesize_enter_or_leave_event (current_toplevel, msg, 
-                                            GDK_LEAVE_NOTIFY, GDK_CROSSING_NORMAL, GDK_NOTIFY_ANCESTOR);
-         synthesize_enter_or_leave_event (toplevel, msg, 
-                                          GDK_ENTER_NOTIFY, GDK_CROSSING_NORMAL, GDK_NOTIFY_ANCESTOR);
-         assign_object (&current_toplevel, toplevel);
-         track_mouse_event (TME_LEAVE, GDK_WINDOW_HWND (toplevel));
+         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
@@ -2326,19 +2381,23 @@ gdk_event_translate (MSG  *msg,
       current_root_x = msg->pt.x + _gdk_offset_x;
       current_root_y = msg->pt.y + _gdk_offset_y;
 
-      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;
-      event->motion.device = _gdk_display->core_pointer;
-
-      append_event (event);
+      if (!_gdk_input_ignore_core)
+       {
+         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);
+
+         _gdk_win32_append_event (event);
+       }
 
       return_val = TRUE;
       break;
@@ -2347,33 +2406,47 @@ gdk_event_translate (MSG  *msg,
       GDK_NOTE (EVENTS,
                g_print (" (%d,%d)",
                         GET_X_LPARAM (msg->lParam), GET_Y_LPARAM (msg->lParam)));
-#if 0 /* TODO_CSW? */
-      if (current_toplevel != NULL &&
-         (((GdkWindowObject *) current_toplevel)->event_mask & GDK_LEAVE_NOTIFY_MASK))
-       {
-         synthesize_enter_or_leave_event (current_toplevel, msg,
-                                          GDK_LEAVE_NOTIFY, GDK_CROSSING_NORMAL, GDK_NOTIFY_ANCESTOR);
-       }
-#endif
       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)
        {
-         /* we are only interested if we don't know the new window */
-         if (current_toplevel)
-           synthesize_enter_or_leave_event (current_toplevel, msg, 
-                                            GDK_LEAVE_NOTIFY, GDK_CROSSING_NORMAL, GDK_NOTIFY_ANCESTOR);
-         assign_object (&current_toplevel, NULL);
+         char classname[64];
+
+         POINT client_pt = msg->pt;
+
+         /* 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);
        }
-      else
-       {
-         GDK_NOTE (EVENTS, g_print (" (ignored)"));
-       }
-      
+
+      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;
 
@@ -2390,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)
@@ -2412,9 +2509,10 @@ gdk_event_translate (MSG  *msg,
       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;
@@ -2457,80 +2555,44 @@ gdk_event_translate (MSG  *msg,
                 (g_print (" %d", HIWORD (msg->wParam)), 0) : 0));
       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;
-      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);
-      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 (_gdk_display->keyboard_grab.window != NULL &&
-         !GDK_WINDOW_DESTROYED (_gdk_display->keyboard_grab.window))
+      if (keyboard_grab != NULL &&
+         !GDK_WINDOW_DESTROYED (keyboard_grab->window))
        {
-         generate_grab_broken_event (_gdk_display->keyboard_grab.window, FALSE, NULL);
+         generate_grab_broken_event (device_manager, keyboard_grab->window, TRUE, NULL);
        }
 
       /* fallthrough */
     case WM_SETFOCUS:
-      if (_gdk_display->keyboard_grab.window != NULL &&
-         !_gdk_display->keyboard_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;
 
@@ -2558,19 +2620,16 @@ gdk_event_translate (MSG  *msg,
       GDK_NOTE (EVENTS, g_print (" %#x %#x",
                                 LOWORD (msg->lParam), HIWORD (msg->lParam)));
 
-      grab = _gdk_display_get_last_pointer_grab (_gdk_display);
-      if (grab != NULL)
-       {
-         grab_window = grab->window;
-       }
+      if (pointer_grab != NULL)
+        grab_window = pointer_grab->window;
 
       if (grab_window == NULL && LOWORD (msg->lParam) != HTCLIENT)
        break;
 
-      if (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;
 
@@ -2583,54 +2642,6 @@ gdk_event_translate (MSG  *msg,
        }
       break;
 
-    case WM_SHOWWINDOW:
-      GDK_NOTE (EVENTS, g_print (" %s %s",
-                                (msg->wParam ? "YES" : "NO"),
-                                (msg->lParam == 0 ? "ShowWindow" :
-                                 (msg->lParam == SW_OTHERUNZOOM ? "OTHERUNZOOM" :
-                                  (msg->lParam == SW_OTHERZOOM ? "OTHERZOOM" :
-                                   (msg->lParam == SW_PARENTCLOSING ? "PARENTCLOSING" :
-                                    (msg->lParam == SW_PARENTOPENING ? "PARENTOPENING" :
-                                     "???")))))));
-
-      if (!(((GdkWindowObject *) window)->event_mask & GDK_STRUCTURE_MASK))
-       break;
-
-      if (msg->lParam == SW_OTHERUNZOOM ||
-         msg->lParam == SW_OTHERZOOM)
-       break;
-
-      if (GDK_WINDOW_DESTROYED (window))
-       break;
-
-      event = gdk_event_new (msg->wParam ? GDK_MAP : GDK_UNMAP);
-      event->any.window = window;
-
-      append_event (event);
-
-      if (event->any.type == GDK_UNMAP)
-       {
-         impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
-
-         if (impl->transient_owner && GetForegroundWindow () == GDK_WINDOW_HWND (window))
-           {
-             SetForegroundWindow (GDK_WINDOW_HWND (impl->transient_owner));
-           }
-
-         grab = _gdk_display_get_last_pointer_grab (_gdk_display);
-         if (grab != NULL)
-           {
-             if (grab->window == window)
-               gdk_pointer_ungrab (msg->time);
-           }
-
-         if (_gdk_display->keyboard_grab.window == window)
-           gdk_keyboard_ungrab (msg->time);
-       }
-
-      return_val = TRUE;
-      break;
-
     case WM_SYSCOMMAND:
       switch (msg->wParam)
        {
@@ -2642,85 +2653,32 @@ gdk_event_translate (MSG  *msg,
 
       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)
-       {
-         /* Don't generate any GDK event. This is *not* an UNMAP. */
-         grab = _gdk_display_get_last_pointer_grab (_gdk_display);
-         if (grab != NULL)
-           {
-             if (grab->window == window)
-               gdk_pointer_ungrab (msg->time);
-           }
-         if (_gdk_display->keyboard_grab.window == window)
-           gdk_keyboard_ungrab (msg->time);
-
-         gdk_synthesize_window_state (window,
-                                      GDK_WINDOW_STATE_WITHDRAWN,
-                                      GDK_WINDOW_STATE_ICONIFIED);
-         do_show_window (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 (((GdkWindowObject *) window)->state & GDK_WINDOW_STATE_ICONIFIED)
-           ensure_stacking_on_unminimize (msg);
-
-         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 (GDK_WINDOW_TYPE (window) != GDK_WINDOW_TEMP && !GDK_WINDOW_IS_MAPPED (window))
-               {
-                 do_show_window (window, FALSE);
-               }
-           }
-         else if (msg->wParam == SIZE_MAXIMIZED)
-           {
-             gdk_synthesize_window_state (window,
-                                          GDK_WINDOW_STATE_ICONIFIED |
-                                          withdrawn_bit,
-                                          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);
-
-         return_val = TRUE;
-       }
-      break;
-
     case WM_ENTERSIZEMOVE:
     case WM_ENTERMENULOOP:
+      if (msg->message == WM_ENTERSIZEMOVE)
+       _modal_move_resize_window = msg->hwnd;
+
       _gdk_win32_begin_modal_call ();
       break;
 
     case WM_EXITSIZEMOVE:
     case WM_EXITMENULOOP:
-      _gdk_win32_end_modal_call ();
+      if (_modal_operation_in_progress)
+       {
+         _modal_move_resize_window = NULL;
+         _gdk_win32_end_modal_call ();
+       }
+      break;
+
+    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)
+       {
+         _modal_move_resize_window = NULL;
+         _gdk_win32_end_modal_call ();
+       }
       break;
 
     case WM_WINDOWPOSCHANGING:
@@ -2752,36 +2710,115 @@ gdk_event_translate (MSG  *msg,
                                      buf))))),
                                 windowpos->cx, windowpos->cy, windowpos->x, windowpos->y));
 
-      /* If position and size haven't changed, don't do anything */
-      if (_modal_operation_in_progress &&
-         (windowpos->flags & SWP_NOMOVE) &&
-         (windowpos->flags & SWP_NOSIZE))
-       break;
-
-      /* 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 (_modal_operation_in_progress &&
-        GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&
-        !GDK_WINDOW_DESTROYED (window))
+      /* Break grabs on unmap or minimize */
+      if (windowpos->flags & SWP_HIDEWINDOW || 
+         ((windowpos->flags & SWP_STATECHANGED) && IsIconic (msg->hwnd)))
        {
-         if (((GdkWindowObject *) window)->event_mask & GDK_STRUCTURE_MASK)
+         if (pointer_grab != NULL)
            {
-             GDK_NOTE (EVENTS, g_print (" do magic"));
-             if (((GdkWindowObject *) window)->resize_count > 1)
-               ((GdkWindowObject *) window)->resize_count -= 1;
-
-             handle_configure_event (msg, window);
-             g_main_context_iteration (NULL, FALSE);
-#if 0
-             /* Dispatch main loop - to realize resizes... */
-             modal_timer_proc (msg->hwnd, msg->message, 0, msg->time);
-#endif
-             /* Claim as handled, so that WM_SIZE and WM_MOVE are avoided */
-             return_val = TRUE;
-             *ret_valp = 1;
+             if (pointer_grab->window == window)
+               gdk_pointer_ungrab (msg->time);
            }
+
+         if (keyboard_grab != NULL &&
+             keyboard_grab->window == window)
+           gdk_keyboard_ungrab (msg->time);
+       }
+
+      /* Send MAP events  */
+      if ((windowpos->flags & SWP_SHOWWINDOW) &&
+         !GDK_WINDOW_DESTROYED (window))
+       {
+         event = gdk_event_new (GDK_MAP);
+         event->any.window = window;
+         _gdk_win32_append_event (event);
+       }
+
+      /* Update window state */
+      if (windowpos->flags & (SWP_STATECHANGED | SWP_SHOWWINDOW | SWP_HIDEWINDOW))
+       {
+         GdkWindowState set_bits, unset_bits, old_state, new_state;
+
+         old_state = window->state;
+
+         set_bits = 0;
+         unset_bits = 0;
+
+         if (IsWindowVisible (msg->hwnd))
+           unset_bits |= GDK_WINDOW_STATE_WITHDRAWN;
+         else
+           set_bits |= GDK_WINDOW_STATE_WITHDRAWN;
+
+         if (IsIconic (msg->hwnd))
+           set_bits |= GDK_WINDOW_STATE_ICONIFIED;
+         else
+           unset_bits |= GDK_WINDOW_STATE_ICONIFIED;
+
+         if (IsZoomed (msg->hwnd))
+           set_bits |= GDK_WINDOW_STATE_MAXIMIZED;
+         else
+           unset_bits |= GDK_WINDOW_STATE_MAXIMIZED;
+
+         gdk_synthesize_window_state (window, unset_bits, set_bits);
+
+         new_state = window->state;
+
+         /* 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));
+
+
+         /* 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 (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&
+             !IsIconic (msg->hwnd) &&
+             !GDK_WINDOW_DESTROYED (window))
+           _gdk_win32_emit_configure_event (window);
        }
+
+      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:
@@ -2801,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)
        {
@@ -3004,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)",
@@ -3053,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:
@@ -3076,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))
        {
@@ -3088,15 +3114,15 @@ gdk_event_translate (MSG  *msg,
       return_val = TRUE;
       break;
 
-    case WM_DESTROY:
-      grab = _gdk_display_get_last_pointer_grab (_gdk_display);
-      if (grab != NULL)
+    case WM_NCDESTROY:
+      if (pointer_grab != NULL)
        {
-         if (grab->window == window)
+         if (pointer_grab->window == window)
            gdk_pointer_ungrab (msg->time);
        }
 
-      if (_gdk_display->keyboard_grab.window == window)
+      if (keyboard_grab &&
+          keyboard_grab->window == window)
        gdk_keyboard_ungrab (msg->time);
 
       if ((window != NULL) && (msg->hwnd != GetDesktopWindow ()))
@@ -3108,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;
@@ -3124,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
        {
@@ -3144,56 +3170,53 @@ 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;
-         event->selection.requestor = msg->hwnd;
-         event->selection.time = msg->time;
-
-         fixup_event (event);
-         GDK_NOTE (EVENTS, g_print (" (calling gdk_event_func)"));
-         GDK_NOTE (EVENTS, _gdk_win32_print_event (event));
-         (*_gdk_event_func) (event, _gdk_event_data);
-         gdk_event_free (event);
-
-         /* 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;
-                   }
-               }
+      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;
 
-             /* 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));
+      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);
 
-             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:
@@ -3207,7 +3230,7 @@ gdk_event_translate (MSG  *msg,
        * but we still need to deal with alt-tab, or with SetActiveWindow() type
        * situations.
        */
-      if (is_modally_blocked (window) && LOWORD (msg->wParam) == WA_ACTIVE)
+      if (_gdk_modal_blocked (window) && LOWORD (msg->wParam) == WA_ACTIVE)
        {
          GdkWindow *modal_current = _gdk_modal_current ();
          SetActiveWindow (GDK_WINDOW_HWND (modal_current));
@@ -3216,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
@@ -3260,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);
 
@@ -3277,7 +3305,7 @@ done:
 }
 
 void
-_gdk_events_queue (GdkDisplay *display)
+_gdk_win32_display_queue_events (GdkDisplay *display)
 {
   MSG msg;
 
@@ -3296,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;
 }
@@ -3315,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;
 }
@@ -3343,15 +3370,14 @@ 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);
 
@@ -3364,7 +3390,7 @@ gdk_event_dispatch (GSource     *source,
        }
     }
   
-  GDK_THREADS_LEAVE ();
+  gdk_threads_leave ();
 
   return TRUE;
 }
@@ -3374,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)
-{
-}