]> Pileus Git - ~andy/gtk/blobdiff - gdk/win32/gdkevents-win32.c
If we don't know where we went, and have generated a leave event, set
[~andy/gtk] / gdk / win32 / gdkevents-win32.c
index fcffdf1bd4a2e93cd1547d50c1082a6e03f09ef1..f241943cb94cae2fab2a59192ce4aedc7bf0a378 100644 (file)
@@ -1,6 +1,6 @@
 /* GDK - The GIMP Drawing Kit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- * Copyright (C) 1998-1999 Tor Lillqvist
+ * Copyright (C) 1998-2002 Tor Lillqvist
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * otherwise would make it possible to reliably generate
  * GDK_LEAVE_NOTIFY events, which would help get rid of those pesky
  * tooltips sometimes popping up in the wrong place.
+ *
+ * Update: a combination of TrackMouseEvent, GetCursorPos and 
+ * GetWindowPos can and is actually used to get rid of those
+ * pesky tooltips. It should be possible to use this for the
+ * whole ENTER/LEAVE NOTIFY handling but some platforms may
+ * not have TrackMouseEvent at all (?) --hb
  */
-/* define USE_TRACKMOUSEEVENT */
 
-/* Do use SetCapture, it works now. Thanks to jpe@archaeopteryx.com */
-#define USE_SETCAPTURE 1
+#include <config.h>
+
+#include <glib/gprintf.h>
 
-#include <stdio.h>
+#if defined (__GNUC__) && defined (HAVE_DIMM_H)
+/* The w32api imm.h clashes a bit with the IE5.5 dimm.h */
+# define IMEMENUITEMINFOA hidden_IMEMENUITEMINFOA
+# define IMEMENUITEMINFOW hidden_IMEMENUITEMINFOW
+#endif
 
 #include "gdk.h"
 #include "gdkprivate-win32.h"
 #include "gdkinput-win32.h"
 #include "gdkkeysyms.h"
 
+#include <windowsx.h>
+
+#ifdef G_WITH_CYGWIN
+#include <fcntl.h>
+#include <errno.h>
+#endif
+
 #include <objbase.h>
+
 #include <imm.h>
 
+#if defined (__GNUC__) && defined (HAVE_DIMM_H)
+# undef IMEMENUITEMINFOA
+# undef IMEMENUITEMINFOW
+#endif
+
 #ifdef HAVE_DIMM_H
 #include <dimm.h>
-#else
-#include "surrogate-dimm.h"
 #endif
 
+#ifndef XBUTTON1
+#define XBUTTON1 1
+#define XBUTTON2 2
+#endif
 
-typedef struct _GdkIOClosure GdkIOClosure;
-typedef struct _GdkEventPrivate GdkEventPrivate;
-
-typedef enum
-{
-  /* Following flag is set for events on the event queue during
-   * translation and cleared afterwards.
-   */
-  GDK_EVENT_PENDING = 1 << 0
-} GdkEventFlags;
-
-struct _GdkIOClosure
-{
-  GdkInputFunction function;
-  GdkInputCondition condition;
-  GdkDestroyNotify notify;
-  gpointer data;
-};
+#ifndef VK_XBUTTON1
+#define VK_XBUTTON1 5
+#define VK_XBUTTON2 6
+#endif
 
-struct _GdkEventPrivate
-{
-  GdkEvent event;
-  guint    flags;
-};
+#ifndef MK_XBUTTON1
+#define MK_XBUTTON1 32
+#define MK_XBUTTON2 64
+#endif
 
 /* 
  * Private function declarations
  */
 
-static GdkFilterReturn
-                gdk_event_apply_filters(MSG      *msg,
-                                        GdkEvent *event,
-                                        GList    *filters);
-static gboolean  gdk_event_translate   (GdkEvent *event, 
-                                        MSG      *msg,
-                                        gboolean *ret_val_flagp,
-                                        gint     *ret_valp,
-                                        gboolean  return_exposes);
+static gboolean gdk_event_translate (MSG        *msg,
+                                    gint       *ret_valp);
+static void     handle_wm_paint     (MSG        *msg,
+                                    GdkWindow  *window,
+                                    gboolean    return_exposes,
+                                    GdkEvent  **event);
 
 static gboolean gdk_event_prepare  (GSource     *source,
                                    gint        *timeout);
@@ -100,13 +107,17 @@ static gboolean gdk_event_dispatch (GSource     *source,
                                    GSourceFunc  callback,
                                    gpointer     user_data);
 
+static void append_event (GdkEvent *event);
+
 /* Private variable declarations
  */
 
-static GdkWindow *p_grab_window = NULL; /* Window that currently
-                                        * holds the pointer grab
+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
                                         */
@@ -129,137 +140,162 @@ GPollFD event_poll_fd;
 
 static GdkWindow *current_window = NULL;
 static gint current_x, current_y;
-static gdouble current_x_root, current_y_root;
-static UINT gdk_ping_msg;
-static UINT msh_mousewheel_msg;
-static gboolean ignore_wm_char = FALSE;
-static gboolean is_altgr_key = FALSE;
+static gint current_root_x, current_root_y;
+static UINT msh_mousewheel;
+static UINT client_message;
 
+#ifdef HAVE_DIMM_H
 static IActiveIMMApp *active_imm_app = NULL;
 static IActiveIMMMessagePumpOwner *active_imm_msgpump_owner = NULL;
+#endif
+
+#if 0
+static HKL latin_locale = NULL;
+#endif
+
+static gboolean in_ime_composition = FALSE;
+static UINT     resize_timer;
+
+static int debug_indent = 0;
+
+static void
+assign_object (gpointer lhsp,
+              gpointer rhs)
+{
+  if (*(gpointer *)lhsp != rhs)
+    {
+      if (*(gpointer *)lhsp != NULL)
+       g_object_unref (*(gpointer *)lhsp);
+      *(gpointer *)lhsp = rhs;
+      if (rhs != NULL)
+       g_object_ref (rhs);
+    }
+}
+
+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;
+
+      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;
+    }
+
+  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));
+    }
+}
+
+gulong
+_gdk_win32_get_next_tick (gulong suggested_tick)
+{
+  static gulong cur_tick = 0;
+
+  if (suggested_tick == 0)
+    suggested_tick = GetTickCount ();
+  if (suggested_tick <= cur_tick)
+    return cur_tick;
+  else
+    return cur_tick = suggested_tick;
+}
+
+static void
+generate_focus_event (GdkWindow *window,
+                     gboolean   in)
+{
+  GdkEvent *event;
+
+  event = gdk_event_new (GDK_FOCUS_CHANGE);
+  event->focus_change.window = window;
+  event->focus_change.in = in;
 
-typedef BOOL (WINAPI *PFN_TrackMouseEvent) (LPTRACKMOUSEEVENT);
-static PFN_TrackMouseEvent track_mouse_event = NULL;
+  append_event (event);
+}
+
+static void
+generate_grab_broken_event (GdkWindow *window,
+                           gboolean   keyboard,
+                           GdkWindow *grab_window)
+{
+  GdkEvent *event = gdk_event_new (GDK_GRAB_BROKEN);
 
-static gboolean use_ime_composition = FALSE;
+  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);
+}
 
 static LRESULT 
-real_window_procedure (HWND   hwnd,
-                      UINT   message,
-                      WPARAM wparam,
-                      LPARAM lparam)
+inner_window_procedure (HWND   hwnd,
+                       UINT   message,
+                       WPARAM wparam,
+                       LPARAM lparam)
 {
-  GdkEventPrivate event;
-  GdkEvent *eventp;
   MSG msg;
   DWORD pos;
+#ifdef HAVE_DIMM_H
   LRESULT lres;
-  gint ret_val;
-  gboolean ret_val_flag;
+#endif
+  gint ret_val = 0;
 
   msg.hwnd = hwnd;
   msg.message = message;
   msg.wParam = wparam;
   msg.lParam = lparam;
-  msg.time = GetTickCount ();
+  msg.time = _gdk_win32_get_next_tick (0);
   pos = GetMessagePos ();
-  msg.pt.x = LOWORD (pos);
-  msg.pt.y = HIWORD (pos);
+  msg.pt.x = GET_X_LPARAM (pos);
+  msg.pt.y = GET_Y_LPARAM (pos);
 
-  event.flags = GDK_EVENT_PENDING;
-  if (gdk_event_translate (&event.event, &msg, &ret_val_flag, &ret_val, FALSE))
+  if (gdk_event_translate (&msg, &ret_val))
     {
-      event.flags &= ~GDK_EVENT_PENDING;
-#if 1
-      if (event.event.any.type == GDK_CONFIGURE)
-       {
-         /* Compress configure events */
-         GList *list = _gdk_queued_events;
-
-         while (list != NULL
-                && (((GdkEvent *)list->data)->any.type != GDK_CONFIGURE
-                    || ((GdkEvent *)list->data)->any.window != event.event.any.window))
-           list = list->next;
-         if (list != NULL)
-           {
-             GDK_NOTE (EVENTS, g_print ("... compressing an CONFIGURE event\n"));
-
-             *((GdkEvent *)list->data) = event.event;
-             gdk_drawable_unref (event.event.any.window);
-             /* Wake up WaitMessage */
-             PostMessage (NULL, gdk_ping_msg, 0, 0);
-             return FALSE;
-           }
-       }
-      else if (event.event.any.type == GDK_EXPOSE)
-       {
-         /* Compress expose events */
-         GList *list = _gdk_queued_events;
-
-         while (list != NULL
-                && (((GdkEvent *)list->data)->any.type != GDK_EXPOSE
-                    || ((GdkEvent *)list->data)->any.window != event.event.any.window))
-           list = list->next;
-         if (list != NULL)
-           {
-             GdkRectangle u;
-
-             GDK_NOTE (EVENTS, g_print ("... compressing an EXPOSE event\n"));
-             gdk_rectangle_union (&event.event.expose.area,
-                                  &((GdkEvent *)list->data)->expose.area,
-                                  &u);
-             ((GdkEvent *)list->data)->expose.area = u;
-             gdk_drawable_unref (event.event.any.window);
-#if 0
-             /* Wake up WaitMessage */
-             PostMessage (NULL, gdk_ping_msg, 0, 0);
-#endif
-             return FALSE;
-           }
-       }
-#endif
-      eventp = _gdk_event_new ();
-      *((GdkEventPrivate *) eventp) = event;
-
-      /* Philippe Colantoni <colanton@aris.ss.uci.edu> suggests this
-       * in order to handle events while opaque resizing neatly.  I
-       * don't want it as default. Set the
-       * GDK_EVENT_FUNC_FROM_WINDOW_PROC env var to get this
-       * behaviour.
+      /* If gdk_event_translate() returns TRUE, we return ret_val from
+       * the window procedure.
        */
-      if (gdk_event_func_from_window_proc && _gdk_event_func)
-       {
-         GDK_THREADS_ENTER ();
-         
-         (*_gdk_event_func) (eventp, _gdk_event_data);
-         gdk_event_free (eventp);
-         
-         GDK_THREADS_LEAVE ();
-       }
-      else
-       {
-         _gdk_event_queue_append (eventp);
-#if 1
-         /* Wake up WaitMessage */
-         PostMessage (NULL, gdk_ping_msg, 0, 0);
-#endif
-       }
-      
-      if (ret_val_flag)
-       return ret_val;
-      else
-       return FALSE;
+      return ret_val;
     }
-
-  if (ret_val_flag)
-    return ret_val;
   else
     {
-      if (active_imm_app == NULL
-         || (*active_imm_app->lpVtbl->OnDefWindowProc) (active_imm_app, hwnd, message, wparam, lparam, &lres) == S_FALSE)
+      /* Otherwise call DefWindowProc(). */
+      GDK_NOTE (EVENTS, g_print (" DefWindowProc"));
+#ifndef HAVE_DIMM_H
+      return DefWindowProc (hwnd, message, wparam, lparam);
+#else
+      if (active_imm_app == NULL ||
+         (*active_imm_app->lpVtbl->OnDefWindowProc) (active_imm_app, hwnd, message, wparam, lparam, &lres) == S_FALSE)
        return DefWindowProc (hwnd, message, wparam, lparam);
       else
        return lres;
+#endif
     }
 }
 
@@ -271,13 +307,16 @@ _gdk_win32_window_procedure (HWND   hwnd,
 {
   LRESULT retval;
 
-  GDK_NOTE (MISC, g_print ("_gdk_win32_window_procedure: %#lx %s\n",
-                            (gulong) hwnd, gdk_win32_message_name (message)));
+  GDK_NOTE (EVENTS, g_print ("%s%*s%s %p",
+                            (debug_indent > 0 ? "\n" : ""),
+                            debug_indent, "", 
+                            _gdk_win32_message_to_string (message), hwnd));
+  debug_indent += 2;
+  retval = inner_window_procedure (hwnd, message, wparam, lparam);
+  debug_indent -= 2;
 
-  retval = real_window_procedure (hwnd, message, wparam, lparam);
-
-  GDK_NOTE (MISC, g_print ("_gdk_win32_window_procedure: %#lx returns %ld\n",
-                            (gulong) hwnd, retval));
+  GDK_NOTE (EVENTS, g_print (" => %ld%s",
+                            retval, (debug_indent == 0 ? "\n" : "")));
 
   return retval;
 }
@@ -286,33 +325,119 @@ void
 _gdk_events_init (void)
 {
   GSource *source;
+#ifdef HAVE_DIMM_H
   HRESULT hres;
-#ifdef USE_TRACKMOUSEEVENT
-  HMODULE user32, imm32;
-  HINSTANCE commctrl32;
 #endif
 
-  gdk_ping_msg = RegisterWindowMessage ("gdk-ping");
-  GDK_NOTE (EVENTS, g_print ("gdk-ping = %#x\n", gdk_ping_msg));
+#if 0
+  int i, j, n;
+
+  /* List of languages that use a latin keyboard. Somewhat sorted in
+   * "order of least surprise", in case we have to load one of them if
+   * the user only has arabic loaded, for instance.
+   */
+  static int latin_languages[] = {
+    LANG_ENGLISH,
+    LANG_SPANISH,
+    LANG_PORTUGUESE,
+    LANG_FRENCH,
+    LANG_GERMAN,
+    /* Rest in numeric order */
+    LANG_CZECH,
+    LANG_DANISH,
+    LANG_FINNISH,
+    LANG_HUNGARIAN,
+    LANG_ICELANDIC,
+    LANG_ITALIAN,
+    LANG_DUTCH,
+    LANG_NORWEGIAN,
+    LANG_POLISH,
+    LANG_ROMANIAN,
+    LANG_SLOVAK,
+    LANG_ALBANIAN,
+    LANG_SWEDISH,
+    LANG_TURKISH,
+    LANG_INDONESIAN,
+    LANG_SLOVENIAN,
+    LANG_ESTONIAN,
+    LANG_LATVIAN,
+    LANG_LITHUANIAN,
+    LANG_VIETNAMESE,
+    LANG_AFRIKAANS,
+    LANG_FAEROESE
+#ifdef LANG_SWAHILI
+   ,LANG_SWAHILI
+#endif
+  };
+#endif
 
   /* This is the string MSH_MOUSEWHEEL from zmouse.h,
    * http://www.microsoft.com/mouse/intellimouse/sdk/zmouse.h
    * This message is used by mouse drivers than cannot generate WM_MOUSEWHEEL
    * or on Win95.
    */
-  msh_mousewheel_msg = RegisterWindowMessage ("MSWHEEL_ROLLMSG");
-  GDK_NOTE (EVENTS, g_print ("MSH_MOUSEWHEEL = %#x\n", msh_mousewheel_msg));
+  msh_mousewheel = RegisterWindowMessage ("MSWHEEL_ROLLMSG");
+
+  client_message = RegisterWindowMessage ("GDK_WIN32_CLIENT_MESSAGE");
+
+#if 0
+  /* Check if we have some input locale identifier loaded that uses a
+   * latin keyboard, to be able to get the virtual-key code for the
+   * latin characters corresponding to ASCII control characters.
+   */
+  if ((n = GetKeyboardLayoutList (0, NULL)) == 0)
+    WIN32_API_FAILED ("GetKeyboardLayoutList");
+  else
+    {
+      HKL *hkl_list = g_new (HKL, n);
+      if (GetKeyboardLayoutList (n, hkl_list) == 0)
+       WIN32_API_FAILED ("GetKeyboardLayoutList");
+      else
+       {
+         for (i = 0; latin_locale == NULL && i < n; i++)
+           for (j = 0; j < G_N_ELEMENTS (latin_languages); j++)
+             if (PRIMARYLANGID (LOWORD (hkl_list[i])) == latin_languages[j])
+               {
+                 latin_locale = hkl_list [i];
+                 break;
+               }
+       }
+      g_free (hkl_list);
+    }
+
+  if (latin_locale == NULL)
+    {
+      /* Try to load a keyboard layout with latin characters then.
+       */
+      i = 0;
+      while (latin_locale == NULL && i < G_N_ELEMENTS (latin_languages))
+       {
+         char id[9];
+         g_sprintf (id, "%08x", MAKELANGID (latin_languages[i++], SUBLANG_DEFAULT));
+         latin_locale = LoadKeyboardLayout (id, KLF_NOTELLSHELL|KLF_SUBSTITUTE_OK);
+       }
+    }
+
+  GDK_NOTE (EVENTS, g_print ("latin_locale = %08x\n", (guint) latin_locale));
+#endif
 
   source = g_source_new (&event_funcs, sizeof (GSource));
   g_source_set_priority (source, GDK_PRIORITY_EVENTS);
 
+#ifdef G_WITH_CYGWIN
+  event_poll_fd.fd = open ("/dev/windows", O_RDONLY);
+  if (event_poll_fd.fd == -1)
+    g_error ("can't open \"/dev/windows\": %s", g_strerror (errno));
+#else
   event_poll_fd.fd = G_WIN32_MSG_HANDLE;
+#endif
   event_poll_fd.events = G_IO_IN;
   
   g_source_add_poll (source, &event_poll_fd);
   g_source_set_can_recurse (source, TRUE);
   g_source_attach (source, NULL);
 
+#ifdef HAVE_DIMM_H
   hres = CoCreateInstance (&CLSID_CActiveIMM,
                           NULL,
                           CLSCTX_ALL,
@@ -325,101 +450,44 @@ _gdk_events_init (void)
                                 active_imm_app));
       (*active_imm_app->lpVtbl->Activate) (active_imm_app, TRUE);
       
-      hres = (*active_imm_app->lpVtbl->QueryInterface) (active_imm_app, &IID_IActiveIMMMessagePumpOwner, &active_imm_msgpump_owner);
+      hres = (*active_imm_app->lpVtbl->QueryInterface) (active_imm_app, &IID_IActiveIMMMessagePumpOwner, (void **) &active_imm_msgpump_owner);
       GDK_NOTE (EVENTS, g_print ("IActiveIMMMessagePumpOwner created %p\n",
                                 active_imm_msgpump_owner));
       (active_imm_msgpump_owner->lpVtbl->Start) (active_imm_msgpump_owner);
     }
-
-#ifdef USE_TRACKMOUSEEVENT
-  user32 = GetModuleHandle ("user32.dll");
-  if ((track_mouse_event = GetProcAddress (user32, "TrackMouseEvent")) == NULL)
-    {
-      if ((commctrl32 = LoadLibrary ("commctrl32.dll")) != NULL)
-       track_mouse_event = (PFN_TrackMouseEvent)
-         GetProcAddress (commctrl32, "_TrackMouseEvent");
-    }
-  if (track_mouse_event != NULL)
-    GDK_NOTE (EVENTS, g_print ("Using TrackMouseEvent to detect leave events\n"));
 #endif
-  if (IS_WIN_NT () && (windows_version & 0xFF) == 5)
-    {
-      /* On Win2k (Beta 3, at least) WM_IME_CHAR doesn't seem to work
-       * correctly for non-Unicode applications. Handle
-       * WM_IME_COMPOSITION with GCS_RESULTSTR instead, fetch the
-       * Unicode char from the IME with ImmGetCompositionStringW().
-       */
-      use_ime_composition = TRUE;
-    }
 }
 
-/*
- *--------------------------------------------------------------
- * gdk_events_pending
- *
- *   Returns if events are pending on the queue.
- *
- * Arguments:
- *
- * Results:
- *   Returns TRUE if events are pending
- *
- * Side effects:
- *
- *--------------------------------------------------------------
- */
-
 gboolean
 gdk_events_pending (void)
 {
   MSG msg;
-
-  return (_gdk_event_queue_find_first() ||
+  return (_gdk_event_queue_find_first (_gdk_display) ||
          PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE));
 }
 
-/*
- *--------------------------------------------------------------
- * gdk_event_get_graphics_expose
- *
- *   Waits for a GraphicsExpose or NoExpose event
- *
- * Arguments:
- *
- * Results: 
- *   For GraphicsExpose events, returns a pointer to the event
- *   converted into a GdkEvent Otherwise, returns NULL.
- *
- * Side effects:
- *
- *-------------------------------------------------------------- */
-
 GdkEvent*
 gdk_event_get_graphics_expose (GdkWindow *window)
 {
   MSG msg;
-  GdkEvent *event;
+  GdkEvent *event = NULL;
 
   g_return_val_if_fail (window != NULL, NULL);
   
   GDK_NOTE (EVENTS, g_print ("gdk_event_get_graphics_expose\n"));
 
-#if 0 /* ??? */
-  /* Some nasty bugs here, just return NULL for now. */
-  return NULL;
-#else
   if (PeekMessage (&msg, GDK_WINDOW_HWND (window), WM_PAINT, WM_PAINT, PM_REMOVE))
     {
-      event = _gdk_event_new ();
-      
-      if (gdk_event_translate (event, &msg, NULL, NULL, TRUE))
-       return event;
-      else
-       gdk_event_free (event);
+      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; 
-#endif
 }
 
 static char *
@@ -431,56 +499,33 @@ event_mask_string (GdkEventMask mask)
   *p = '\0';
 #define BIT(x) \
   if (mask & GDK_##x##_MASK) \
-    p += sprintf (p, "%s" #x, (p > bfr ? " " : ""))
-  BIT(EXPOSURE);
-  BIT(POINTER_MOTION);
-  BIT(POINTER_MOTION_HINT);
-  BIT(BUTTON_MOTION);
-  BIT(BUTTON1_MOTION);
-  BIT(BUTTON2_MOTION);
-  BIT(BUTTON3_MOTION);
-  BIT(BUTTON_PRESS);
-  BIT(BUTTON_RELEASE);
-  BIT(KEY_PRESS);
-  BIT(KEY_RELEASE);
-  BIT(ENTER_NOTIFY);
-  BIT(LEAVE_NOTIFY);
-  BIT(FOCUS_CHANGE);
-  BIT(STRUCTURE);
-  BIT(PROPERTY_CHANGE);
-  BIT(VISIBILITY_NOTIFY);
-  BIT(PROXIMITY_IN);
-  BIT(PROXIMITY_OUT);
-  BIT(SUBSTRUCTURE);
-  BIT(SCROLL);
+    p += g_sprintf (p, "%s" #x, (p > bfr ? " " : ""))
+  BIT (EXPOSURE);
+  BIT (POINTER_MOTION);
+  BIT (POINTER_MOTION_HINT);
+  BIT (BUTTON_MOTION);
+  BIT (BUTTON1_MOTION);
+  BIT (BUTTON2_MOTION);
+  BIT (BUTTON3_MOTION);
+  BIT (BUTTON_PRESS);
+  BIT (BUTTON_RELEASE);
+  BIT (KEY_PRESS);
+  BIT (KEY_RELEASE);
+  BIT (ENTER_NOTIFY);
+  BIT (LEAVE_NOTIFY);
+  BIT (FOCUS_CHANGE);
+  BIT (STRUCTURE);
+  BIT (PROPERTY_CHANGE);
+  BIT (VISIBILITY_NOTIFY);
+  BIT (PROXIMITY_IN);
+  BIT (PROXIMITY_OUT);
+  BIT (SUBSTRUCTURE);
+  BIT (SCROLL);
 #undef BIT
 
   return bfr;
 }
 
-/*
- *--------------------------------------------------------------
- * gdk_pointer_grab
- *
- *   Grabs the pointer to a specific window
- *
- * Arguments:
- *   "window" is the window which will receive the grab
- *   "owner_events" specifies whether events will be reported as is,
- *     or relative to "window"
- *   "event_mask" masks only interesting events
- *   "confine_to" limits the cursor movement to the specified window
- *   "cursor" changes the cursor for the duration of the grab
- *   "time" specifies the time
- *
- * Results:
- *
- * Side effects:
- *   requires a corresponding call to gdk_pointer_ungrab
- *
- *--------------------------------------------------------------
- */
-
 GdkGrabStatus
 gdk_pointer_grab (GdkWindow    *window,
                  gboolean      owner_events,
@@ -489,10 +534,9 @@ gdk_pointer_grab (GdkWindow    *window,
                  GdkCursor    *cursor,
                  guint32       time)
 {
-  HWND hwnd_confined_to;
   HCURSOR hcursor;
   GdkCursorPrivate *cursor_private;
-  gint return_val;
+  gint return_val = GDK_GRAB_SUCCESS;
 
   g_return_val_if_fail (window != NULL, 0);
   g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
@@ -500,16 +544,11 @@ gdk_pointer_grab (GdkWindow    *window,
   
   cursor_private = (GdkCursorPrivate*) cursor;
   
-  if (!confine_to || GDK_WINDOW_DESTROYED (confine_to))
-    hwnd_confined_to = NULL;
-  else
-    hwnd_confined_to = GDK_WINDOW_HWND (confine_to);
-  
   if (!cursor)
     hcursor = NULL;
-  else
-    hcursor = cursor_private->hcursor;
-  
+  else if ((hcursor = CopyCursor (cursor_private->hcursor)) == NULL)
+    WIN32_API_FAILED ("CopyCursor");
+
   return_val = _gdk_input_grab_pointer (window,
                                        owner_events,
                                        event_mask,
@@ -520,18 +559,19 @@ gdk_pointer_grab (GdkWindow    *window,
     {
       if (!GDK_WINDOW_DESTROYED (window))
        {
-         GDK_NOTE (EVENTS, g_print ("gdk_pointer_grab: %#lx %s %#lx %s\n",
-                                    (gulong) GDK_WINDOW_HWND (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"),
-                                    (gulong) hcursor,
-                                    event_mask_string (event_mask)));
+                                    hcursor,
+                                    event_mask_string (event_mask),
+                                    (debug_indent == 0 ? "\n" : "")));
+
          p_grab_mask = event_mask;
-         p_grab_owner_events = (owner_events != 0);
+         p_grab_owner_events = owner_events;
          p_grab_automatic = FALSE;
          
-#if USE_SETCAPTURE
          SetCapture (GDK_WINDOW_HWND (window));
-#endif
          return_val = GDK_GRAB_SUCCESS;
        }
       else
@@ -540,153 +580,171 @@ gdk_pointer_grab (GdkWindow    *window,
   
   if (return_val == GDK_GRAB_SUCCESS)
     {
-      p_grab_window = window;
+      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);
+
+         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;
 }
 
-/*
- *--------------------------------------------------------------
- * gdk_pointer_ungrab
- *
- *   Releases any pointer grab
- *
- * Arguments:
- *
- * Results:
- *
- * Side effects:
- *
- *--------------------------------------------------------------
- */
-
 void
-gdk_pointer_ungrab (guint32 time)
+gdk_display_pointer_ungrab (GdkDisplay *display,
+                            guint32     time)
 {
-  GDK_NOTE (EVENTS, g_print ("gdk_pointer_ungrab\n"));
+  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 USE_SETCAPTURE
+
   if (GetCapture () != NULL)
     ReleaseCapture ();
-#endif
 
-  p_grab_window = NULL;
-}
+  /* FIXME: Generate GDK_CROSSING_UNGRAB events */
 
-/*
- *--------------------------------------------------------------
- * find_window_for_pointer_event
- *
- *   Find the window a pointer event (mouse up, down, move) should
- *   be reported to.  If the return value != reported_window then
- *   the ref count of reported_window will be decremented and the
- *   ref count of the return value will be incremented.
- *
- * Arguments:
- *
- *  "reported_window" is the gdk window the xevent was reported relative to
- *  "xevent" is the win32 message
- *
- * Results:
- *
- * Side effects:
- *
- *--------------------------------------------------------------
- */
+  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;
+    }
 
-static GdkWindow* 
-find_window_for_pointer_event (GdkWindow*  reported_window,
-                               MSG*        msg)
+  if (p_grab_confine_to != NULL)
+    {
+      API_CALL (ClipCursor, (NULL));
+      p_grab_confine_to = NULL;
+    }
+}
+
+static GdkWindow *
+find_real_window_for_grabbed_mouse_event (GdkWindow* reported_window,
+                                         MSG*       msg)
 {
   HWND hwnd;
   POINTS points;
   POINT pt;
-  GdkWindow* other_window;
-
-  if (p_grab_window == NULL || !p_grab_owner_events)
-    return reported_window;
+  GdkWindow* other_window = NULL;
 
   points = MAKEPOINTS (msg->lParam);
   pt.x = points.x;
   pt.y = points.y;
   ClientToScreen (msg->hwnd, &pt);
 
-  GDK_NOTE (EVENTS, g_print ("Finding window for grabbed pointer event at (%ld, %ld)\n",
-                             pt.x, pt.y));
-
   hwnd = WindowFromPoint (pt);
-  if (hwnd == NULL)
-    return reported_window;
-  other_window = gdk_win32_handle_table_lookup ((GdkNativeWindow) hwnd);
-  if (other_window == NULL)
-    return reported_window;
 
-  GDK_NOTE (EVENTS, g_print ("Found window %#x for point (%ld, %ld)\n",
-                            (guint) hwnd, pt.x, pt.y));
+  if (hwnd != NULL)
+    {
+      RECT rect;
+
+      GetClientRect (hwnd, &rect);
+      ScreenToClient (hwnd, &pt);
+      if (!PtInRect (&rect, pt))
+       return _gdk_root;
 
-  gdk_window_unref (reported_window);
-  gdk_window_ref (other_window);
+      other_window = gdk_win32_handle_table_lookup ((GdkNativeWindow) hwnd);
+    }
+
+  if (other_window == NULL)
+    return _gdk_root;
 
   return other_window;
 }
 
-/*
- *--------------------------------------------------------------
- * gdk_pointer_is_grabbed
- *
- *   Tell wether there is an active x pointer grab in effect
- *
- * Arguments:
- *
- * Results:
- *
- * Side effects:
- *
- *--------------------------------------------------------------
- */
+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_pointer_is_grabbed (void)
+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;
 }
 
-/*
- *--------------------------------------------------------------
- * gdk_keyboard_grab
- *
- *   Grabs the keyboard to a specific window
- *
- * Arguments:
- *   "window" is the window which will receive the grab
- *   "owner_events" specifies whether events will be reported as is,
- *     or relative to "window"
- *   "time" specifies the time
- *
- * Results:
- *
- * Side effects:
- *   requires a corresponding call to gdk_keyboard_ungrab
- *
- *--------------------------------------------------------------
- */
+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;
+
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
 
 GdkGrabStatus
 gdk_keyboard_grab (GdkWindow *window,
                   gboolean   owner_events,
                   guint32    time)
 {
+  GdkWindow *real_focus_window, *grab_focus_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 %#lx\n",
-                            (gulong) GDK_WINDOW_HWND (window)));
+  GDK_NOTE (EVENTS, g_print ("gdk_keyboard_grab %p\n",
+                            GDK_WINDOW_HWND (window)));
 
   if (!GDK_WINDOW_DESTROYED (window))
     {
@@ -697,57 +755,106 @@ gdk_keyboard_grab (GdkWindow *window,
     return_val = GDK_GRAB_ALREADY_GRABBED;
 
   if (return_val == GDK_GRAB_SUCCESS)
-    k_grab_window = window;
-  
-  return return_val;
-}
+    {
+      if (k_grab_window != NULL && k_grab_window != window)
+       generate_grab_broken_event (k_grab_window, TRUE, window);
 
-/*
- *--------------------------------------------------------------
- * gdk_keyboard_ungrab
- *
- *   Releases any keyboard grab
- *
- * Arguments:
- *
- * Results:
- *
- * Side effects:
- *
- *--------------------------------------------------------------
- */
+      assign_object (&k_grab_window, window);
+
+      if (!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);
+         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_keyboard_ungrab (guint32 time)
+gdk_display_keyboard_ungrab (GdkDisplay *display,
+                             guint32 time)
 {
+  GdkWindow *real_focus_window, *grab_focus_window;
+
+  g_return_if_fail (display == _gdk_display);
+
   GDK_NOTE (EVENTS, g_print ("gdk_keyboard_ungrab\n"));
 
-  k_grab_window = NULL;
+  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);
+       }
+    }
+
+  assign_object (&k_grab_window, NULL);
 }
 
-static GdkFilterReturn
-gdk_event_apply_filters (MSG      *msg,
-                        GdkEvent *event,
-                        GList    *filters)
+gboolean
+gdk_keyboard_grab_info_libgtk_only (GdkDisplay *display,
+                                   GdkWindow **grab_window,
+                                   gboolean   *owner_events)
 {
-  GdkEventFilter *filter;
-  GList *tmp_list;
-  GdkFilterReturn result;
-  
-  tmp_list = filters;
-  
-  while (tmp_list)
+  g_return_val_if_fail (display == _gdk_display, FALSE);
+
+  if (k_grab_window)
     {
-      filter = (GdkEventFilter *) tmp_list->data;
-      
-      result = (*filter->function) (msg, event, filter->data);
-      if (result !=  GDK_FILTER_CONTINUE)
-       return result;
-      
-      tmp_list = tmp_list->next;
+      if (grab_window)
+        *grab_window = k_grab_window;
+      if (owner_events)
+        *owner_events = k_grab_owner_events;
+
+      return TRUE;
     }
-  
-  return GDK_FILTER_CONTINUE;
+  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);
 }
 
 void 
@@ -761,38 +868,64 @@ gdk_add_client_message_filter (GdkAtom       message_type,
   filter->function = func;
   filter->data = data;
   
-  client_filters = g_list_prepend (client_filters, filter);
+  client_filters = g_list_append (client_filters, filter);
 }
 
-/* Thanks to Markus G. Kuhn <mkuhn@acm.org> for the ksysym<->Unicode
- * mapping functions, from the xterm sources.
- */
-
 static void
-build_key_event_state (GdkEvent *event)
+build_key_event_state (GdkEvent *event,
+                      BYTE     *key_state)
 {
-  if (GetKeyState (VK_SHIFT) < 0)
+  event->key.state = 0;
+
+  if (key_state[VK_SHIFT] & 0x80)
     event->key.state |= GDK_SHIFT_MASK;
-  if (GetKeyState (VK_CAPITAL) & 0x1)
+
+  if (key_state[VK_CAPITAL] & 0x01)
     event->key.state |= GDK_LOCK_MASK;
-  if (!is_altgr_key)
+
+  if (key_state[VK_LBUTTON] & 0x80)
+    event->key.state |= GDK_BUTTON1_MASK;
+  if (key_state[VK_MBUTTON] & 0x80)
+    event->key.state |= GDK_BUTTON2_MASK;
+  if (key_state[VK_RBUTTON] & 0x80)
+    event->key.state |= GDK_BUTTON3_MASK;
+  if (key_state[VK_XBUTTON1] & 0x80)
+    event->key.state |= GDK_BUTTON4_MASK;
+  if (key_state[VK_XBUTTON2] & 0x80)
+    event->key.state |= GDK_BUTTON5_MASK;
+
+  /* Win9x doesn't distinguish between left and right Control and Alt
+   * in the keyboard state as returned by GetKeyboardState(), so we
+   * have to punt, and accept either Control + either Alt to be AltGr.
+   *
+   * Alternatively, we could have some state saved when the Control
+   * and Alt keys messages come in, as the KF_EXTENDED bit in lParam
+   * does indicate correctly whether it is the right Control or Alt
+   * key. But that would be a bit messy.
+   */
+  if (!G_WIN32_IS_NT_BASED () &&
+      _gdk_keyboard_has_altgr &&
+      key_state[VK_CONTROL] & 0x80 &&
+      key_state[VK_MENU] & 0x80)
+    key_state[VK_LCONTROL] = key_state[VK_RMENU] = 0x80;
+
+  if (_gdk_keyboard_has_altgr &&
+      (key_state[VK_LCONTROL] & 0x80) &&
+      (key_state[VK_RMENU] & 0x80))
     {
-      if (GetKeyState (VK_CONTROL) < 0)
-       {
-         event->key.state |= GDK_CONTROL_MASK;
-#if 0
-         if (event->key.keyval < ' ')
-           event->key.keyval += '@';
-#endif
-       }
-#if 0
-      else if (event->key.keyval < ' ')
-       {
-         event->key.state |= GDK_CONTROL_MASK;
-         event->key.keyval += '@';
-       }
-#endif
-      if (GetKeyState (VK_MENU) < 0)
+      event->key.group = 1;
+      event->key.state |= GDK_MOD2_MASK;
+      if (key_state[VK_RCONTROL] & 0x80)
+       event->key.state |= GDK_CONTROL_MASK;
+      if (key_state[VK_LMENU] & 0x80)
+       event->key.state |= GDK_MOD1_MASK;
+    }
+  else
+    {
+      event->key.group = 0;
+      if (key_state[VK_CONTROL] & 0x80)
+       event->key.state |= GDK_CONTROL_MASK;
+      if (key_state[VK_MENU] & 0x80)
        event->key.state |= GDK_MOD1_MASK;
     }
 }
@@ -803,18 +936,41 @@ build_pointer_event_state (MSG *msg)
   gint state;
   
   state = 0;
+
   if (msg->wParam & MK_CONTROL)
     state |= GDK_CONTROL_MASK;
-  if (msg->wParam & MK_LBUTTON)
+
+  if ((msg->message != WM_LBUTTONDOWN &&
+       (msg->wParam & MK_LBUTTON)) ||
+      msg->message == WM_LBUTTONUP)
     state |= GDK_BUTTON1_MASK;
-  if (msg->wParam & MK_MBUTTON)
+
+  if ((msg->message != WM_MBUTTONDOWN &&
+       (msg->wParam & MK_MBUTTON)) ||
+      msg->message == WM_MBUTTONUP)
     state |= GDK_BUTTON2_MASK;
-  if (msg->wParam & MK_RBUTTON)
+
+  if ((msg->message != WM_RBUTTONDOWN &&
+       (msg->wParam & MK_RBUTTON)) ||
+      msg->message == WM_RBUTTONUP)
     state |= GDK_BUTTON3_MASK;
+
+  if (((msg->message != WM_XBUTTONDOWN || HIWORD (msg->wParam) != XBUTTON1) &&
+       (msg->wParam & MK_XBUTTON1)) ||
+      (msg->message == WM_XBUTTONUP && HIWORD (msg->wParam) == XBUTTON1))
+    state |= GDK_BUTTON4_MASK;
+
+  if (((msg->message != WM_XBUTTONDOWN || HIWORD (msg->wParam) != XBUTTON2) &&
+       (msg->wParam & MK_XBUTTON2)) ||
+      (msg->message == WM_XBUTTONUP && HIWORD (msg->wParam) == XBUTTON2))
+    state |= GDK_BUTTON5_MASK;
+
   if (msg->wParam & MK_SHIFT)
     state |= GDK_SHIFT_MASK;
+
   if (GetKeyState (VK_MENU) < 0)
     state |= GDK_MOD1_MASK;
+
   if (GetKeyState (VK_CAPITAL) & 0x1)
     state |= GDK_LOCK_MASK;
 
@@ -822,198 +978,40 @@ build_pointer_event_state (MSG *msg)
 }
 
 static void
-build_keypress_event (GdkWindowImplWin32 *impl,
-                     GdkEvent           *event,
-                     MSG                *msg)
+build_wm_ime_composition_event (GdkEvent *event,
+                               MSG      *msg,
+                               wchar_t   wc,
+                               BYTE     *key_state)
 {
-  HIMC himc;
-  gint i, bytecount, ucount, ucleft, len;
-  guchar buf[100], *bp;
-  wchar_t wbuf[100], *wcp;
-
-  event->key.type = GDK_KEY_PRESS;
-  event->key.time = msg->time;
-  event->key.state = 0;
-  
-  if (msg->message == WM_IME_COMPOSITION)
-    {
-      himc = ImmGetContext (msg->hwnd);
-
-      bytecount = ImmGetCompositionStringW (himc, GCS_RESULTSTR,
-                                           wbuf, sizeof (wbuf));
-      ucount = bytecount / 2;
-    }
-  else
-    {
-      if (msg->message == WM_CHAR || msg->message == WM_SYSCHAR)
-       {
-         bytecount = MIN ((msg->lParam & 0xFFFF), sizeof (buf));
-         for (i = 0; i < bytecount; i++)
-           buf[i] = msg->wParam;
-       }
-      else /* WM_IME_CHAR */
-       {
-         event->key.keyval = GDK_VoidSymbol;
-         if (msg->wParam & 0xFF00)
-           {
-             /* Contrary to some versions of the documentation,
-              * the lead byte is the most significant byte.
-              */
-             buf[0] = ((msg->wParam >> 8) & 0xFF);
-             buf[1] = (msg->wParam & 0xFF);
-             bytecount = 2;
-           }
-         else
-           {
-             buf[0] = (msg->wParam & 0xFF);
-             bytecount = 1;
-           }
-       }
-
-      /* Convert from the window's current code page
-       * to Unicode. Then convert to UTF-8.
-       * We don't handle the surrogate stuff. Should we?
-       */
-      ucount = MultiByteToWideChar (impl->charset_info.ciACP,
-                                   0, buf, bytecount,
-                                   wbuf, sizeof (wbuf) / sizeof (wbuf[0]));
-      
-    }
-  if (ucount == 0)
-    event->key.keyval = GDK_VoidSymbol;
-  else if (msg->message == WM_CHAR || msg->message == WM_SYSCHAR)
-    {
-      if (msg->wParam < ' ')
-       {
-         event->key.keyval = msg->wParam + '@';
-         /* This is needed in case of Alt+nnn or Alt+0nnn (on the numpad)
-          * where nnn<32
-          */
-         event->key.state |= GDK_CONTROL_MASK;
-       }
-      else
-       event->key.keyval = gdk_unicode_to_keyval (wbuf[0]);
-    }
-
-  build_key_event_state (event);
-
-  /* Build UTF-8 string */
-  ucleft = ucount;
-  len = 0;
-  wcp = wbuf;
-  while (ucleft-- > 0)
-    {
-      wchar_t c = *wcp++;
-
-      if (c < 0x80)
-       len += 1;
-      else if (c < 0x800)
-       len += 2;
-      else
-       len += 3;
-    }
-
-  event->key.string = g_malloc (len + 1);
-  event->key.length = len;
+  event->key.time = _gdk_win32_get_next_tick (msg->time);
   
-  ucleft = ucount;
-  wcp = wbuf;
-  bp = event->key.string;
-  while (ucleft-- > 0)
-    {
-      int first;
-      wchar_t c = *wcp++;
-
-      if (c < 0x80)
-       {
-         first = 0;
-         len = 1;
-       }
-      else if (c < 0x800)
-       {
-         first = 0xc0;
-         len = 2;
-       }
-      else
-       {
-         first = 0xe0;
-         len = 3;
-       }
-
-#if 1      
-      /* Woo-hoo! */
-      switch (len)
-       {
-       case 3: bp[2] = (c & 0x3f) | 0x80; c >>= 6; /* Fall through */
-       case 2: bp[1] = (c & 0x3f) | 0x80; c >>= 6; /* Fall through */
-       case 1: bp[0] = c | first;
-       }
-#else
-      for (i = len - 1; i > 0; --i)
-       {
-         bp[i] = (c & 0x3f) | 0x80;
-         c >>= 6;
-       }
-      bp[0] = c | first;
-#endif
-
-      bp += len;
-    }
-  *bp = 0;
-}
-
-static void
-build_keyrelease_event (GdkWindowImplWin32 *impl,
-                       GdkEvent           *event,
-                       MSG                *msg)
-{
-  guchar buf;
-  wchar_t wbuf;
-
-  event->key.type = GDK_KEY_RELEASE;
-  event->key.time = msg->time;
-  event->key.state = 0;
+  build_key_event_state (event, key_state);
 
-  if (msg->message == WM_CHAR || msg->message == WM_SYSCHAR)
-    if (msg->wParam < ' ')
-      event->key.keyval = msg->wParam + '@';
-    else
-      {
-       buf = msg->wParam;
-       MultiByteToWideChar (impl->charset_info.ciACP,
-                            0, &buf, 1, &wbuf, 1);
-
-       event->key.keyval = gdk_unicode_to_keyval (wbuf);
-      }
-  else
-    event->key.keyval = GDK_VoidSymbol;
-  build_key_event_state (event);
+  event->key.hardware_keycode = 0; /* FIXME: What should it be? */
   event->key.string = NULL;
   event->key.length = 0;
+  event->key.keyval = gdk_unicode_to_keyval (wc);
 }
 
+#ifdef G_ENABLE_DEBUG
+
 static void
-print_event_state (gint state)
+print_event_state (guint state)
 {
 #define CASE(bit) if (state & GDK_ ## bit ## _MASK) g_print (#bit " ");
   CASE (SHIFT);
   CASE (LOCK);
   CASE (CONTROL);
   CASE (MOD1);
+  CASE (MOD2);
+  CASE (MOD3);
+  CASE (MOD4);
+  CASE (MOD5);
   CASE (BUTTON1);
   CASE (BUTTON2);
   CASE (BUTTON3);
-#undef CASE
-}
-
-static void
-print_window_state (GdkWindowState state)
-{
-#define CASE(bit) if (state & GDK_WINDOW_STATE_ ## bit ) g_print (#bit " ");
-  CASE (WITHDRAWN);
-  CASE (ICONIFIED);
-  CASE (MAXIMIZED);
-  CASE (STICKY);
+  CASE (BUTTON4);
+  CASE (BUTTON5);
 #undef CASE
 }
 
@@ -1022,9 +1020,10 @@ print_event (GdkEvent *event)
 {
   gchar *escaped, *kvname;
 
+  g_print ("%s%*s===> ", (debug_indent > 0 ? "\n" : ""), debug_indent, "");
   switch (event->any.type)
     {
-#define CASE(x) case x: g_print ( #x " "); break;
+#define CASE(x) case x: g_print (#x); break;
     CASE (GDK_NOTHING);
     CASE (GDK_DELETE);
     CASE (GDK_DESTROY);
@@ -1060,23 +1059,25 @@ print_event (GdkEvent *event)
     CASE (GDK_SCROLL);
     CASE (GDK_WINDOW_STATE);
     CASE (GDK_SETTING);
+    CASE (GDK_OWNER_CHANGE);
+    CASE (GDK_GRAB_BROKEN);
 #undef CASE
+    default: g_assert_not_reached ();
     }
-  g_print ("%#lx ", (gulong) GDK_WINDOW_HWND (event->any.window));
+
+  g_print (" %p ", GDK_WINDOW_HWND (event->any.window));
 
   switch (event->any.type)
     {
     case GDK_EXPOSE:
-      g_print ("%dx%d@+%d+%d %d",
-              event->expose.area.width,
-              event->expose.area.height,
-              event->expose.area.x,
-              event->expose.area.y,
+      g_print ("%s %d",
+              _gdk_win32_gdkrectangle_to_string (&event->expose.area),
               event->expose.count);
       break;
     case GDK_MOTION_NOTIFY:
-      g_print ("(%.4g,%.4g) %s",
+      g_print ("(%.4g,%.4g) (%.4g,%.4g) %s",
               event->motion.x, event->motion.y,
+              event->motion.x_root, event->motion.y_root,
               event->motion.is_hint ? "HINT " : "");
       print_event_state (event->motion.state);
       break;
@@ -1084,9 +1085,10 @@ print_event (GdkEvent *event)
     case GDK_2BUTTON_PRESS:
     case GDK_3BUTTON_PRESS:
     case GDK_BUTTON_RELEASE:
-      g_print ("%d (%.4g,%.4g) ",
+      g_print ("%d (%.4g,%.4g) (%.4g,%.4g) ",
               event->button.button,
-              event->button.x, event->button.y);
+              event->button.x, event->button.y,
+              event->button.x_root, event->button.y_root);
       print_event_state (event->button.state);
       break;
     case GDK_KEY_PRESS: 
@@ -1096,7 +1098,8 @@ print_event (GdkEvent *event)
       else
        escaped = g_strescape (event->key.string, NULL);
       kvname = gdk_keyval_name (event->key.keyval);
-      g_print ("%s %d:\"%s\" ",
+      g_print ("%#.02x group:%d %s %d:\"%s\" ",
+              event->key.hardware_keycode, event->key.group,
               (kvname ? kvname : "??"),
               event->key.length,
               escaped);
@@ -1105,14 +1108,36 @@ print_event (GdkEvent *event)
       break;
     case GDK_ENTER_NOTIFY:
     case GDK_LEAVE_NOTIFY:
-      g_print ("%s ",
-              (event->crossing.detail == GDK_NOTIFY_INFERIOR ? "INFERIOR" :
-               (event->crossing.detail == GDK_NOTIFY_ANCESTOR ? "ANCESTOR" :
-                (event->crossing.detail == GDK_NOTIFY_NONLINEAR ? "NONLINEAR" :
-                 "???"))));
+      g_print ("%p (%.4g,%.4g) (%.4g,%.4g) %s %s%s",
+              event->crossing.subwindow == NULL ? NULL : GDK_WINDOW_HWND (event->crossing.subwindow),
+              event->crossing.x, event->crossing.y,
+              event->crossing.x_root, event->crossing.y_root,
+              (event->crossing.mode == GDK_CROSSING_NORMAL ? "NORMAL" :
+               (event->crossing.mode == GDK_CROSSING_GRAB ? "GRAB" :
+                (event->crossing.mode == GDK_CROSSING_UNGRAB ? "UNGRAB" :
+                 "???"))),
+              (event->crossing.detail == GDK_NOTIFY_ANCESTOR ? "ANCESTOR" :
+               (event->crossing.detail == GDK_NOTIFY_VIRTUAL ? "VIRTUAL" :
+                (event->crossing.detail == GDK_NOTIFY_INFERIOR ? "INFERIOR" :
+                 (event->crossing.detail == GDK_NOTIFY_NONLINEAR ? "NONLINEAR" :
+                  (event->crossing.detail == GDK_NOTIFY_NONLINEAR_VIRTUAL ? "NONLINEAR_VIRTUAL" :
+                   (event->crossing.detail == GDK_NOTIFY_UNKNOWN ? "UNKNOWN" :
+                    "???")))))),
+              event->crossing.focus ? " FOCUS" : "");
+      print_event_state (event->crossing.state);
+      break;
+    case GDK_FOCUS_CHANGE:
+      g_print ("%s", (event->focus_change.in ? "IN" : "OUT"));
+      break;
+    case GDK_CONFIGURE:
+      g_print ("x:%d y:%d w:%d h:%d",
+              event->configure.x, event->configure.y,
+              event->configure.width, event->configure.height);
       break;
     case GDK_SCROLL:
-      g_print ("%s ",
+      g_print ("(%.4g,%.4g) (%.4g,%.4g) %s ",
+              event->scroll.x, event->scroll.y,
+              event->scroll.x_root, event->scroll.y_root,
               (event->scroll.direction == GDK_SCROLL_UP ? "UP" :
                (event->scroll.direction == GDK_SCROLL_DOWN ? "DOWN" :
                 (event->scroll.direction == GDK_SCROLL_LEFT ? "LEFT" :
@@ -1121,69 +1146,239 @@ print_event (GdkEvent *event)
       print_event_state (event->scroll.state);
       break;
     case GDK_WINDOW_STATE:
-      print_window_state (event->window_state.changed_mask);
-      print_window_state (event->window_state.new_window_state);
+      g_print ("%s: %s",
+              _gdk_win32_window_state_to_string (event->window_state.changed_mask),
+              _gdk_win32_window_state_to_string (event->window_state.new_window_state));
+    case GDK_SETTING:
+      g_print ("%s: %s",
+              (event->setting.action == GDK_SETTING_ACTION_NEW ? "NEW" :
+               (event->setting.action == GDK_SETTING_ACTION_CHANGED ? "CHANGED" :
+                (event->setting.action == GDK_SETTING_ACTION_DELETED ? "DELETED" :
+                 "???"))),
+              (event->setting.name ? event->setting.name : "NULL"));
+    case GDK_GRAB_BROKEN:
+      g_print ("%s %s %p",
+              (event->grab_broken.keyboard ? "KEYBOARD" : "POINTER"),
+              (event->grab_broken.implicit ? "IMPLICIT" : "EXPLICIT"),
+              (event->grab_broken.grab_window ? GDK_WINDOW_HWND (event->grab_broken.grab_window) : 0));
     default:
       /* Nothing */
       break;
     }  
-  g_print ("\n");
+  g_print ("%s", (debug_indent == 0 ? "\n" : "")); 
+}
+
+static char *
+decode_key_lparam (LPARAM lParam)
+{
+  static char buf[100];
+  char *p = buf;
+
+  if (HIWORD (lParam) & KF_UP)
+    p += g_sprintf (p, "KF_UP ");
+  if (HIWORD (lParam) & KF_REPEAT)
+    p += g_sprintf (p, "KF_REPEAT ");
+  if (HIWORD (lParam) & KF_ALTDOWN)
+    p += g_sprintf (p, "KF_ALTDOWN ");
+  if (HIWORD (lParam) & KF_EXTENDED)
+    p += g_sprintf (p, "KF_EXTENDED ");
+  p += g_sprintf (p, "sc:%d rep:%d", LOBYTE (HIWORD (lParam)), LOWORD (lParam));
+
+  return buf;
+}
+
+#endif
+
+static void
+fixup_event (GdkEvent *event)
+{
+  if (event->any.window)
+    g_object_ref (event->any.window);
+  if (((event->any.type == GDK_ENTER_NOTIFY) ||
+       (event->any.type == GDK_LEAVE_NOTIFY)) &&
+      (event->crossing.subwindow != NULL))
+    g_object_ref (event->crossing.subwindow);
+  event->any.send_event = InSendMessage (); 
+}
+
+static void
+append_event (GdkEvent *event)
+{
+  fixup_event (event);
+  _gdk_event_queue_append (_gdk_display, event);
+  GDK_NOTE (EVENTS, print_event (event));
+}
+
+static void
+fill_key_event_string (GdkEvent *event)
+{
+  gunichar c;
+  gchar buf[256];
+
+  /* Fill in event->string crudely, since various programs
+   * depend on it.
+   */
+  
+  c = 0;
+  if (event->key.keyval != GDK_VoidSymbol)
+    c = gdk_keyval_to_unicode (event->key.keyval);
+
+  if (c)
+    {
+      gsize bytes_written;
+      gint len;
+      
+      /* Apply the control key - Taken from Xlib
+       */
+      if (event->key.state & GDK_CONTROL_MASK)
+       {
+         if ((c >= '@' && c < '\177') || c == ' ')
+           c &= 0x1F;
+         else if (c == '2')
+           {
+             event->key.string = g_memdup ("\0\0", 2);
+             event->key.length = 1;
+             return;
+           }
+         else if (c >= '3' && c <= '7')
+           c -= ('3' - '\033');
+         else if (c == '8')
+           c = '\177';
+         else if (c == '/')
+           c = '_' & 0x1F;
+       }
+      
+      len = g_unichar_to_utf8 (c, buf);
+      buf[len] = '\0';
+         
+      event->key.string = g_locale_from_utf8 (buf, len,
+                                             NULL, &bytes_written,
+                                             NULL);
+      if (event->key.string)
+       event->key.length = bytes_written;
+    }
+  else if (event->key.keyval == GDK_Escape)
+    {
+      event->key.length = 1;
+      event->key.string = g_strdup ("\033");
+    }
+  else if (event->key.keyval == GDK_Return ||
+          event->key.keyval == GDK_KP_Enter)
+    {
+      event->key.length = 1;
+      event->key.string = g_strdup ("\r");
+    }
+  
+  if (!event->key.string)
+    {
+      event->key.length = 0;
+      event->key.string = g_strdup ("");
+    }
+}
+
+static GdkFilterReturn
+apply_filters (GdkWindow  *window,
+              MSG        *msg,
+              GList      *filters)
+{
+  GdkFilterReturn result = GDK_FILTER_CONTINUE;
+  GdkEvent *event;
+  GList *node;
+  GList *tmp_list;
+
+  event = gdk_event_new (GDK_NOTHING);
+  if (window != NULL)
+    event->any.window = g_object_ref (window);
+  ((GdkEventPrivate *)event)->flags |= GDK_EVENT_PENDING;
+
+  /* I think GdkFilterFunc semantics require the passed-in event
+   * to already be in the queue. The filter func can generate
+   * more events and append them after it if it likes.
+   */
+  node = _gdk_event_queue_append (_gdk_display, event);
+  
+  tmp_list = filters;
+  while (tmp_list)
+    {
+      GdkEventFilter *filter = (GdkEventFilter *) tmp_list->data;
+      
+      tmp_list = tmp_list->next;
+      result = filter->function (msg, event, filter->data);
+      if (result !=  GDK_FILTER_CONTINUE)
+       break;
+    }
+
+  if (result == GDK_FILTER_CONTINUE || result == GDK_FILTER_REMOVE)
+    {
+      _gdk_event_queue_remove_link (_gdk_display, node);
+      g_list_free_1 (node);
+      gdk_event_free (event);
+    }
+  else /* GDK_FILTER_TRANSLATE */
+    {
+      ((GdkEventPrivate *)event)->flags &= ~GDK_EVENT_PENDING;
+      fixup_event (event);
+      GDK_NOTE (EVENTS, print_event (event));
+    }
+  return result;
 }
 
 static gboolean
-gdk_window_is_child (GdkWindow *parent,
-                    GdkWindow *window)
+gdk_window_is_ancestor (GdkWindow *ancestor,
+                       GdkWindow *window)
 {
-  if (parent == NULL || window == NULL)
+  if (ancestor == NULL || window == NULL)
     return FALSE;
 
-  return (gdk_window_get_parent (window) == parent ||
-         gdk_window_is_child (parent, gdk_window_get_parent (window)));
+  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,
+synthesize_enter_or_leave_event (GdkWindow     *window,
+                                MSG            *msg,
+                                GdkEventType    type,
+                                GdkCrossingMode mode,
                                 GdkNotifyType detail,
-                                gint          x,
-                                gint          y)
+                                gint            x,
+                                gint            y)
 {
   GdkEvent *event;
+  gint xoffset, yoffset;
   
-  event = _gdk_event_new ();
-  event->crossing.type = type;
+  event = gdk_event_new (type);
   event->crossing.window = window;
-  event->crossing.send_event = FALSE;
-  gdk_window_ref (event->crossing.window);
   event->crossing.subwindow = NULL;
-  event->crossing.time = msg->time;
-  event->crossing.x = x;
-  event->crossing.y = y;
-  event->crossing.x_root = msg->pt.x;
-  event->crossing.y_root = msg->pt.y;
-  event->crossing.mode = GDK_CROSSING_NORMAL;
+  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; /* ??? */
-  event->crossing.state = 0; /* ??? */
+  event->crossing.focus = TRUE; /* FIXME: Set correctly */
+  event->crossing.state = 0;   /* FIXME: Set correctly */
   
-  _gdk_event_queue_append (event);
+  append_event (event);
   
-  if (type == GDK_ENTER_NOTIFY
-      && GDK_WINDOW_OBJECT (window)->extension_events != 0)
-    _gdk_input_enter_event (&event->crossing, window);
-
-  GDK_NOTE (EVENTS, print_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,
-                       GdkNotifyType detail)
+synthesize_leave_event (GdkWindow      *window,
+                       MSG            *msg,
+                       GdkCrossingMode mode,
+                       GdkNotifyType   detail)
 {
   POINT pt;
 
-  if (!(GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->event_mask & GDK_LEAVE_NOTIFY_MASK))
+  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;
 
   /* Leave events are at (current_x,current_y) in current_window */
@@ -1194,72 +1389,87 @@ synthesize_leave_event (GdkWindow    *window,
       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, detail, pt.x, pt.y);
+      synthesize_enter_or_leave_event (window, msg, GDK_LEAVE_NOTIFY, mode, detail, pt.x, pt.y);
     }
   else
-    synthesize_enter_or_leave_event (window, msg, GDK_LEAVE_NOTIFY, detail, current_x, current_y);
+    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);
+   */
 }
   
 static void
-synthesize_enter_event (GdkWindow    *window,
-                       MSG          *msg,
-                       GdkNotifyType detail)
+synthesize_enter_event (GdkWindow      *window,
+                       MSG            *msg,
+                       GdkCrossingMode mode,
+                       GdkNotifyType   detail)
 {
   POINT pt;
 
-  if (!(GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->event_mask & GDK_ENTER_NOTIFY_MASK))
+  if (p_grab_window != NULL && !p_grab_owner_events && !(p_grab_mask & GDK_ENTER_NOTIFY_MASK))
+    return;
+
+  if (!(((GdkWindowObject *) window)->event_mask & GDK_ENTER_NOTIFY_MASK))
     return;
 
-  /* Enter events are at LOWORD (msg->lParam), HIWORD
-   * (msg->lParam) in msg->hwnd */
+  /* Enter events are at GET_X_LPARAM (msg->lParam), GET_Y_LPARAM
+   * (msg->lParam) in msg->hwnd
+   */
 
-  pt.x = LOWORD (msg->lParam);
-  pt.y = HIWORD (msg->lParam);
+  pt.x = GET_X_LPARAM (msg->lParam);
+  pt.y = GET_Y_LPARAM (msg->lParam);
   if (msg->hwnd != GDK_WINDOW_HWND (window))
     {
       ClientToScreen (msg->hwnd, &pt);
       ScreenToClient (GDK_WINDOW_HWND (window), &pt);
     }
-  synthesize_enter_or_leave_event (window, msg, GDK_ENTER_NOTIFY, detail, pt.x, pt.y);
+  synthesize_enter_or_leave_event (window, msg, GDK_ENTER_NOTIFY, mode, detail, pt.x, pt.y);
+
+  track_mouse_event (TME_LEAVE, GDK_WINDOW_HWND (window));
 }
   
 static void
-synthesize_enter_events (GdkWindow    *from,
-                        GdkWindow    *to,
-                        MSG          *msg,
-                        GdkNotifyType detail)
+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, detail);
-  synthesize_enter_event (to, msg, detail);
+    synthesize_enter_events (from, prev, msg, mode, detail);
+  synthesize_enter_event (to, msg, mode, detail);
 }
                         
 static void
-synthesize_leave_events (GdkWindow    *from,
-                        GdkWindow    *to,
-                        MSG          *msg,
-                        GdkNotifyType detail)
+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, detail);
+  synthesize_leave_event (from, msg, mode, detail);
   if (next != to)
-    synthesize_leave_events (next, to, msg, detail);
+    synthesize_leave_events (next, to, msg, mode, detail);
 }
                         
 static void
-synthesize_crossing_events (GdkWindow *window,
-                           MSG       *msg)
+synthesize_crossing_events (GdkWindow      *window,
+                           GdkCrossingMode mode,
+                           MSG            *msg)
 {
   GdkWindow *intermediate, *tem, *common_ancestor;
 
-  if (gdk_window_is_child (current_window, window))
+  if (gdk_window_is_ancestor (current_window, window))
     {
       /* Pointer has moved to an inferior window. */
-      synthesize_leave_event (current_window, msg, GDK_NOTIFY_INFERIOR);
+      synthesize_leave_event (current_window, msg, mode, GDK_NOTIFY_INFERIOR);
       
       /* If there are intermediate windows, generate ENTER_NOTIFY
        * events for them
@@ -1267,15 +1477,15 @@ synthesize_crossing_events (GdkWindow *window,
       intermediate = gdk_window_get_parent (window);
       if (intermediate != current_window)
        {
-         synthesize_enter_events (current_window, intermediate, msg, GDK_NOTIFY_VIRTUAL);
+         synthesize_enter_events (current_window, intermediate, msg, mode, GDK_NOTIFY_VIRTUAL);
        }
       
-      synthesize_enter_event (window, msg, GDK_NOTIFY_ANCESTOR);
+      synthesize_enter_event (window, msg, mode, GDK_NOTIFY_ANCESTOR);
     }
-  else if (gdk_window_is_child (window, current_window))
+  else if (gdk_window_is_ancestor (window, current_window))
     {
       /* Pointer has moved to an ancestor window. */
-      synthesize_leave_event (current_window, msg, GDK_NOTIFY_ANCESTOR);
+      synthesize_leave_event (current_window, msg, mode, GDK_NOTIFY_ANCESTOR);
       
       /* If there are intermediate windows, generate LEAVE_NOTIFY
        * events for them
@@ -1283,8 +1493,10 @@ synthesize_crossing_events (GdkWindow *window,
       intermediate = gdk_window_get_parent (current_window);
       if (intermediate != window)
        {
-         synthesize_leave_events (intermediate, window, msg, GDK_NOTIFY_VIRTUAL);
+         synthesize_leave_events (intermediate, window, msg, mode, GDK_NOTIFY_VIRTUAL);
        }
+
+      synthesize_enter_event (window, msg, mode, GDK_NOTIFY_INFERIOR);
     }
   else if (current_window)
     {
@@ -1294,128 +1506,240 @@ synthesize_crossing_events (GdkWindow *window,
        common_ancestor = gdk_window_get_parent (tem);
        tem = common_ancestor;
       } while (common_ancestor &&
-              !gdk_window_is_child (common_ancestor, window));
+              !gdk_window_is_ancestor (common_ancestor, window));
       if (common_ancestor)
        {
-         synthesize_leave_event (current_window, msg, GDK_NOTIFY_NONLINEAR);
+         synthesize_leave_event (current_window, msg, mode, GDK_NOTIFY_NONLINEAR);
          intermediate = gdk_window_get_parent (current_window);
          if (intermediate != common_ancestor)
            {
              synthesize_leave_events (intermediate, common_ancestor,
-                                      msg, GDK_NOTIFY_NONLINEAR_VIRTUAL);
+                                      msg, mode, GDK_NOTIFY_NONLINEAR_VIRTUAL);
            }
          intermediate = gdk_window_get_parent (window);
          if (intermediate != common_ancestor)
            {
              synthesize_enter_events (common_ancestor, intermediate,
-                                      msg, GDK_NOTIFY_NONLINEAR_VIRTUAL);
+                                      msg, mode, GDK_NOTIFY_NONLINEAR_VIRTUAL);
            }
-         synthesize_enter_event (window, msg, GDK_NOTIFY_NONLINEAR);
+         synthesize_enter_event (window, msg, mode, GDK_NOTIFY_NONLINEAR);
        }
     }
   else
     {
       /* Dunno where we are coming from */
-      synthesize_enter_event (window, msg, GDK_NOTIFY_UNKNOWN);
+      synthesize_enter_event (window, msg, mode, GDK_NOTIFY_UNKNOWN);
     }
 
-  if (current_window)
-    gdk_window_unref (current_window);
-  current_window = window;
-  gdk_window_ref (current_window);
+  assign_object (&current_window, window);
 }
 
 static void
-translate_mouse_coords (GdkWindow *window1,
-                       GdkWindow *window2,
-                       MSG       *msg)
+synthesize_expose_events (GdkWindow *window)
 {
-  POINT pt;
+  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;
+    }
 
-  pt.x = LOWORD (msg->lParam);
-  pt.y = HIWORD (msg->lParam);
-  ClientToScreen (GDK_WINDOW_HWND (window1), &pt);
-  ScreenToClient (GDK_WINDOW_HWND (window2), &pt);
-  msg->lParam = MAKELPARAM (pt.x, pt.y);
-  GDK_NOTE (EVENTS, g_print ("...new coords are (%ld,%ld)\n", pt.x, pt.y));
-}
+  g_list_free (head);
 
-static gboolean
+  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);
+       }
+      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");
+      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));
+    }
+  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 */
+static gboolean
 propagate (GdkWindow  **window,
           MSG         *msg,
           GdkWindow   *grab_window,
           gboolean     grab_owner_events,
           gint         grab_mask,
           gboolean   (*doesnt_want_it) (gint mask,
-                                        MSG *msg))
+                                        MSG *msg),
+          gboolean     check_extended)
 {
   gboolean in_propagation = FALSE;
 
   if (grab_window != NULL && !grab_owner_events)
     {
       /* Event source is grabbed with owner_events FALSE */
-      GDK_NOTE (EVENTS, g_print ("...grabbed, 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\n"));
+         GDK_NOTE (EVENTS, g_print (" (grabber doesn't want it)"));
          return FALSE;
        }
       else
        {
-         GDK_NOTE (EVENTS, g_print ("...sending to grabber %#lx\n",
-                                    (gulong) GDK_WINDOW_HWND (grab_window)));
-         gdk_drawable_unref (*window);
-         *window = grab_window;
-         gdk_drawable_ref (*window);
+         GDK_NOTE (EVENTS, g_print (" (to grabber)"));
+         assign_object (window, grab_window);
          return TRUE;
        }
     }
   while (TRUE)
     {
-     if ((*doesnt_want_it) (GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (*window)->impl)->event_mask, msg))
+      /* 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))
        {
          /* Owner doesn't want it, propagate to parent. */
-         if (GDK_WINDOW (GDK_WINDOW_OBJECT (*window)->parent) == _gdk_parent_root)
+         GdkWindow *parent = gdk_window_get_parent (*window);
+         if (parent == _gdk_root || parent == NULL)
            {
              /* No parent; check if grabbed */
              if (grab_window != NULL)
                {
                  /* Event source is grabbed with owner_events TRUE */
-                 GDK_NOTE (EVENTS, g_print ("...undelivered, but grabbed\n"));
+
+                 /* 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 */
-                     GDK_NOTE (EVENTS, g_print ("...grabber doesn't want it\n"));
+                     GDK_NOTE (EVENTS, g_print (" (grabber doesn't want it)"));
                      return FALSE;
                    }
                  else
                    {
                      /* Grabbed! */
-                     GDK_NOTE (EVENTS,
-                               g_print ("...sending to grabber %#lx\n",
-                                        (gulong) GDK_WINDOW_HWND (grab_window)));
-                     gdk_drawable_unref (*window);
-                     *window = grab_window;
-                     gdk_drawable_ref (*window);
+                     GDK_NOTE (EVENTS, g_print (" (to grabber)"));
+                     assign_object (window, grab_window);
                      return TRUE;
                    }
                }
              else
                {
-                 GDK_NOTE (EVENTS, g_print ("...undelivered\n"));
+                 GDK_NOTE (EVENTS, g_print (" (undelivered)"));
                  return FALSE;
                }
            }
          else
            {
-             gdk_drawable_unref (*window);
-             *window = GDK_WINDOW (GDK_WINDOW_OBJECT (*window)->parent);
-             gdk_drawable_ref (*window);
-             GDK_NOTE (EVENTS, g_print ("%s %#lx",
-                                        (in_propagation ? "," : " ...propagating to"),
-                                        (gulong) GDK_WINDOW_HWND (*window)));
-             /* The only branch where we actually continue the loop */
+             assign_object (window, parent);
              in_propagation = TRUE;
+             /* The only branch where we actually continue the loop */
            }
        }
       else
@@ -1427,11 +1751,10 @@ static gboolean
 doesnt_want_key (gint mask,
                 MSG *msg)
 {
-  return (((msg->message == WM_KEYUP || msg->message == WM_SYSKEYUP)
-          && !(mask & GDK_KEY_RELEASE_MASK))
-         ||
-         ((msg->message == WM_KEYDOWN || msg->message == WM_SYSKEYDOWN)
-          && !(mask & GDK_KEY_PRESS_MASK)));
+  return (((msg->message == WM_KEYUP || msg->message == WM_SYSKEYUP) &&
+          !(mask & GDK_KEY_RELEASE_MASK)) ||
+         ((msg->message == WM_KEYDOWN || msg->message == WM_SYSKEYDOWN) &&
+          !(mask & GDK_KEY_PRESS_MASK)));
 }
 
 static gboolean
@@ -1459,15 +1782,11 @@ 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)));
+  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
@@ -1481,1339 +1800,1229 @@ doesnt_want_scroll (gint mask,
 #endif
 }
 
-static char *
-decode_key_lparam (LPARAM lParam)
+static void
+handle_configure_event (MSG       *msg,
+                       GdkWindow *window)
 {
-  static char buf[100];
-  char *p = buf;
+  RECT client_rect;
+  POINT point;
+
+  GetClientRect (msg->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);
+      point.x += _gdk_offset_x;
+      point.y += _gdk_offset_y;
+    }
 
-  if (HIWORD (lParam) & KF_UP)
-    p += sprintf (p, "KF_UP ");
-  if (HIWORD (lParam) & KF_REPEAT)
-    p += sprintf (p, "KF_REPEAT ");
-  if (HIWORD (lParam) & KF_ALTDOWN)
-    p += sprintf (p, "KF_ALTDOWN ");
-  if (HIWORD (lParam) & KF_EXTENDED)
-    p += sprintf (p, "KF_EXTENDED ");
-  p += sprintf (p, "sc%d rep%d", LOBYTE (HIWORD (lParam)), LOWORD (lParam));
+  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;
+  
+  ((GdkWindowObject *) window)->x = point.x;
+  ((GdkWindowObject *) window)->y = point.y;
+  
+  if (((GdkWindowObject *) window)->event_mask & GDK_STRUCTURE_MASK)
+    {
+      GdkEvent *event = gdk_event_new (GDK_CONFIGURE);
 
-  return buf;
-}
+      event->configure.window = window;
 
-static gboolean
-gdk_event_translate (GdkEvent *event,
-                    MSG      *msg,
-                    gboolean *ret_val_flagp,
-                    gint     *ret_valp,
-                    gboolean  return_exposes)
-{
-  DWORD pidActWin;
-  DWORD pidThis;
-  PAINTSTRUCT paintstruct;
-  HDC hdc;
-  HDC bgdc;
-  HGDIOBJ oldbitmap;
-  HBRUSH hbr;
-  COLORREF bg;
-  RECT rect;
-  POINT pt;
-  MINMAXINFO *mmi;
-  HWND hwnd;
-  HCURSOR hcursor;
+      event->configure.width = client_rect.right - client_rect.left;
+      event->configure.height = client_rect.bottom - client_rect.top;
+      
+      event->configure.x = point.x;
+      event->configure.y = point.y;
 
-  /* Invariant:
-   * window_impl == GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)
-   */
-  GdkWindow *window;
-  GdkWindowImplWin32 *window_impl;
-#define ASSIGN_WINDOW(rhs)                                                \
-  (window = rhs,                                                          \
-   window_impl = (window ? GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl) : NULL))
+      append_event (event);
+    }
+}
 
-  GdkWindow *orig_window, *new_window;
+static void
+erase_background (GdkWindow *window,
+                 HDC        hdc)
+{
+  HDC bgdc = NULL;
+  HBRUSH hbr = NULL;
+  HPALETTE holdpal = NULL;
+  RECT rect;
+  COLORREF bg;
   GdkColormap *colormap;
   GdkColormapPrivateWin32 *colormap_private;
-  GdkPixmap *pixmap;
-  GdkPixmapImplWin32 *pixmap_impl;
-  gint xoffset, yoffset;
+  int x, y;
+  int x_offset, y_offset;
+  
+  if (((GdkWindowObject *) window)->input_only ||
+      ((GdkWindowObject *) window)->bg_pixmap == GDK_NO_BG ||
+      GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl)->position_info.no_bg)
+    {
+      return;
+    }
 
-  int button;
-  int i, j;
+  colormap = gdk_drawable_get_colormap (window);
 
-  gchar buf[256];
-  gboolean return_val;
-  
-  return_val = FALSE;
+  if (colormap &&
+      (colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR ||
+       colormap->visual->type == GDK_VISUAL_STATIC_COLOR))
+    {
+      int k;
+         
+      colormap_private = GDK_WIN32_COLORMAP_DATA (colormap);
+
+      if (!(holdpal = SelectPalette (hdc,  colormap_private->hpal, FALSE)))
+        WIN32_GDI_FAILED ("SelectPalette");
+      else if ((k = RealizePalette (hdc)) == GDI_ERROR)
+       WIN32_GDI_FAILED ("RealizePalette");
+      else if (k > 0)
+       GDK_NOTE (COLORMAP, g_print ("erase_background: realized %p: %d colors\n",
+                                    colormap_private->hpal, k));
+    }
   
-  if (ret_val_flagp)
-    *ret_val_flagp = FALSE;
-
-  ASSIGN_WINDOW (gdk_win32_handle_table_lookup ((GdkNativeWindow) msg->hwnd));
-  orig_window = window;
+  x_offset = y_offset = 0;
+  while (window && ((GdkWindowObject *) window)->bg_pixmap == GDK_PARENT_RELATIVE_BG)
+    {
+      /* If this window should have the same background as the parent,
+       * fetch the parent. (And if the same goes for the parent, fetch
+       * the grandparent, etc.)
+       */
+      x_offset += ((GdkWindowObject *) window)->x;
+      y_offset += ((GdkWindowObject *) window)->y;
+      window = GDK_WINDOW (((GdkWindowObject *) window)->parent);
+    }
   
-  event->any.window = window;
+  if (GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl)->position_info.no_bg)
+    {
+      /* Improves scolling effect, e.g. main buttons of testgtk */
+      return;
+    }
 
-  /* InSendMessage() does not really mean the same as X11's send_event flag,
-   * but it is close enough, says jpe@archaeopteryx.com.
-   */
-  event->any.send_event = InSendMessage (); 
+  GetClipBox (hdc, &rect);
 
-  if (window == NULL)
+  if (((GdkWindowObject *) window)->bg_pixmap == NULL)
     {
-      /* Handle WM_QUIT here ? */
-      if (msg->message == WM_QUIT)
-       {
-         GDK_NOTE (EVENTS, g_print ("WM_QUIT: %d\n", msg->wParam));
-         exit (msg->wParam);
-       }
-      else if (msg->message == WM_MOVE
-              || msg->message == WM_SIZE)
+      bg = _gdk_win32_colormap_color (GDK_DRAWABLE_IMPL_WIN32 (((GdkWindowObject *) window)->impl)->colormap,
+                                     ((GdkWindowObject *) window)->bg_color.pixel);
+      
+      if (!(hbr = CreateSolidBrush (bg)))
+       WIN32_GDI_FAILED ("CreateSolidBrush");
+      else if (!FillRect (hdc, &rect, hbr))
+       WIN32_GDI_FAILED ("FillRect");
+      if (hbr != NULL)
+       DeleteObject (hbr);
+    }
+  else if (((GdkWindowObject *) window)->bg_pixmap != GDK_NO_BG)
+    {
+      GdkPixmap *pixmap = ((GdkWindowObject *) window)->bg_pixmap;
+      GdkPixmapImplWin32 *pixmap_impl = GDK_PIXMAP_IMPL_WIN32 (GDK_PIXMAP_OBJECT (pixmap)->impl);
+      
+      if (x_offset == 0 && y_offset == 0 &&
+         pixmap_impl->width <= 8 && pixmap_impl->height <= 8)
        {
-         /* 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(MISC, g_print("gdk_event_translate: %#lx %s posted.\n",
-                                (gulong) msg->hwnd, 
-                                msg->message == WM_MOVE ?
-                                "WM_MOVE" : "WM_SIZE"));
-       
-         PostMessage (msg->hwnd, msg->message,
-                      msg->wParam, msg->lParam);
+         if (!(hbr = CreatePatternBrush (GDK_PIXMAP_HBITMAP (pixmap))))
+           WIN32_GDI_FAILED ("CreatePatternBrush");
+         else if (!FillRect (hdc, &rect, hbr))
+           WIN32_GDI_FAILED ("FillRect");
+         if (hbr != NULL)
+           DeleteObject (hbr);
        }
-#ifndef WITHOUT_WM_CREATE
-      else if (WM_CREATE == msg->message)
+      else
        {
-         window = (UNALIGNED GdkWindow*) (((LPCREATESTRUCT) msg->lParam)->lpCreateParams);
-         GDK_WINDOW_HWND (window) = msg->hwnd;
-         GDK_NOTE (EVENTS, g_print ("gdk_event_translate: created %#x\n",
-                                    (guint) msg->hwnd));
-# if 0
-         /* This should handle allmost all the other window==NULL cases.
-          * This code is executed while gdk_window_new is in it's 
-          * CreateWindowEx call.
-          * Don't insert xid there a second time, if it's done here. 
-          */
-         gdk_drawable_ref (window);
-         gdk_win32_handle_table_insert (&GDK_WINDOW_HWND(window), window);
-# endif
+         HGDIOBJ oldbitmap;
+
+         if (!(bgdc = CreateCompatibleDC (hdc)))
+           {
+             WIN32_GDI_FAILED ("CreateCompatibleDC");
+             return;
+           }
+         if (!(oldbitmap = SelectObject (bgdc, GDK_PIXMAP_HBITMAP (pixmap))))
+           {
+             WIN32_GDI_FAILED ("SelectObject");
+             DeleteDC (bgdc);
+             return;
+           }
+         x = -x_offset;
+         while (x < rect.right)
+           {
+             if (x + pixmap_impl->width >= rect.left)
+               {
+                 y = -y_offset;
+                 while (y < rect.bottom)
+                   {
+                     if (y + pixmap_impl->height >= rect.top)
+                       {
+                         if (!BitBlt (hdc, x, y,
+                                      pixmap_impl->width, pixmap_impl->height,
+                                      bgdc, 0, 0, SRCCOPY))
+                           {
+                             WIN32_GDI_FAILED ("BitBlt");
+                             SelectObject (bgdc, oldbitmap);
+                             DeleteDC (bgdc);
+                             return;
+                           }
+                       }
+                     y += pixmap_impl->height;
+                   }
+               }
+             x += pixmap_impl->width;
+           }
+         SelectObject (bgdc, oldbitmap);
+         DeleteDC (bgdc);
        }
-      else
-      {
-        GDK_NOTE (EVENTS, g_print ("gdk_event_translate: %s for %#x (NULL)\n",
-                                   gdk_win32_message_name(msg->message),
-                                  (guint) msg->hwnd));
-      }
-#endif
-      return FALSE;
     }
-  
-  gdk_drawable_ref (window);
+}
 
-  if (!GDK_WINDOW_DESTROYED (window))
-    {
-      /* Check for filters for this window */
-      GdkFilterReturn result;
+GdkRegion *
+_gdk_win32_hrgn_to_region (HRGN hrgn)
+{
+  RGNDATA *rgndata;
+  RECT *rects;
+  GdkRegion *result;
+  gint nbytes;
+  guint i;
 
-      result = gdk_event_apply_filters
-       (msg, event, GDK_WINDOW_OBJECT (window)->filters);
-      
-      if (result != GDK_FILTER_CONTINUE)
-       {
-         return_val =  (result == GDK_FILTER_TRANSLATE) ? TRUE : FALSE;
-         if (ret_val_flagp)
-           *ret_val_flagp = TRUE;
-         if (ret_valp)
-           *ret_valp = return_val;
-         goto done;
-       }
+  if ((nbytes = GetRegionData (hrgn, 0, NULL)) == 0)
+    {
+      WIN32_GDI_FAILED ("GetRegionData");
+      return NULL;
     }
 
-  /* to translate coordinates to the internal > 16 bit system */
-  _gdk_windowing_window_get_offsets (window, &xoffset, &yoffset);
+  rgndata = (RGNDATA *) g_malloc (nbytes);
 
-  if (msg->message == gdk_selection_notify_msg)
+  if (GetRegionData (hrgn, nbytes, rgndata) == 0)
     {
-      GDK_NOTE (EVENTS, g_print ("gdk_selection_notify_msg: %#lx\n",
-                                (gulong) msg->hwnd));
+      WIN32_GDI_FAILED ("GetRegionData");
+      g_free (rgndata);
+      return NULL;
+    }
 
-      event->selection.type = GDK_SELECTION_NOTIFY;
-      event->selection.window = window;
-      event->selection.selection = GDK_POINTER_TO_ATOM (msg->wParam);
-      event->selection.target = GDK_POINTER_TO_ATOM (msg->lParam);
-      event->selection.property = _gdk_selection_property;
-      event->selection.time = msg->time;
+  result = gdk_region_new ();
+  rects = (RECT *) rgndata->Buffer;
+  for (i = 0; i < rgndata->rdh.nCount; i++)
+    {
+      GdkRectangle r;
 
-      return_val = !GDK_WINDOW_DESTROYED (window);
+      r.x = rects[i].left;
+      r.y = rects[i].top;
+      r.width = rects[i].right - r.x;
+      r.height = rects[i].bottom - r.y;
 
-      goto done;
+      gdk_region_union_with_rect (result, &r);
     }
-  else if (msg->message == gdk_selection_request_msg)
-    {
-      GDK_NOTE (EVENTS, g_print ("gdk_selection_request_msg: %#lx\n",
-                                (gulong) msg->hwnd));
-
-      event->selection.type = GDK_SELECTION_REQUEST;
-      event->selection.window = window;
-      event->selection.selection = gdk_clipboard_atom;
-      event->selection.target = GDK_TARGET_STRING;
-      event->selection.property = _gdk_selection_property;
-      event->selection.requestor = (guint32) msg->hwnd;
-      event->selection.time = msg->time;
 
-      return_val = !GDK_WINDOW_DESTROYED (window);
+  g_free (rgndata);
 
-      goto done;
-    }
-  else if (msg->message == gdk_selection_clear_msg)
-    {
-      GDK_NOTE (EVENTS, g_print ("gdk_selection_clear_msg: %#lx\n",
-                                (gulong) msg->hwnd));
+  return result;
+}
 
-      event->selection.type = GDK_SELECTION_CLEAR;
-      event->selection.window = window;
-      event->selection.selection = GDK_POINTER_TO_ATOM (msg->wParam);
-      event->selection.target = GDK_POINTER_TO_ATOM (msg->lParam);
-      event->selection.time = msg->time;
+static void
+adjust_drag (LONG *drag,
+            LONG  curr,
+            gint  inc)
+{
+  if (*drag > curr)
+    *drag = curr + ((*drag + inc/2 - curr) / inc) * inc;
+  else
+    *drag = curr - ((curr - *drag + inc/2) / inc) * inc;
+}
 
-      return_val = !GDK_WINDOW_DESTROYED (window);
+static void
+handle_wm_paint (MSG        *msg,
+                GdkWindow  *window,
+                gboolean    return_exposes,
+                GdkEvent  **event)
+{
+  HRGN hrgn = CreateRectRgn (0, 0, 0, 0);
+  HDC hdc;
+  PAINTSTRUCT paintstruct;
+  GdkRegion *update_region;
+  gint xoffset, yoffset;
 
-      goto done;
-    }
-  else if (msg->message == msh_mousewheel_msg)
+  if (GetUpdateRgn (msg->hwnd, hrgn, FALSE) == ERROR)
     {
-      GDK_NOTE (EVENTS, g_print ("MSH_MOUSEWHEEL: %#lx %d\n",
-                                (gulong) msg->hwnd, msg->wParam));
-      
-      event->scroll.type = GDK_SCROLL;
-
-      /* MSG_MOUSEWHEEL is delivered to the foreground window.  Work
-       * around that. Also, the position is in screen coordinates, not
-       * client coordinates as with the button messages.
-       */
-      pt.x = LOWORD (msg->lParam);
-      pt.y = HIWORD (msg->lParam);
-      if ((hwnd = WindowFromPoint (pt)) == NULL)
-       goto done;
+      WIN32_GDI_FAILED ("GetUpdateRgn");
+      return;
+    }
 
-      msg->hwnd = hwnd;
-      if ((new_window = gdk_win32_handle_table_lookup ((GdkNativeWindow) msg->hwnd)) == NULL)
-       goto done;
+  hdc = BeginPaint (msg->hwnd, &paintstruct);
 
-      if (new_window != window)
-       {
-         gdk_drawable_unref (window);
-         ASSIGN_WINDOW (new_window);
-         gdk_drawable_ref (window);
-       }
+  GDK_NOTE (EVENTS, g_print (" %s %s dc %p%s",
+                            _gdk_win32_rect_to_string (&paintstruct.rcPaint),
+                            (paintstruct.fErase ? "erase" : ""),
+                            hdc,
+                            (return_exposes ? " return_exposes" : "")));
 
-      if (GDK_WINDOW_OBJECT (window)->extension_events != 0
-         && _gdk_input_ignore_core)
-       {
-         GDK_NOTE (EVENTS, g_print ("...ignored\n"));
-         goto done;
-       }
+  EndPaint (msg->hwnd, &paintstruct);
 
-      if (!propagate (&window, msg,
-                     p_grab_window, p_grab_owner_events, p_grab_mask,
-                     doesnt_want_scroll))
-       goto done;
+  /* HB: don't generate GDK_EXPOSE events for InputOnly
+   * windows -> backing store now works!
+   */
+  if (((GdkWindowObject *) window)->input_only)
+    {
+      DeleteObject (hrgn);
+      return;
+    }
 
-      ASSIGN_WINDOW (window);
+  if (!(((GdkWindowObject *) window)->event_mask & GDK_EXPOSURE_MASK))
+    {
+      GDK_NOTE (EVENTS, g_print (" (ignored)"));
+      DeleteObject (hrgn);
+      return;
+    }
 
-      ScreenToClient (msg->hwnd, &pt);
-      event->button.window = window;
-      event->scroll.direction = ((int) msg->wParam > 0) ?
-       GDK_SCROLL_UP : GDK_SCROLL_DOWN;
-      event->scroll.window = window;
-      event->scroll.time = msg->time;
-      event->scroll.x = (gint16) pt.x + xoffset;
-      event->scroll.y = (gint16) pt.y + yoffset;
-      event->scroll.x_root = (gint16) LOWORD (msg->lParam);
-      event->scroll.y_root = (gint16) HIWORD (msg->lParam);
-      event->scroll.state = 0; /* No state information with MSH_MOUSEWHEEL */
-      event->scroll.device = _gdk_core_pointer;
-      return_val = !GDK_WINDOW_DESTROYED (window);
+#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
 
-      goto done;
-    }
-  else
+  if ((paintstruct.rcPaint.right == paintstruct.rcPaint.left) ||
+      (paintstruct.rcPaint.bottom == paintstruct.rcPaint.top))
     {
-      GList *tmp_list;
-      GdkFilterReturn result = GDK_FILTER_CONTINUE;
+      GDK_NOTE (EVENTS, g_print (" (empty paintstruct, ignored)"));
+      DeleteObject (hrgn);
+      return;
+    }
 
-      tmp_list = client_filters;
-      while (tmp_list)
+  if (return_exposes)
+    {
+      if (!GDK_WINDOW_DESTROYED (window))
        {
-         GdkClientFilter *filter = tmp_list->data;
-         /* FIXME: under win32 messages are not really atoms
-          * as the following cast suggest, but the appears to be right
-          * Haven't found a use case though ...
-          */
-         if (filter->type == GDK_POINTER_TO_ATOM (msg->message))
+         GList *list = _gdk_display->queued_events;
+
+         *event = gdk_event_new (GDK_EXPOSE);
+         (*event)->expose.window = window;
+         (*event)->expose.area.x = paintstruct.rcPaint.left;
+         (*event)->expose.area.y = paintstruct.rcPaint.top;
+         (*event)->expose.area.width = paintstruct.rcPaint.right - paintstruct.rcPaint.left;
+         (*event)->expose.area.height = paintstruct.rcPaint.bottom - paintstruct.rcPaint.top;
+         (*event)->expose.region = _gdk_win32_hrgn_to_region (hrgn);
+         (*event)->expose.count = 0;
+
+         while (list != NULL)
            {
-             GDK_NOTE (EVENTS, g_print ("client filter matched\n"));
-             event->any.window = window;
-             result = (*filter->function) (msg, event, filter->data);
-             switch (result)
-               {
-               case GDK_FILTER_REMOVE:
-                 *ret_val_flagp = TRUE;
-                 *ret_valp = 0;
-                 return_val = FALSE;
-                 break;
+             GdkEventPrivate *evp = list->data;
 
-               case GDK_FILTER_TRANSLATE:
-                 return_val = TRUE;
-                 break;
+             if (evp->event.any.type == GDK_EXPOSE &&
+                 evp->event.any.window == window &&
+                 !(evp->flags & GDK_EVENT_PENDING))
+               evp->event.expose.count++;
 
-               case GDK_FILTER_CONTINUE:
-                 *ret_val_flagp = TRUE;
-                 *ret_valp = 1;
-                 return_val = TRUE;
-                 event->client.type = GDK_CLIENT_EVENT;
-                 event->client.window = window;
-                 /* FIXME: check if the cast is correct, see above */
-                 event->client.message_type = GDK_POINTER_TO_ATOM (msg->message);
-                 event->client.data_format = 0;
-                 event->client.data.l[0] = msg->wParam;
-                 event->client.data.l[1] = msg->lParam;
-                 break;
-               }
-             goto done;
+             list = list->next;
            }
-         tmp_list = tmp_list->next;
        }
+
+      return;
     }
 
-  switch (msg->message)
-    {
-    case WM_INPUTLANGCHANGE:
-      GDK_NOTE (EVENTS,
-               g_print ("WM_INPUTLANGCHANGE: %#lx  charset %lu locale %lx\n",
-                        (gulong) msg->hwnd, (gulong) msg->wParam, msg->lParam));
-      window_impl->input_locale = (HKL) msg->lParam;
-      TranslateCharsetInfo ((DWORD FAR *) msg->wParam,
-                           &window_impl->charset_info,
-                           TCI_SRCCHARSET);
-      break;
+  update_region = _gdk_win32_hrgn_to_region (hrgn);
 
-    case WM_SYSKEYUP:
-    case WM_SYSKEYDOWN:
-      GDK_NOTE (EVENTS,
-               g_print ("WM_SYSKEY%s: %#lx  %s %#x %s\n",
-                        (msg->message == WM_SYSKEYUP ? "UP" : "DOWN"),
-                        (gulong) msg->hwnd,
-                        (GetKeyNameText (msg->lParam, buf,
-                                         sizeof (buf)) > 0 ?
-                         buf : ""),
-                        msg->wParam,
-                        decode_key_lparam (msg->lParam)));
+  _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);
 
-      /* Let the system handle Alt-Tab and Alt-Enter */
-      if (msg->wParam == VK_TAB
-         || msg->wParam == VK_RETURN
-         || msg->wParam == VK_F4)
-       break;
-      /* If posted without us having keyboard focus, ignore */
-      if (!(msg->lParam & 0x20000000))
-       break;
-#if 0
-      /* don't generate events for just the Alt key */
-      if (msg->wParam == VK_MENU)
-       break;
-#endif
-      /* Jump to code in common with WM_KEYUP and WM_KEYDOWN */
-      goto keyup_or_down;
+  DeleteObject (hrgn);
+}
 
-    case WM_KEYUP:
-    case WM_KEYDOWN:
-      GDK_NOTE (EVENTS, 
-               g_print ("WM_KEY%s: %#lx  %s %#x %s\n",
-                        (msg->message == WM_KEYUP ? "UP" : "DOWN"),
-                        (gulong) msg->hwnd,
-                        (GetKeyNameText (msg->lParam, buf,
-                                         sizeof (buf)) > 0 ?
-                         buf : ""),
-                        msg->wParam,
-                        decode_key_lparam (msg->lParam)));
+static void
+handle_stuff_while_moving_or_resizing (void)
+{
+  int arbitrary_limit = 1;
+  while (g_main_context_pending (NULL) && arbitrary_limit--)
+    g_main_context_iteration (NULL, FALSE);
+}
 
-      ignore_wm_char = TRUE;
+static VOID CALLBACK
+resize_timer_proc (HWND     hwnd,
+                  UINT     msg,
+                  UINT     id,
+                  DWORD    time)
+{
+  if (_sizemove_in_progress)
+    handle_stuff_while_moving_or_resizing ();
+}
 
-    keyup_or_down:
+static void
+handle_display_change (void)
+{
+  _gdk_monitor_init ();
+  _gdk_root_window_size_init ();
+  g_signal_emit_by_name (_gdk_screen, "size_changed");
+}
 
-      event->key.window = window;
-      event->key.hardware_keycode = msg->wParam;
+static void
+generate_button_event (GdkEventType type,
+                      gint         button,
+                      GdkWindow   *window,
+                      GdkWindow   *orig_window,
+                      MSG         *msg)
+{
+  GdkEvent *event = gdk_event_new (type);
+  gint xoffset, yoffset;
+
+  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;
+
+  append_event (event);
+
+  if (type == GDK_BUTTON_PRESS)
+    _gdk_event_button_generate (_gdk_display, event);
+}
+
+static gboolean
+gdk_event_translate (MSG  *msg,
+                    gint *ret_valp)
+{
+  RECT rect, *drag, orig_drag;
+  POINT point;
+  MINMAXINFO *mmi;
+  HWND hwnd;
+  HCURSOR hcursor;
+  BYTE key_state[256];
+  HIMC himc;
+
+  GdkEvent *event;
+
+  wchar_t wbuf[100];
+  gint ccount;
 
-      switch (msg->wParam)
+  GdkWindow *window = NULL;
+  GdkWindowImplWin32 *impl;
+
+  GdkWindow *orig_window, *new_window;
+  gint xoffset, yoffset;
+
+  static gint update_colors_counter = 0;
+  gint button;
+  GdkAtom target;
+
+  gchar buf[256];
+  gboolean return_val = FALSE;
+
+  int i;
+
+  if (_gdk_default_filters)
+    {
+      /* Apply global filters */
+
+      GdkFilterReturn result = apply_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,
+       * we return TRUE, and DefWindowProc() will not be called.
+       */
+      if (result == GDK_FILTER_REMOVE || result == GDK_FILTER_TRANSLATE)
+       return TRUE;
+    }
+
+  window = gdk_win32_handle_table_lookup ((GdkNativeWindow) msg->hwnd);
+  orig_window = window;
+
+  if (window == NULL)
+    {
+      /* XXX Handle WM_QUIT here ? */
+      if (msg->message == WM_QUIT)
        {
-       case VK_LBUTTON:
-         event->key.keyval = GDK_Pointer_Button1; break;
-       case VK_RBUTTON:
-         event->key.keyval = GDK_Pointer_Button3; break;
-       case VK_MBUTTON:
-         event->key.keyval = GDK_Pointer_Button2; break;
-       case VK_CANCEL:
-         event->key.keyval = GDK_Cancel; break;
-       case VK_BACK:
-         event->key.keyval = GDK_BackSpace; break;
-       case VK_TAB:
-         event->key.keyval = (GetKeyState(VK_SHIFT) < 0 ? 
-           GDK_ISO_Left_Tab : GDK_Tab);
-         break;
-       case VK_CLEAR:
-         event->key.keyval = GDK_Clear; break;
-       case VK_RETURN:
-         event->key.keyval = GDK_Return; break;
-       case VK_SHIFT:
-         /* Don't let Shift auto-repeat */
-         if (msg->message == WM_KEYDOWN
-             && (HIWORD (msg->lParam) & KF_REPEAT))
-           ignore_wm_char = FALSE;
-         else
-           event->key.keyval = GDK_Shift_L;
-         break;
-       case VK_CONTROL:
-         /* And not Control either */
-         if (msg->message == WM_KEYDOWN
-             && (HIWORD (msg->lParam) & KF_REPEAT))
-           ignore_wm_char = FALSE;
-         else if (HIWORD (msg->lParam) & KF_EXTENDED)
-           event->key.keyval = GDK_Control_R;
-         else
-           event->key.keyval = GDK_Control_L;
-         break;
-       case VK_MENU:
-         /* And not Alt */
-         if (msg->message == WM_KEYDOWN
-             && (HIWORD (msg->lParam) & KF_REPEAT))
-           ignore_wm_char = FALSE;
-         else if (HIWORD (msg->lParam) & KF_EXTENDED)
-           {
-             /* AltGr key comes in as Control+Right Alt */
-             if (GetKeyState (VK_CONTROL) < 0)
-               {
-                 ignore_wm_char = FALSE;
-                 is_altgr_key = TRUE;
-               }
-             event->key.keyval = GDK_Alt_R;
-           }
-         else
+         GDK_NOTE (EVENTS, g_print (" %d", 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)"));
+       
+         PostMessage (msg->hwnd, msg->message,
+                      msg->wParam, msg->lParam);
+       }
+      else if (msg->message == WM_CREATE)
+       {
+         window = (UNALIGNED GdkWindow*) (((LPCREATESTRUCT) msg->lParam)->lpCreateParams);
+         GDK_WINDOW_HWND (window) = msg->hwnd;
+       }
+      else
+       {
+         GDK_NOTE (EVENTS, g_print (" (no GdkWindow)"));
+       }
+      return FALSE;
+    }
+  
+  g_object_ref (window);
+
+  /* window's refcount has now been increased, so code below should
+   * not just return from this function, but instead goto done (or
+   * break out of the big switch). To protect against forgetting this,
+   * #define return to a syntax error...
+   */
+#define return GOTO_DONE_INSTEAD
+  
+  if (!GDK_WINDOW_DESTROYED (window) && ((GdkWindowObject *) window)->filters)
+    {
+      /* Apply per-window filters */
+
+      GdkFilterReturn result = apply_filters (window, msg, ((GdkWindowObject *) window)->filters);
+
+      if (result == GDK_FILTER_REMOVE || result == GDK_FILTER_TRANSLATE)
+       {
+         return_val = TRUE;
+         goto done;
+       }
+    }
+
+  if (msg->message == msh_mousewheel)
+    {
+      GDK_NOTE (EVENTS, g_print (" (MSH_MOUSEWHEEL)"));
+      
+      /* MSH_MOUSEWHEEL is delivered to the foreground window.  Work
+       * around that. Also, the position is in screen coordinates, not
+       * client coordinates as with the button messages.
+       */
+      point.x = GET_X_LPARAM (msg->lParam);
+      point.y = GET_Y_LPARAM (msg->lParam);
+      if ((hwnd = WindowFromPoint (point)) == NULL)
+       goto done;
+
+      msg->hwnd = hwnd;
+      if ((new_window = gdk_win32_handle_table_lookup ((GdkNativeWindow) msg->hwnd)) == NULL)
+       goto done;
+
+      assign_object (&window, new_window);
+
+      if (!propagate (&window, msg,
+                     p_grab_window, p_grab_owner_events, p_grab_mask,
+                     doesnt_want_scroll, TRUE))
+       goto done;
+
+      if (GDK_WINDOW_DESTROYED (window))
+       goto done;
+
+      ScreenToClient (msg->hwnd, &point);
+
+      event = gdk_event_new (GDK_SCROLL);
+      event->scroll.window = window;
+      event->scroll.direction = ((int) 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_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 = 0; /* No state information with MSH_MOUSEWHEEL */
+      event->scroll.device = _gdk_display->core_pointer;
+
+      append_event (event);
+
+      return_val = TRUE;
+      goto done;
+    }
+  else if (msg->message == client_message)
+    {
+      GList *tmp_list;
+      GdkFilterReturn result = GDK_FILTER_CONTINUE;
+
+      GDK_NOTE (EVENTS, g_print (" client_message"));
+
+      tmp_list = client_filters;
+      while (tmp_list)
+       {
+         GdkClientFilter *filter = tmp_list->data;
+
+         tmp_list = tmp_list->next;
+
+         if (filter->type == GDK_POINTER_TO_ATOM (msg->wParam))
            {
-             event->key.keyval = GDK_Alt_L;
-             /* This needed in case she types Alt+nnn (on the numpad) */
-             ignore_wm_char = FALSE;
+             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);
+
+             if (result != GDK_FILTER_CONTINUE)
+               break;
            }
-         break;
-       case VK_PAUSE:
-         event->key.keyval = GDK_Pause; break;
-       case VK_CAPITAL:
-         event->key.keyval = GDK_Caps_Lock; break;
-       case VK_ESCAPE:
-         event->key.keyval = GDK_Escape; break;
-       case VK_PRIOR:
-         event->key.keyval = GDK_Prior; break;
-       case VK_NEXT:
-         event->key.keyval = GDK_Next; break;
-       case VK_END:
-         event->key.keyval = GDK_End; break;
-       case VK_HOME:
-         event->key.keyval = GDK_Home; break;
-       case VK_LEFT:
-         event->key.keyval = GDK_Left; break;
-       case VK_UP:
-         event->key.keyval = GDK_Up; break;
-       case VK_RIGHT:
-         event->key.keyval = GDK_Right; break;
-       case VK_DOWN:
-         event->key.keyval = GDK_Down; break;
-       case VK_SELECT:
-         event->key.keyval = GDK_Select; break;
-       case VK_PRINT:
-         event->key.keyval = GDK_Print; break;
-       case VK_EXECUTE:
-         event->key.keyval = GDK_Execute; break;
-       case VK_INSERT:
-         event->key.keyval = GDK_Insert; break;
-       case VK_DELETE:
-         event->key.keyval = GDK_Delete; break;
-       case VK_HELP:
-         event->key.keyval = GDK_Help; break;
-       case VK_NUMPAD0:
-       case VK_NUMPAD1:
-       case VK_NUMPAD2:
-       case VK_NUMPAD3:
-       case VK_NUMPAD4:
-       case VK_NUMPAD5:
-       case VK_NUMPAD6:
-       case VK_NUMPAD7:
-       case VK_NUMPAD8:
-       case VK_NUMPAD9:
-         /* Apparently applications work better if we just pass numpad digits
-          * on as real digits? So wait for the WM_CHAR instead.
-          */
-         ignore_wm_char = FALSE;
-         break;
-       case VK_MULTIPLY:
-         event->key.keyval = GDK_KP_Multiply; break;
-       case VK_ADD:
-         /* Pass it on as an ASCII plus in WM_CHAR. */
-         ignore_wm_char = FALSE;
-         break;
-       case VK_SEPARATOR:
-         event->key.keyval = GDK_KP_Separator; break;
-       case VK_SUBTRACT:
-         /* Pass it on as an ASCII minus in WM_CHAR. */
-         ignore_wm_char = FALSE;
-         break;
-       case VK_DECIMAL:
-         /* The keypad decimal key should also be passed on as the decimal
-          * sign ('.' or ',' depending on the Windows locale settings,
-          * apparently). So wait for the WM_CHAR here, also.
-          */
-         ignore_wm_char = FALSE;
-         break;
-       case VK_DIVIDE:
-         event->key.keyval = GDK_KP_Divide; break;
-       case VK_F1:
-         event->key.keyval = GDK_F1; break;
-       case VK_F2:
-         event->key.keyval = GDK_F2; break;
-       case VK_F3:
-         event->key.keyval = GDK_F3; break;
-       case VK_F4:
-         event->key.keyval = GDK_F4; break;
-       case VK_F5:
-         event->key.keyval = GDK_F5; break;
-       case VK_F6:
-         event->key.keyval = GDK_F6; break;
-       case VK_F7:
-         event->key.keyval = GDK_F7; break;
-       case VK_F8:
-         event->key.keyval = GDK_F8; break;
-       case VK_F9:
-         event->key.keyval = GDK_F9; break;
-       case VK_F10:
-         event->key.keyval = GDK_F10; break;
-       case VK_F11:
-         event->key.keyval = GDK_F11; break;
-       case VK_F12:
-         event->key.keyval = GDK_F12; break;
-       case VK_F13:
-         event->key.keyval = GDK_F13; break;
-       case VK_F14:
-         event->key.keyval = GDK_F14; break;
-       case VK_F15:
-         event->key.keyval = GDK_F15; break;
-       case VK_F16:
-         event->key.keyval = GDK_F16; break;
-       case '0':
-       case '1':
-       case '2':
-       case '3':
-       case '4':
-       case '5':
-       case '6':
-       case '7':
-       case '8':
-       case '9':
-         if (!is_altgr_key && (GetKeyState (VK_CONTROL) < 0
-                               || GetKeyState (VK_MENU) < 0))
-           /* Control- or Alt-digits won't come in as a WM_CHAR,
-            * but beware of AltGr-digits, which are used for instance
-            * on Finnish keyboards.
-            */
-           event->key.keyval = GDK_0 + (msg->wParam - '0');
-         else
-           ignore_wm_char = FALSE;
-         break;
-       case VK_OEM_PLUS:       /* On my Win98, the '+' key comes in
-                                * as VK_OEM_PLUS, etc.
-                                */
-       case VK_OEM_COMMA:
-       case VK_OEM_MINUS:
-       case VK_OEM_PERIOD:
-       case VK_OEM_2:
-       case VK_OEM_4:
-       case VK_OEM_5:
-       case VK_OEM_6:
-         if (!is_altgr_key && (GetKeyState (VK_CONTROL) < 0
-                               || GetKeyState (VK_MENU) < 0))
-           /* Control- or Alt-plus won't come in as WM_CHAR,
-            * but beware of AltGr-plus which is backslash on
-            * Finnish keyboards
-            */
-           /* All these VK_OEM keycodes happen to be the corresponding ASCII
-            * char + 0x90
-            */
-           event->key.keyval = msg->wParam - 0x90;
-         else
-           ignore_wm_char = FALSE;
-         break;
-       case VK_OEM_1:
-         if (!is_altgr_key && (GetKeyState (VK_CONTROL) < 0
-                               || GetKeyState (VK_MENU) < 0))
-           /* ;: on US keyboard */
-           event->key.keyval = ';';
-         else
-           ignore_wm_char = FALSE;
-         break;
-       case VK_OEM_3:
-         if (!is_altgr_key && (GetKeyState (VK_CONTROL) < 0
-                               || GetKeyState (VK_MENU) < 0))
-           /* `~ on US keyboard */
-           event->key.keyval = '`';
-         else
-           ignore_wm_char = FALSE;
-         break;
-       case VK_OEM_7:
-         if (!is_altgr_key && (GetKeyState (VK_CONTROL) < 0
-                               || GetKeyState (VK_MENU) < 0))
-           /* '" on US keyboard */
-           event->key.keyval = '\'';
-         else
-           ignore_wm_char = FALSE;
-         break;
-       default:
-         if (msg->message == WM_SYSKEYDOWN || msg->message == WM_SYSKEYUP)
-           event->key.keyval = msg->wParam;
-         else
-           ignore_wm_char = FALSE;
-         break;
        }
 
-      if (!ignore_wm_char)
+      if (result == GDK_FILTER_REMOVE || result == GDK_FILTER_TRANSLATE)
+       {
+         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);
+         
+         return_val = TRUE;
+         goto done;
+       }
+    }
+
+  switch (msg->message)
+    {
+    case WM_INPUTLANGCHANGE:
+      _gdk_input_locale = (HKL) msg->lParam;
+      _gdk_input_locale_is_ime = ImmIsIME (_gdk_input_locale);
+      GetLocaleInfo (MAKELCID (LOWORD (_gdk_input_locale), SORT_DEFAULT),
+                    LOCALE_IDEFAULTANSICODEPAGE,
+                    buf, sizeof (buf));
+      _gdk_input_codepage = atoi (buf);
+      _gdk_keymap_serial++;
+      GDK_NOTE (EVENTS,
+               g_print (" cs:%lu hkl:%lx%s cp:%d",
+                        (gulong) msg->wParam,
+                        msg->lParam, _gdk_input_locale_is_ime ? " (IME)" : "",
+                        _gdk_input_codepage));
+      break;
+
+    case WM_SYSKEYUP:
+    case WM_SYSKEYDOWN:
+      GDK_NOTE (EVENTS,
+               g_print (" %s ch:%.02x %s",
+                        _gdk_win32_key_to_string (msg->lParam),
+                        msg->wParam,
+                        decode_key_lparam (msg->lParam)));
+
+      /* If posted without us having keyboard focus, ignore */
+      if ((msg->wParam != VK_F10 && msg->wParam != VK_MENU) &&
+         !(HIWORD (msg->lParam) & KF_ALTDOWN))
+       break;
+
+      /* Let the system handle Alt-Tab, Alt-Space and Alt-F4 unless
+       * the keyboard is grabbed.
+       */
+      if (k_grab_window == NULL &&
+         (msg->wParam == VK_TAB ||
+          msg->wParam == VK_SPACE ||
+          msg->wParam == VK_F4))
+       break;
+
+      /* Jump to code in common with WM_KEYUP and WM_KEYDOWN */
+      goto keyup_or_down;
+
+    case WM_KEYUP:
+    case WM_KEYDOWN:
+      GDK_NOTE (EVENTS, 
+               g_print (" %s ch:%.02x %s",
+                        _gdk_win32_key_to_string (msg->lParam),
+                        msg->wParam,
+                        decode_key_lparam (msg->lParam)));
+
+    keyup_or_down:
+
+      /* Ignore key messages intended for the IME */
+      if (msg->wParam == VK_PROCESSKEY ||
+         in_ime_composition)
        break;
 
       if (!propagate (&window, msg,
                      k_grab_window, k_grab_owner_events, GDK_ALL_EVENTS_MASK,
-                     doesnt_want_key))
-         break;
-      ASSIGN_WINDOW (window);
-
-      is_altgr_key = FALSE;
-      event->key.type = ((msg->message == WM_KEYDOWN
-                         || msg->message == WM_SYSKEYDOWN) ?
-                        GDK_KEY_PRESS : GDK_KEY_RELEASE);
-      event->key.time = msg->time;
-      event->key.state = 0;
-      if (GetKeyState (VK_SHIFT) < 0)
-       event->key.state |= GDK_SHIFT_MASK;
-      if (GetKeyState (VK_CAPITAL) & 0x1)
-       event->key.state |= GDK_LOCK_MASK;
-      if (GetKeyState (VK_CONTROL) < 0)
-       event->key.state |= GDK_CONTROL_MASK;
-      if (msg->wParam != VK_MENU && GetKeyState (VK_MENU) < 0)
-       event->key.state |= GDK_MOD1_MASK;
+                     doesnt_want_key, FALSE))
+       break;
+
+      if (GDK_WINDOW_DESTROYED (window))
+       break;
+
+      event = gdk_event_new ((msg->message == WM_KEYDOWN ||
+                             msg->message == WM_SYSKEYDOWN) ?
+                            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.string = NULL;
       event->key.length = 0;
-      return_val = !GDK_WINDOW_DESTROYED (window);
-      break;
+      event->key.hardware_keycode = msg->wParam;
+      if (HIWORD (msg->lParam) & KF_EXTENDED)
+       {
+         switch (msg->wParam)
+           {
+           case VK_CONTROL:
+             event->key.hardware_keycode = VK_RCONTROL;
+             break;
+           case VK_SHIFT:      /* Actually, KF_EXTENDED is not set
+                                * for the right shift key.
+                                */
+             event->key.hardware_keycode = VK_RSHIFT;
+             break;
+           case VK_MENU:
+             event->key.hardware_keycode = VK_RMENU;
+             break;
+           }
+       }
+      else if (msg->wParam == VK_SHIFT &&
+              LOBYTE (HIWORD (msg->lParam)) == _scancode_rshift)
+       event->key.hardware_keycode = VK_RSHIFT;
 
-    case WM_IME_COMPOSITION:
-      if (!use_ime_composition)
-       break;
+      API_CALL (GetKeyboardState, (key_state));
+
+      /* g_print ("ctrl:%02x lctrl:%02x rctrl:%02x alt:%02x lalt:%02x ralt:%02x\n", key_state[VK_CONTROL], key_state[VK_LCONTROL], key_state[VK_RCONTROL], key_state[VK_MENU], key_state[VK_LMENU], key_state[VK_RMENU]); */
+      
+      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);
+
+      fill_key_event_string (event);
+
+      /* Reset MOD1_MASK if it is the Alt key itself */
+      if (msg->wParam == VK_MENU)
+       event->key.state &= ~GDK_MOD1_MASK;
+
+      append_event (event);
 
-      GDK_NOTE (EVENTS, g_print ("WM_IME_COMPOSITION: %#lx  %#lx\n",
-                                (gulong) msg->hwnd, msg->lParam));
-      if (msg->lParam & GCS_RESULTSTR)
-       goto wm_char;
+      return_val = TRUE;
       break;
 
-    case WM_IME_CHAR:
-      GDK_NOTE (EVENTS,
-               g_print ("WM_IME_CHAR: %#lx  bytes: %#.04x\n",
-                        (gulong) msg->hwnd, msg->wParam));
-      goto wm_char;
-      
-    case WM_CHAR:
     case WM_SYSCHAR:
-      GDK_NOTE (EVENTS, 
-               g_print ("WM_%sCHAR: %#lx  %#x %s %s\n",
-                        (msg->message == WM_CHAR ? "" : "SYS"),
-                        (gulong) msg->hwnd, msg->wParam,
-                        decode_key_lparam (msg->lParam),
-                        (ignore_wm_char ? "ignored" : "")));
-
-      if (ignore_wm_char)
+      if (msg->wParam != VK_SPACE)
        {
-         ignore_wm_char = FALSE;
-         break;
+         /* To prevent beeps, don't let DefWindowProc() be called */
+         return_val = TRUE;
+         goto done;
        }
+      break;
+
+    case WM_IME_STARTCOMPOSITION:
+      in_ime_composition = TRUE;
+      break;
+
+    case WM_IME_ENDCOMPOSITION:
+      in_ime_composition = FALSE;
+      break;
+
+    case WM_IME_COMPOSITION:
+      /* On Win2k WM_IME_CHAR doesn't work correctly for non-Unicode
+       * applications. Thus, handle WM_IME_COMPOSITION with
+       * GCS_RESULTSTR instead, fetch the Unicode chars from the IME
+       * with ImmGetCompositionStringW().
+       *
+       * See for instance
+       * http://groups.google.com/groups?selm=natX5.57%24g77.19788%40nntp2.onemain.com
+       * and
+       * http://groups.google.com/groups?selm=u2XfrXw5BHA.1628%40tkmsftngp02
+       * for comments by other people that seems to have the same
+       * experience. WM_IME_CHAR just gives question marks, apparently
+       * because of going through some conversion to the current code
+       * page.
+       *
+       * 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));
+
+      if (!(msg->lParam & GCS_RESULTSTR))
+       break;
 
-    wm_char:
       if (!propagate (&window, msg,
                      k_grab_window, k_grab_owner_events, GDK_ALL_EVENTS_MASK,
-                     doesnt_want_char))
-         break;
-      ASSIGN_WINDOW (window);
+                     doesnt_want_char, FALSE))
+       break;
 
-      event->key.window = window;
-      return_val = !GDK_WINDOW_DESTROYED (window);
+      if (GDK_WINDOW_DESTROYED (window))
+       break;
+
+      himc = ImmGetContext (msg->hwnd);
+      ccount = ImmGetCompositionStringW (himc, GCS_RESULTSTR,
+                                        wbuf, sizeof (wbuf));
+      ImmReleaseContext (msg->hwnd, himc);
+
+      ccount /= 2;
 
-      if (return_val && (event->key.window == k_grab_window
-                        || (window_impl->event_mask & GDK_KEY_RELEASE_MASK)))
+      API_CALL (GetKeyboardState, (key_state));
+
+      for (i = 0; i < ccount; i++)
        {
-         if (window == k_grab_window
-             || (window_impl->event_mask & GDK_KEY_PRESS_MASK))
+         if (((GdkWindowObject *) window)->event_mask & GDK_KEY_PRESS_MASK)
            {
-             /* Append a GDK_KEY_PRESS event to the pushback list
-              * (from which it will be fetched before the release
-              * event).
-              */
-             GdkEvent *event2 = _gdk_event_new ();
-             build_keypress_event (window_impl, event2, msg);
-             event2->key.window = window;
-             gdk_drawable_ref (window);
-             _gdk_event_queue_append (event2);
-             GDK_NOTE (EVENTS, print_event (event2));
+             /* Build a key press event */
+             event = gdk_event_new (GDK_KEY_PRESS);
+             event->key.window = window;
+             build_wm_ime_composition_event (event, msg, wbuf[i], key_state);
+
+             append_event (event);
            }
-         /* Return the key release event.  */
-         build_keyrelease_event (window_impl, event, msg);
-       }
-      else if (return_val
-              && (window_impl->event_mask & GDK_KEY_PRESS_MASK))
-       {
-         /* Return just the key press event. */
-         build_keypress_event (window_impl, event, msg);
-       }
-      else
-       return_val = FALSE;
+         
+         if (((GdkWindowObject *) window)->event_mask & GDK_KEY_RELEASE_MASK)
+           {
+             /* Build a key release event.  */
+             event = gdk_event_new (GDK_KEY_RELEASE);
+             event->key.window = window;
+             build_wm_ime_composition_event (event, msg, wbuf[i], key_state);
 
-#if 0 /* Don't reset is_AltGr_key here. Othewise we can't type several
-       * AltGr-accessed chars while keeping the AltGr pressed down
-       * all the time.
-       */
-      is_AltGr_key = FALSE;
-#endif
+             append_event (event);
+           }
+       }
+      return_val = TRUE;
       break;
 
     case WM_LBUTTONDOWN:
       button = 1;
       goto buttondown0;
+
     case WM_MBUTTONDOWN:
       button = 2;
       goto buttondown0;
+
     case WM_RBUTTONDOWN:
       button = 3;
+      goto buttondown0;
+
+    case WM_XBUTTONDOWN:
+      if (HIWORD (msg->wParam) == XBUTTON1)
+       button = 4;
+      else
+       button = 5;
 
     buttondown0:
       GDK_NOTE (EVENTS, 
-               g_print ("WM_%cBUTTONDOWN: %#lx  (%d,%d)\n",
-                        " LMR"[button],
-                        (gulong) msg->hwnd,
-                        LOWORD (msg->lParam), HIWORD (msg->lParam)));
+               g_print (" (%d,%d)",
+                        GET_X_LPARAM (msg->lParam), GET_Y_LPARAM (msg->lParam)));
 
-      if (GDK_WINDOW_OBJECT (window)->extension_events != 0
-         && _gdk_input_ignore_core)
-       {
-         GDK_NOTE (EVENTS, g_print ("...ignored\n"));
-         break;
-       }
+      assign_object (&window, find_window_for_mouse_event (window, msg));
 
-      ASSIGN_WINDOW (find_window_for_pointer_event (window, msg));
+      if (p_grab_window != NULL)
+       {
+         GdkWindow *real_window = find_real_window_for_grabbed_mouse_event (window, msg);
 
-      if (window != current_window)
-       synthesize_crossing_events (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);
+       }
 
-      event->button.type = GDK_BUTTON_PRESS;
       if (!propagate (&window, msg,
                      p_grab_window, p_grab_owner_events, p_grab_mask,
-                     doesnt_want_button_press))
-         break;
-      ASSIGN_WINDOW (window);
+                     doesnt_want_button_press, TRUE))
+       break;
 
-      event->button.window = window;
+      if (GDK_WINDOW_DESTROYED (window))
+       break;
 
       /* Emulate X11's automatic active grab */
       if (!p_grab_window)
        {
          /* No explicit active grab, let's start one automatically */
-         gint owner_events = window_impl->event_mask
-           & (GDK_BUTTON_PRESS_MASK|GDK_BUTTON_RELEASE_MASK);
-         
-         GDK_NOTE (EVENTS, g_print ("...automatic grab started\n"));
+         GDK_NOTE (EVENTS, g_print (" (automatic grab)"));
          gdk_pointer_grab (window,
-                           owner_events,
-                           window_impl->event_mask,
+                           FALSE,
+                           ((GdkWindowObject *) window)->event_mask,
                            NULL, NULL, 0);
          p_grab_automatic = TRUE;
        }
 
-      event->button.time = msg->time;
-      if (window != orig_window)
-       translate_mouse_coords (orig_window, window, msg);
-      event->button.x = current_x = (gint16) LOWORD (msg->lParam);
-      event->button.y = current_y = (gint16) HIWORD (msg->lParam);
-      event->button.x += xoffset;  /* XXX translate current_x, y too? */
-      event->button.y += yoffset;
-      event->button.x_root = msg->pt.x;
-      event->button.y_root = msg->pt.y;
-      event->button.axes = NULL;
-      event->button.state = build_pointer_event_state (msg);
-      event->button.button = button;
-      event->button.device = _gdk_core_pointer;
-
-      _gdk_event_button_generate (event);
-      
-      return_val = !GDK_WINDOW_DESTROYED (window);
+      generate_button_event (GDK_BUTTON_PRESS, button,
+                            window, orig_window, msg);
+
+      return_val = TRUE;
       break;
 
     case WM_LBUTTONUP:
       button = 1;
       goto buttonup0;
+
     case WM_MBUTTONUP:
       button = 2;
       goto buttonup0;
+
     case WM_RBUTTONUP:
       button = 3;
+      goto buttonup0;
+
+    case WM_XBUTTONUP:
+      if (HIWORD (msg->wParam) == XBUTTON1)
+       button = 4;
+      else
+       button = 5;
 
     buttonup0:
       GDK_NOTE (EVENTS, 
-               g_print ("WM_%cBUTTONUP: %#lx  (%d,%d)\n",
-                        " LMR"[button],
-                        (gulong) msg->hwnd,
-                        LOWORD (msg->lParam), HIWORD (msg->lParam)));
+               g_print (" (%d,%d)",
+                        GET_X_LPARAM (msg->lParam), GET_Y_LPARAM (msg->lParam)));
 
-      ASSIGN_WINDOW (find_window_for_pointer_event (window, msg));
+      assign_object (&window, find_window_for_mouse_event (window, msg));
 
-      if (GDK_WINDOW_OBJECT (window)->extension_events != 0
-         && _gdk_input_ignore_core)
+      if (p_grab_window != NULL)
        {
-         GDK_NOTE (EVENTS, g_print ("...ignored\n"));
-         break;
+         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 (window != current_window)
-       synthesize_crossing_events (window, msg);
+#if 0
+      if (((GdkWindowObject *) window)->extension_events != 0 &&
+         _gdk_input_ignore_core)
+       {
+         GDK_NOTE (EVENTS, g_print (" (ignored)"));
+         break;
+       }
+#endif
 
-      event->button.type = GDK_BUTTON_RELEASE;
       if (!propagate (&window, msg,
                      p_grab_window, p_grab_owner_events, p_grab_mask,
-                     doesnt_want_button_release))
+                     doesnt_want_button_release, TRUE))
        {
        }
-      else
+      else if (!GDK_WINDOW_DESTROYED (window))
        {
-         ASSIGN_WINDOW (window);
-
-         event->button.window = window;
-         event->button.time = msg->time;
-         if (window != orig_window)
-           translate_mouse_coords (orig_window, window, msg);
-         event->button.x = (gint16) LOWORD (msg->lParam) + xoffset;
-         event->button.y = (gint16) HIWORD (msg->lParam) + yoffset;
-         event->button.x_root = msg->pt.x;
-         event->button.y_root = msg->pt.y;
-         event->button.axes = NULL;
-         event->button.state = build_pointer_event_state (msg);
-         event->button.button = button;
-         event->button.device = _gdk_core_pointer;
-         
-         return_val = !GDK_WINDOW_DESTROYED (window);
+         generate_button_event (GDK_BUTTON_RELEASE, button,
+                                window, orig_window, msg);
        }
 
-      if (p_grab_window != NULL
-         && p_grab_automatic
-         && (msg->wParam & (MK_LBUTTON | MK_MBUTTON | MK_RBUTTON)) == 0)
-       gdk_pointer_ungrab (0);
+      if (p_grab_window != NULL &&
+         p_grab_automatic &&
+         (msg->wParam & (MK_LBUTTON | MK_MBUTTON | MK_RBUTTON)) == 0)
+       {
+         /* Terminate automatic grab */
+         gdk_pointer_ungrab (0);
+       }
+
+      return_val = TRUE;
       break;
 
     case WM_MOUSEMOVE:
       GDK_NOTE (EVENTS,
-               g_print ("WM_MOUSEMOVE: %#lx  %#x (%d,%d)\n",
-                        (gulong) msg->hwnd, msg->wParam,
-                        LOWORD (msg->lParam), HIWORD (msg->lParam)));
-
-      ASSIGN_WINDOW (find_window_for_pointer_event (window, msg));
+               g_print (" %#x (%d,%d)",
+                        msg->wParam,
+                        GET_X_LPARAM (msg->lParam), GET_Y_LPARAM (msg->lParam)));
 
-      /* If we haven't moved, don't create any event.
-       * Windows sends WM_MOUSEMOVE messages after button presses
-       * even if the mouse doesn't move. This disturbs gtk.
+      /* 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.
        */
-      if (window == current_window
-         && LOWORD (msg->lParam) == current_x
-         && HIWORD (msg->lParam) == current_y)
+      if (msg->pt.x + _gdk_offset_x == current_root_x &&
+         msg->pt.y + _gdk_offset_y == current_root_y)
        break;
 
-      /* HB: only process mouse move messages if we own the active window. */
-      GetWindowThreadProcessId(GetActiveWindow(), &pidActWin);
-      GetWindowThreadProcessId(msg->hwnd, &pidThis);
-      if (pidActWin != pidThis)
-       break;
+      current_root_x = msg->pt.x + _gdk_offset_x;
+      current_root_y = msg->pt.y + _gdk_offset_y;
 
-      if (window != current_window)
-       synthesize_crossing_events (window, msg);
+      assign_object (&window, find_window_for_mouse_event (window, msg));
 
-      if (GDK_WINDOW_OBJECT (window)->extension_events != 0
-         && _gdk_input_ignore_core)
+      if (p_grab_window != NULL)
        {
-         GDK_NOTE (EVENTS, g_print ("...ignored\n"));
-         break;
+         GdkWindow *real_window = find_real_window_for_grabbed_mouse_event (window, msg);
+
+         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);
        }
 
-      event->motion.type = GDK_MOTION_NOTIFY;
       if (!propagate (&window, msg,
                      p_grab_window, p_grab_owner_events, p_grab_mask,
-                     doesnt_want_button_motion))
-         break;
-      ASSIGN_WINDOW (window);
+                     doesnt_want_button_motion, TRUE))
+       break;
+
+      if (GDK_WINDOW_DESTROYED (window))
+       break;
 
-      event->motion.window = window;
-      event->motion.time = msg->time;
       if (window != orig_window)
        translate_mouse_coords (orig_window, window, msg);
-      event->motion.x = current_x = (gint16) LOWORD (msg->lParam);
-      event->motion.y = current_y = (gint16) HIWORD (msg->lParam);
+
+      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_x_root = msg->pt.x;
-      event->motion.y_root = current_y_root = msg->pt.y;
+      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_core_pointer;
+      event->motion.device = _gdk_display->core_pointer;
 
-      return_val = !GDK_WINDOW_DESTROYED (window);
+      append_event (event);
+
+      return_val = TRUE;
       break;
 
     case WM_NCMOUSEMOVE:
       GDK_NOTE (EVENTS,
-               g_print ("WM_NCMOUSEMOVE: %#lx  x,y: %d %d\n",
-                        (gulong) msg->hwnd,
-                        LOWORD (msg->lParam), HIWORD (msg->lParam)));
-      if (track_mouse_event == NULL
-         && current_window != NULL
-         && (GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (current_window)->impl)->event_mask & GDK_LEAVE_NOTIFY_MASK))
-       {
-         GDK_NOTE (EVENTS, g_print ("...synthesizing LEAVE_NOTIFY event\n"));
-
-         event->crossing.type = GDK_LEAVE_NOTIFY;
-         event->crossing.window = current_window;
-         event->crossing.subwindow = NULL;
-         event->crossing.time = msg->time;
-         event->crossing.x = current_x + xoffset; /* XXX translated current_x */
-         event->crossing.y = current_y + yoffset;
-         event->crossing.x_root = current_x_root;
-         event->crossing.y_root = current_y_root;
-         event->crossing.mode = GDK_CROSSING_NORMAL;
-         event->crossing.detail = GDK_NOTIFY_NONLINEAR;
-
-         event->crossing.focus = TRUE; /* ??? */
-         event->crossing.state = 0; /* ??? */
-         return_val = TRUE;
-       }
-
-      if (current_window)
+               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))
        {
-         gdk_drawable_unref (current_window);
-         current_window = NULL;
+         synthesize_crossing_events (_gdk_root, GDK_CROSSING_NORMAL, msg);
        }
 
       break;
 
-    case WM_MOUSEWHEEL:
-      GDK_NOTE (EVENTS, g_print ("WM_MOUSEWHEEL: %#lx %d\n",
-                                (gulong) msg->hwnd, HIWORD (msg->wParam)));
-
-      event->scroll.type = GDK_SCROLL;
-
-      /* WM_MOUSEWHEEL is delivered to the focus window Work around
-       * that. Also, the position is in screen coordinates, not client
-       * coordinates as with the button messages. I love the
-       * consistency of Windows.
-       */
-      pt.x = LOWORD (msg->lParam);
-      pt.y = HIWORD (msg->lParam);
-      if ((hwnd = WindowFromPoint (pt)) == NULL)
-       break;
-
-      msg->hwnd = hwnd;
-      if ((new_window = gdk_win32_handle_table_lookup ((GdkNativeWindow) msg->hwnd)) == NULL)
-       break;
-
-      if (new_window != window)
-       {
-         gdk_drawable_unref (window);
-         ASSIGN_WINDOW (new_window);
-         gdk_drawable_ref (window);
-       }
+    case WM_MOUSELEAVE:
+      GDK_NOTE (EVENTS, g_print (" %d (%ld,%ld)",
+                                HIWORD (msg->wParam), msg->pt.x, msg->pt.y));
 
-      if (GDK_WINDOW_OBJECT (window)->extension_events != 0
-         && _gdk_input_ignore_core)
+      if (!gdk_win32_handle_table_lookup ((GdkNativeWindow) WindowFromPoint (msg->pt)))
        {
-         GDK_NOTE (EVENTS, g_print ("...ignored\n"));
-         break;
-       }
-
-      if (!propagate (&window, msg,
-                     p_grab_window, p_grab_owner_events, p_grab_mask,
-                     doesnt_want_scroll))
-       break;
-
-      ASSIGN_WINDOW (window);
-
-      ScreenToClient (msg->hwnd, &pt);
-      event->button.window = window;
-      event->scroll.direction = (((short) HIWORD (msg->wParam)) > 0) ?
-       GDK_SCROLL_UP : GDK_SCROLL_DOWN;
-      event->scroll.window = window;
-      event->scroll.time = msg->time;
-      event->scroll.x = (gint16) pt.x + xoffset;
-      event->scroll.y = (gint16) pt.y + yoffset;
-      event->scroll.x_root = (gint16) LOWORD (msg->lParam);
-      event->scroll.y_root = (gint16) HIWORD (msg->lParam);
-      event->scroll.state = build_pointer_event_state (msg);
-      event->scroll.device = _gdk_core_pointer;
-      return_val = !GDK_WINDOW_DESTROYED (window);
-      
-      break;
-
-#ifdef USE_TRACKMOUSEEVENT
-    case WM_MOUSELEAVE:
-      GDK_NOTE (EVENTS, g_print ("WM_MOUSELEAVE: %#lx\n", (gulong) msg->hwnd));
+         GdkNotifyType detail;
 
-      if (!(window_impl->event_mask & GDK_LEAVE_NOTIFY_MASK))
-       break;
+         if (GDK_WINDOW_TYPE (current_window) != GDK_WINDOW_CHILD)
+           detail = GDK_NOTIFY_ANCESTOR;
+         else
+           detail = GDK_NOTIFY_UNKNOWN;
 
-      event->crossing.type = GDK_LEAVE_NOTIFY;
-      event->crossing.window = window;
-      event->crossing.subwindow = NULL;
-      event->crossing.time = msg->time;
-      event->crossing.x = current_x + xoffset; /* XXX translated current_x */
-      event->crossing.y = current_y + yoffset;
-      event->crossing.x_root = current_xroot;
-      event->crossing.y_root = current_yroot;
-      event->crossing.mode = GDK_CROSSING_NORMAL;
-      if (current_window
-         && IsChild (GDK_WINDOW_HWND (current_window), GDK_WINDOW_HWND (window)))
-       event->crossing.detail = GDK_NOTIFY_INFERIOR;
-      else if (current_window
-              && IsChild (GDK_WINDOW_HWND (window), GDK_WINDOW_HWND (current_window)))
-       event->crossing.detail = GDK_NOTIFY_ANCESTOR;
+         /* 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
-       event->crossing.detail = GDK_NOTIFY_NONLINEAR;
-
-      event->crossing.focus = TRUE; /* ??? */
-      event->crossing.state = 0; /* ??? */
-
-      if (current_window)
        {
-         gdk_drawable_unref (current_window);
-         current_window = NULL;
+         GDK_NOTE (EVENTS, g_print (" (ignored)"));
        }
-
-      return_val = !GDK_WINDOW_DESTROYED (window);
-      break;
-#endif
-       
-    case WM_SETFOCUS:
-    case WM_KILLFOCUS:
-      GDK_NOTE (EVENTS, g_print ("WM_%sFOCUS: %#lx\n",
-                                (msg->message == WM_SETFOCUS ?
-                                 "SET" : "KILL"),
-                                (gulong) msg->hwnd));
-      
-      if (!(window_impl->event_mask & GDK_FOCUS_CHANGE_MASK))
-       break;
-
-      event->focus_change.type = GDK_FOCUS_CHANGE;
-      event->focus_change.window = window;
-      event->focus_change.in = (msg->message == WM_SETFOCUS);
-      return_val = !GDK_WINDOW_DESTROYED (window);
+      return_val = TRUE;
       break;
 
-    case WM_ERASEBKGND:
-      GDK_NOTE (EVENTS, g_print ("WM_ERASEBKGND: %#lx  dc %#x\n",
-                                (gulong) msg->hwnd, msg->wParam));
-      
-      if (GDK_WINDOW_DESTROYED (window))
-       break;
+    case WM_MOUSEWHEEL:
+      GDK_NOTE (EVENTS, g_print (" %d", HIWORD (msg->wParam)));
 
-      *ret_val_flagp = TRUE; /* always claim as handled */
-      *ret_valp = 1;
+      /* WM_MOUSEWHEEL is delivered to the focus window. Work around
+       * that. Also, the position is in screen coordinates, not client
+       * coordinates as with the button messages. I love the
+       * consistency of Windows.
+       */
+      point.x = GET_X_LPARAM (msg->lParam);
+      point.y = GET_Y_LPARAM (msg->lParam);
 
-      if (GDK_WINDOW_OBJECT (window)->input_only)
+      if ((hwnd = WindowFromPoint (point)) == NULL)
        break;
-
-      if (GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->position_info.no_bg)
-       {
-         /* improves scolling effect, e.g. main buttons of testgtk */
-         *ret_val_flagp = TRUE;
-         *ret_valp = 1;
-         break;
-       }
-
-      colormap = GDK_DRAWABLE_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->colormap;
-      if (colormap)
-       colormap_private = GDK_COLORMAP_PRIVATE_DATA (colormap);
-      hdc = (HDC) msg->wParam;
-      if (colormap && colormap_private->xcolormap->rc_palette)
-       {
-         int k;
-
-         if (SelectPalette (hdc,  colormap_private->xcolormap->palette,
-                            FALSE) == NULL)
-           WIN32_GDI_FAILED ("SelectPalette");
-         if ((k = RealizePalette (hdc)) == GDI_ERROR)
-           WIN32_GDI_FAILED ("RealizePalette");
-#if 0
-         g_print ("WM_ERASEBKGND: selected %#x, realized %d colors\n",
-                  colormap_private->xcolormap->palette, k);
-#endif
-       }
-
-      if (GDK_WINDOW_OBJECT (window)->bg_pixmap == GDK_PARENT_RELATIVE_BG)
-       {
-         /* If this window should have the same background as the
-          * parent, fetch the parent. (And if the same goes for
-          * the parent, fetch the grandparent, etc.)
-          */
-         while (window && GDK_WINDOW_OBJECT (window)->bg_pixmap == GDK_PARENT_RELATIVE_BG)
-           {
-             gdk_drawable_unref (window);
-             ASSIGN_WINDOW (GDK_WINDOW (GDK_WINDOW_OBJECT (window)->parent));
-             gdk_drawable_ref (window);
-           }
-       }
-
-      if (GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->position_info.no_bg)
-       {
-         /* improves scolling effect, e.g. main buttons of testgtk */
-         *ret_val_flagp = TRUE;
-         *ret_valp = 1;
-         break;
-       }
-
-      if (GDK_WINDOW_OBJECT (window)->bg_pixmap == NULL)
-       {
-         bg = _gdk_win32_colormap_color (GDK_DRAWABLE_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->colormap,
-                                  GDK_WINDOW_OBJECT (window)->bg_color.pixel);
-
-         GetClipBox (hdc, &rect);
-         GDK_NOTE (EVENTS,
-                   g_print ("...%ldx%ld@+%ld+%ld BG_PIXEL %.06lx\n",
-                            rect.right - rect.left,
-                            rect.bottom - rect.top,
-                            rect.left, rect.top,
-                            (gulong) bg));
-         hbr = CreateSolidBrush (bg);
-#if 0
-         g_print ("...CreateSolidBrush (%.08x) = %.08x\n", bg, hbr);
-#endif
-         if (!FillRect (hdc, &rect, hbr))
-           WIN32_GDI_FAILED ("FillRect");
-         DeleteObject (hbr);
-       }
-      else if (GDK_WINDOW_OBJECT (window)->bg_pixmap != NULL &&
-              GDK_WINDOW_OBJECT (window)->bg_pixmap != GDK_NO_BG)
-       {
-         pixmap = GDK_WINDOW_OBJECT (window)->bg_pixmap;
-         pixmap_impl = GDK_PIXMAP_IMPL_WIN32 (GDK_PIXMAP_OBJECT (pixmap)->impl);
-         GetClipBox (hdc, &rect);
-
-         if (pixmap_impl->width <= 8 && pixmap_impl->height <= 8)
-           {
-             GDK_NOTE (EVENTS, g_print ("...small pixmap, using brush\n"));
-             hbr = CreatePatternBrush (GDK_PIXMAP_HBITMAP (pixmap));
-             if (!FillRect (hdc, &rect, hbr))
-               WIN32_GDI_FAILED ("FillRect");
-             DeleteObject (hbr);
-           }
-         else
-           {
-             GDK_NOTE (EVENTS,
-                       g_print ("...blitting pixmap %#lx (%dx%d) "
-                                "all over the place,\n"
-                                "...clip box = %ldx%ld@+%ld+%ld\n",
-                                (gulong) GDK_PIXMAP_HBITMAP (pixmap),
-                                pixmap_impl->width, pixmap_impl->height,
-                                rect.right - rect.left, rect.bottom - rect.top,
-                                rect.left, rect.top));
-
-             if (!(bgdc = CreateCompatibleDC (hdc)))
-               {
-                 WIN32_GDI_FAILED ("CreateCompatibleDC");
-                 break;
-               }
-             if (!(oldbitmap = SelectObject (bgdc, GDK_PIXMAP_HBITMAP (pixmap))))
-               {
-                 WIN32_GDI_FAILED ("SelectObject");
-                 DeleteDC (bgdc);
-                 break;
-               }
-             i = 0;
-             while (i < rect.right)
-               {
-                 j = 0;
-                 while (j < rect.bottom)
-                   {
-                     if (i + pixmap_impl->width >= rect.left
-                         && j + pixmap_impl->height >= rect.top)
-                       {
-                         if (!BitBlt (hdc, i, j,
-                                      pixmap_impl->width, pixmap_impl->height,
-                                      bgdc, 0, 0, SRCCOPY))
-                           {
-                             WIN32_GDI_FAILED ("BitBlt");
-                             goto loopexit;
-                           }
-                       }
-                     j += pixmap_impl->height;
-                   }
-                 i += pixmap_impl->width;
-               }
-           loopexit:
-             SelectObject (bgdc, oldbitmap);
-             DeleteDC (bgdc);
-           }
+
+      msg->hwnd = hwnd;
+      if ((new_window = gdk_win32_handle_table_lookup ((GdkNativeWindow) msg->hwnd)) == NULL)
+       break;
+
+      if (new_window != window)
+       {
+         assign_object (&window, new_window);
        }
-      else
+
+      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);
+      event->scroll.window = window;
+      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_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;
+
+      append_event (event);
+      
+      return_val = TRUE;
+      break;
+
+    case WM_QUERYNEWPALETTE:
+      if (gdk_visual_get_system ()->type == GDK_VISUAL_PSEUDO_COLOR)
        {
-         GDK_NOTE (EVENTS, g_print ("...BLACK_BRUSH (?)\n"));
-         hbr = GetStockObject (BLACK_BRUSH);
-         GetClipBox (hdc, &rect);
-         if (!FillRect (hdc, &rect, hbr))
-           WIN32_GDI_FAILED ("FillRect");
+         synthesize_expose_events (window);
+         update_colors_counter = 0;
        }
+      return_val = TRUE;
       break;
 
-    case WM_PAINT:
-      if (!GetUpdateRect(msg->hwnd, NULL, FALSE))
-        {
-          GDK_NOTE (EVENTS, g_print ("WM_PAINT: %#lx no update rect\n",
-                                    (gulong) msg->hwnd));
-          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;
 
-      hdc = BeginPaint (msg->hwnd, &paintstruct);
+      return_val = TRUE;
 
-      GDK_NOTE (EVENTS,
-               g_print ("WM_PAINT: %#lx  %ldx%ld@+%ld+%ld %s dc %#lx\n",
-                        (gulong) msg->hwnd,
-                        paintstruct.rcPaint.right - paintstruct.rcPaint.left,
-                        paintstruct.rcPaint.bottom - paintstruct.rcPaint.top,
-                        paintstruct.rcPaint.left, paintstruct.rcPaint.top,
-                        (paintstruct.fErase ? "erase" : ""),
-                        (gulong) hdc));
-
-      EndPaint (msg->hwnd, &paintstruct);
-
-      /* HB: don't generate GDK_EXPOSE events for InputOnly
-       * windows -> backing store now works!
-       */
-      if (GDK_WINDOW_OBJECT (window)->input_only)
+      if (msg->hwnd == (HWND) msg->wParam)
        break;
 
-      if (!(window_impl->event_mask & GDK_EXPOSURE_MASK))
-       break;
+      if (++update_colors_counter == 5)
+       {
+         synthesize_expose_events (window);
+         update_colors_counter = 0;
+         break;
+       }
+      
+      update_colors (window, TRUE);
+      break;
+
+     case WM_MOUSEACTIVATE:
+       if (gdk_window_get_window_type (window) == GDK_WINDOW_TEMP 
+          || !((GdkWindowObject *)window)->accept_focus)
+        {
+          *ret_valp = MA_NOACTIVATE;
+          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 (GDK_WINDOW_OBJECT (window)->bg_pixmap == GDK_NO_BG)
+      /* fallthrough */
+    case WM_SETFOCUS:
+      if (k_grab_window != NULL && !k_grab_owner_events)
        break;
 
-      if ((paintstruct.rcPaint.right == paintstruct.rcPaint.left)
-          || (paintstruct.rcPaint.bottom == paintstruct.rcPaint.top))
-        break;
+      if (!(((GdkWindowObject *) window)->event_mask & GDK_FOCUS_CHANGE_MASK))
+       break;
 
-      if (return_exposes)
-        {
-          event->expose.type = GDK_EXPOSE;
-          event->expose.window = window;
-          event->expose.area.x = paintstruct.rcPaint.left;
-          event->expose.area.y = paintstruct.rcPaint.top;
-          event->expose.area.width = paintstruct.rcPaint.right - paintstruct.rcPaint.left;
-          event->expose.area.height = paintstruct.rcPaint.bottom - paintstruct.rcPaint.top;
-          event->expose.region = gdk_region_rectangle (&(event->expose.area));
-          event->expose.count = 0;
-
-          return_val = !GDK_WINDOW_DESTROYED (window);
-          if (return_val)
-            {
-              GList *list = _gdk_queued_events;
-              while (list != NULL )
-                {
-                  if ((((GdkEvent *)list->data)->any.type == GDK_EXPOSE) &&
-                       (((GdkEvent *)list->data)->any.window == window) &&
-                       !(((GdkEventPrivate *)list->data)->flags & GDK_EVENT_PENDING))
-                       ((GdkEvent *)list->data)->expose.count++;
-
-                    list = list->next;
-                }
-            }
-        }
-      else
-        {
-          GdkRectangle expose_rect;
+      if (GDK_WINDOW_DESTROYED (window))
+       break;
 
-          expose_rect.x = paintstruct.rcPaint.left + xoffset;
-          expose_rect.y = paintstruct.rcPaint.top + yoffset;
-          expose_rect.width = paintstruct.rcPaint.right - paintstruct.rcPaint.left;
-          expose_rect.height = paintstruct.rcPaint.bottom - paintstruct.rcPaint.top;
+      generate_focus_event (window, (msg->message == WM_SETFOCUS));
+      return_val = TRUE;
+      break;
 
-           _gdk_window_process_expose (window, msg->time, &expose_rect);
+    case WM_ERASEBKGND:
+      GDK_NOTE (EVENTS, g_print (" %p", (HANDLE) msg->wParam));
+      
+      if (GDK_WINDOW_DESTROYED (window))
+       break;
 
-           return_val = FALSE;
-        }
+      erase_background (window, (HDC) msg->wParam);
+      return_val = TRUE;
+      *ret_valp = 1;
       break;
 
-    case WM_GETICON:
-      GDK_NOTE (EVENTS, g_print ("WM_GETICON: %#lx %s\n",
-                                (gulong) msg->hwnd, 
-                                (ICON_BIG == msg->wParam ? "big" : "small")));
+    case WM_PAINT:
+      handle_wm_paint (msg, window, FALSE, NULL);
       break;
+
     case WM_SETCURSOR:
-      GDK_NOTE (EVENTS, g_print ("WM_SETCURSOR: %#lx %#x %#x\n",
-                                (gulong) msg->hwnd,
+      GDK_NOTE (EVENTS, g_print (" %#x %#x",
                                 LOWORD (msg->lParam), HIWORD (msg->lParam)));
 
-      if (LOWORD (msg->lParam) != HTCLIENT)
+      if (p_grab_window == NULL && LOWORD (msg->lParam) != HTCLIENT)
        break;
 
       if (p_grab_window != NULL && p_grab_cursor != NULL)
        hcursor = p_grab_cursor;
       else if (!GDK_WINDOW_DESTROYED (window))
-       hcursor = window_impl->hcursor;
+       hcursor = GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl)->hcursor;
       else
        hcursor = NULL;
 
       if (hcursor != NULL)
        {
-         GDK_NOTE (EVENTS, g_print ("...SetCursor(%#lx)\n", (gulong) hcursor));
+         GDK_NOTE (EVENTS, g_print (" (SetCursor(%p)", hcursor));
          SetCursor (hcursor);
-         *ret_val_flagp = TRUE;
+         return_val = TRUE;
          *ret_valp = TRUE;
        }
       break;
 
     case WM_SHOWWINDOW:
-      GDK_NOTE (EVENTS, g_print ("WM_SHOWWINDOW: %#lx  %d\n",
-                                (gulong) msg->hwnd,
-                                msg->wParam));
+      GDK_NOTE (EVENTS, g_print (" %d", msg->wParam));
+
+      if (!(((GdkWindowObject *) window)->event_mask & GDK_STRUCTURE_MASK))
+       break;
+
+      if (msg->lParam == SW_OTHERUNZOOM ||
+         msg->lParam == SW_OTHERZOOM)
+       break;
 
-      if (!(window_impl->event_mask & GDK_STRUCTURE_MASK))
+      if (GDK_WINDOW_DESTROYED (window))
        break;
 
-      event->any.type = (msg->wParam ? GDK_MAP : GDK_UNMAP);
+      event = gdk_event_new (msg->wParam ? GDK_MAP : GDK_UNMAP);
       event->any.window = window;
 
-      if (event->any.type == GDK_UNMAP
-         && p_grab_window == window)
+      append_event (event);
+      
+      if (event->any.type == GDK_UNMAP &&
+         p_grab_window == window)
        gdk_pointer_ungrab (msg->time);
 
-      if (event->any.type == GDK_UNMAP
-         && k_grab_window == window)
+      if (event->any.type == GDK_UNMAP &&
+         k_grab_window == window)
        gdk_keyboard_ungrab (msg->time);
 
-      return_val = !GDK_WINDOW_DESTROYED (window);
+      return_val = TRUE;
       break;
 
     case WM_SIZE:
       GDK_NOTE (EVENTS,
-               g_print ("WM_SIZE: %#lx  %s %dx%d\n",
-                        (gulong) msg->hwnd,
+               g_print (" %s %dx%d",
                         (msg->wParam == SIZE_MAXHIDE ? "MAXHIDE" :
                          (msg->wParam == SIZE_MAXIMIZED ? "MAXIMIZED" :
                           (msg->wParam == SIZE_MAXSHOW ? "MAXSHOW" :
@@ -2821,13 +3030,9 @@ gdk_event_translate (GdkEvent *event,
                             (msg->wParam == SIZE_RESTORED ? "RESTORED" : "?"))))),
                         LOWORD (msg->lParam), HIWORD (msg->lParam)));
 
-      if (!(window_impl->event_mask & GDK_STRUCTURE_MASK))
-       break;
-
       if (msg->wParam == SIZE_MINIMIZED)
        {
-         event->any.type = GDK_UNMAP;
-         event->any.window = window;
+         /* Don't generate any GDK event. This is *not* an UNMAP. */
 
          if (p_grab_window == window)
            gdk_pointer_ungrab (msg->time);
@@ -2835,238 +3040,331 @@ gdk_event_translate (GdkEvent *event,
          if (k_grab_window == window)
            gdk_keyboard_ungrab (msg->time);
 
-         return_val = !GDK_WINDOW_DESTROYED (window);
+         gdk_synthesize_window_state (window,
+                                      GDK_WINDOW_STATE_WITHDRAWN,
+                                      GDK_WINDOW_STATE_ICONIFIED);
        }
-      else if ((msg->wParam == SIZE_RESTORED
-               || msg->wParam == SIZE_MAXIMIZED)
-#if 1
-              && GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD
-#endif
-                                                                )
+      else if ((msg->wParam == SIZE_RESTORED ||
+               msg->wParam == SIZE_MAXIMIZED) &&
+              GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD)
        {
-         if (LOWORD (msg->lParam) == 0)
-           break;
-
-         event->configure.type = GDK_CONFIGURE;
-         event->configure.window = window;
-         pt.x = 0;
-         pt.y = 0;
-         ClientToScreen (msg->hwnd, &pt);
-         event->configure.x = pt.x;
-         event->configure.y = pt.y;
-         event->configure.width = LOWORD (msg->lParam);
-         event->configure.height = HIWORD (msg->lParam);
-         GDK_WINDOW_OBJECT (window)->x = event->configure.x;
-         GDK_WINDOW_OBJECT (window)->y = event->configure.y;
-         window_impl->width = event->configure.width;
-         window_impl->height = event->configure.height;
-
-         if (GDK_WINDOW_OBJECT (window)->resize_count > 1)
-           GDK_WINDOW_OBJECT (window)->resize_count -= 1;
+         GdkWindowState withdrawn_bit =
+           IsWindowVisible (msg->hwnd) ? GDK_WINDOW_STATE_WITHDRAWN : 0;
+
+         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);
+         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;
          
-         return_val = !GDK_WINDOW_DESTROYED (window);
-         if (return_val
-             && GDK_WINDOW_OBJECT (window)->extension_events != 0)
-           _gdk_input_configure_event (&event->configure, window);
+         if (((GdkWindowObject *) window)->extension_events != 0)
+           _gdk_input_configure_event (window);
+
+         return_val = TRUE;
        }
       break;
-#if 0
-    case WM_SIZING :
-      {
-        LPRECT lpr = (LPRECT) msg->lParam;
-        NONCLIENTMETRICS ncm;
-        ncm.cbSize = sizeof (NONCLIENTMETRICS);
-
-        SystemParametersInfo (SPI_GETNONCLIENTMETRICS, ncm.cbSize, &ncm, 0);
-
-        g_print ("WM_SIZING borderWidth %d captionHeight %d\n",
-                 ncm.iBorderWidth, ncm.iCaptionHeight);
-         event->configure.type = GDK_CONFIGURE;
-         event->configure.window = window;
-
-         event->configure.x = lpr->left + ncm.iBorderWidth;
-         event->configure.y = lpr->top + ncm.iCaptionHeight;
-         event->configure.width = lpr->right - lpr->left - 2 * ncm.iBorderWidth;
-         event->configure.height = lpr->bottom - lpr->top - ncm.iCaptionHeight;
-         GDK_WINDOW_OBJECT (window)->x = event->configure.x;
-         GDK_WINDOW_OBJECT (window)->y = event->configure.y;
-         window_impl->width = event->configure.width;
-         window_impl->height = event->configure.height;
-
-         if (GDK_WINDOW_OBJECT (window)->resize_count > 1)
-           GDK_WINDOW_OBJECT (window)->resize_count -= 1;
-
-         return_val = !GDK_WINDOW_DESTROYED (window);
-         if (return_val
-             && GDK_WINDOW_OBJECT (window)->extension_events != 0)
-           _gdk_input_configure_event (&event->configure, window);
-      }
+
+    case WM_ENTERSIZEMOVE:
+      _sizemove_in_progress = TRUE;
+      resize_timer = SetTimer (NULL, 0, 20, resize_timer_proc);
       break;
-#endif
-    case WM_GETMINMAXINFO:
-      GDK_NOTE (EVENTS, g_print ("WM_GETMINMAXINFO: %#lx\n", (gulong) msg->hwnd));
 
-      mmi = (MINMAXINFO*) msg->lParam;
-      if (window_impl->hint_flags & GDK_HINT_MIN_SIZE)
-       {
-         mmi->ptMinTrackSize.x = window_impl->hint_min_width;
-         mmi->ptMinTrackSize.y = window_impl->hint_min_height;
-       }
-      if (window_impl->hint_flags & GDK_HINT_MAX_SIZE)
+    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))
        {
-         mmi->ptMaxTrackSize.x = window_impl->hint_max_width;
-         mmi->ptMaxTrackSize.y = window_impl->hint_max_height;
+         RECT client_rect;
+         POINT point;
+
+         GetClientRect (msg->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);
+             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;
+         
+         ((GdkWindowObject *) window)->x = point.x;
+         ((GdkWindowObject *) window)->y = point.y;
 
-         /* kind of WM functionality, limit maximized size to screen */
-         mmi->ptMaxPosition.x = 0; mmi->ptMaxPosition.y = 0;       
-         mmi->ptMaxSize.x = MIN(window_impl->hint_max_width, gdk_screen_width ());
-         mmi->ptMaxSize.y = MIN(window_impl->hint_max_height, gdk_screen_height ());
+         if (((GdkWindowObject *) window)->event_mask & GDK_STRUCTURE_MASK)
+           {
+             GdkEvent *event = gdk_event_new (GDK_CONFIGURE);
+             
+             event->configure.window = window;
+             
+             event->configure.width = client_rect.right - client_rect.left;
+             event->configure.height = client_rect.bottom - client_rect.top;
+             
+             event->configure.x = point.x;
+             event->configure.y = point.y;
+             
+             if (((GdkWindowObject *) window)->resize_count > 1)
+               ((GdkWindowObject *) window)->resize_count -= 1;
+             
+#if 0 /* I don't like calling _gdk_event_func() from here, isn't there
+       * a risk of getting events processed in the wrong order, like
+       * Owen says in the discussion of bug #99540?
+       */
+             fixup_event (event);
+             if (_gdk_event_func)
+               (*_gdk_event_func) (event, _gdk_event_data);
+             gdk_event_free (event);
+#else /* Calling append_event() is slower, but guarantees that events won't
+       * get reordered, I think.
+       */
+             append_event (event);
+#endif
+             
+             /* 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;
+           }
        }
       break;
 
-    case WM_MOVE:
-      GDK_NOTE (EVENTS, g_print ("WM_MOVE: %#lx  (%d,%d)\n",
-                                (gulong) msg->hwnd,
-                                LOWORD (msg->lParam), HIWORD (msg->lParam)));
+    case WM_SIZING:
+      GetWindowRect (GDK_WINDOW_HWND (window), &rect);
+      GDK_NOTE (EVENTS, g_print (" %s curr:%s drag:%s",
+                                (msg->wParam == WMSZ_BOTTOM ? "BOTTOM" :
+                                 (msg->wParam == WMSZ_BOTTOMLEFT ? "BOTTOMLEFT" :
+                                  (msg->wParam == WMSZ_LEFT ? "LEFT" :
+                                   (msg->wParam == WMSZ_TOPLEFT ? "TOPLEFT" :
+                                    (msg->wParam == WMSZ_TOP ? "TOP" :
+                                     (msg->wParam == WMSZ_TOPRIGHT ? "TOPRIGHT" :
+                                      (msg->wParam == WMSZ_RIGHT ? "RIGHT" :
+                                       
+                                       (msg->wParam == WMSZ_BOTTOMRIGHT ? "BOTTOMRIGHT" :
+                                        "???")))))))),
+                                _gdk_win32_rect_to_string (&rect),
+                                _gdk_win32_rect_to_string ((RECT *) msg->lParam)));
+
+      impl = GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl);
+      drag = (RECT *) msg->lParam;
+      orig_drag = *drag;
+      if (impl->hint_flags & GDK_HINT_RESIZE_INC)
+       {
+         if (impl->hint_flags & GDK_HINT_BASE_SIZE)
+           {
+             /* Resize in increments relative to the base size */
+             rect.left = rect.top = 0;
+             rect.right = impl->hints.base_width;
+             rect.bottom = impl->hints.base_height;
+             _gdk_win32_adjust_client_rect (window, &rect);
+             point.x = rect.left;
+             point.y = rect.top;
+             ClientToScreen (GDK_WINDOW_HWND (window), &point);
+             rect.left = point.x;
+             rect.top = point.y;
+             point.x = rect.right;
+             point.y = rect.bottom;
+             ClientToScreen (GDK_WINDOW_HWND (window), &point);
+             rect.right = point.x;
+             rect.bottom = point.y;
+             
+             GDK_NOTE (EVENTS, g_print (" (also BASE_SIZE, using %s)",
+                                        _gdk_win32_rect_to_string (&rect)));
+           }
 
-      if (!(window_impl->event_mask & GDK_STRUCTURE_MASK))
-       break;
+         switch (msg->wParam)
+           {
+           case WMSZ_BOTTOM:
+             if (drag->bottom == rect.bottom)
+               break;
+             adjust_drag (&drag->bottom, rect.bottom, impl->hints.height_inc);
+
+             break;
+
+           case WMSZ_BOTTOMLEFT:
+             if (drag->bottom == rect.bottom && drag->left == rect.left)
+               break;
+             adjust_drag (&drag->bottom, rect.bottom, impl->hints.height_inc);
+             adjust_drag (&drag->left, rect.left, impl->hints.width_inc);
+             break;
+
+           case WMSZ_LEFT:
+             if (drag->left == rect.left)
+               break;
+             adjust_drag (&drag->left, rect.left, impl->hints.width_inc);
+             break;
+
+           case WMSZ_TOPLEFT:
+             if (drag->top == rect.top && drag->left == rect.left)
+               break;
+             adjust_drag (&drag->top, rect.top, impl->hints.height_inc);
+             adjust_drag (&drag->left, rect.left, impl->hints.width_inc);
+             break;
+
+           case WMSZ_TOP:
+             if (drag->top == rect.top)
+               break;
+             adjust_drag (&drag->top, rect.top, impl->hints.height_inc);
+             break;
+
+           case WMSZ_TOPRIGHT:
+             if (drag->top == rect.top && drag->right == rect.right)
+               break;
+             adjust_drag (&drag->top, rect.top, impl->hints.height_inc);
+             adjust_drag (&drag->right, rect.right, impl->hints.width_inc);
+             break;
+
+           case WMSZ_RIGHT:
+             if (drag->right == rect.right)
+               break;
+             adjust_drag (&drag->right, rect.right, impl->hints.width_inc);
+             break;
+
+           case WMSZ_BOTTOMRIGHT:
+             if (drag->bottom == rect.bottom && drag->right == rect.right)
+               break;
+             adjust_drag (&drag->bottom, rect.bottom, impl->hints.height_inc);
+             adjust_drag (&drag->right, rect.right, impl->hints.width_inc);
+             break;
+           }
+
+         if (drag->bottom != orig_drag.bottom || drag->left != orig_drag.left ||
+             drag->top != orig_drag.top || drag->right != orig_drag.right)
+           {
+             *ret_valp = TRUE;
+             return_val = TRUE;
+             GDK_NOTE (EVENTS, g_print (" (handled RESIZE_INC: drag:%s)",
+                                        _gdk_win32_rect_to_string (drag)));
+           }
+       }
 
-      if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD
-         && !IsIconic(msg->hwnd)
-          && IsWindowVisible(msg->hwnd))
+      /* WM_GETMINMAXINFO handles min_size and max_size hints? */
+
+      if (impl->hint_flags & GDK_HINT_ASPECT)
        {
-         event->configure.type = GDK_CONFIGURE;
-         event->configure.window = window;
-         event->configure.x = LOWORD (msg->lParam);
-         event->configure.y = HIWORD (msg->lParam);
-         GetClientRect (msg->hwnd, &rect);
-         event->configure.width = rect.right;
-         event->configure.height = rect.bottom;
-         GDK_WINDOW_OBJECT (window)->x = event->configure.x;
-         GDK_WINDOW_OBJECT (window)->y = event->configure.y;
-         window_impl->width = event->configure.width;
-         window_impl->height = event->configure.height;
+         gdouble drag_aspect = (gdouble) (drag->right - drag->left) / (drag->bottom - drag->top);
          
-         return_val = !GDK_WINDOW_DESTROYED (window);
+         GDK_NOTE (EVENTS, g_print (" (aspect:%g)", drag_aspect));
+         if (drag_aspect < impl->hints.min_aspect ||
+             drag_aspect > impl->hints.max_aspect)
+           {
+             *drag = rect;
+             *ret_valp = TRUE;
+             return_val = TRUE;
+             GDK_NOTE (EVENTS, g_print (" (handled ASPECT: drag:%s)",
+                                        _gdk_win32_rect_to_string (drag)));
+           }
        }
       break;
-#if 0 /* not quite right, otherwise it may be faster/better than WM_(MOVE|SIZE) 
-       * remove decoration (frame) sizes ?
-       */
-    case WM_WINDOWPOSCHANGED :
 
-      if (!(window_impl->event_mask & GDK_STRUCTURE_MASK))
+    case WM_GETMINMAXINFO:
+      if (GDK_WINDOW_DESTROYED (window))
        break;
 
-      if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD
-         && !IsIconic(msg->hwnd)
-          && IsWindowVisible(msg->hwnd))
+      impl = GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl);
+      mmi = (MINMAXINFO*) msg->lParam;
+      GDK_NOTE (EVENTS, g_print (" (mintrack:%ldx%ld maxtrack:%ldx%ld "
+                                "maxpos:%+ld%+ld maxsize:%ldx%ld)",
+                                mmi->ptMinTrackSize.x, mmi->ptMinTrackSize.y,
+                                mmi->ptMaxTrackSize.x, mmi->ptMaxTrackSize.y,
+                                mmi->ptMaxPosition.x, mmi->ptMaxPosition.y,
+                                mmi->ptMaxSize.x, mmi->ptMaxSize.y));
+
+      if (impl->hint_flags & GDK_HINT_MIN_SIZE)
        {
-         LPWINDOWPOS lpwp = (LPWINDOWPOS) (msg->lParam);
-
-         event->configure.type = GDK_CONFIGURE;
-         event->configure.window = window;
-         event->configure.x = lpwp->x;
-         event->configure.y = lpwp->y;
-         event->configure.width = lpwp->cx;
-         event->configure.height = lpwp->cy;
-         GDK_WINDOW_OBJECT (window)->x = event->configure.x;
-         GDK_WINDOW_OBJECT (window)->y = event->configure.y;
-         window_impl->width = event->configure.width;
-         window_impl->height = event->configure.height;
-         
-         return_val = !GDK_WINDOW_DESTROYED (window);
+         rect.left = rect.top = 0;
+         rect.right = impl->hints.min_width;
+         rect.bottom = impl->hints.min_height;
 
-          GDK_NOTE (EVENTS, g_print ("WM_WINDOWPOSCHANGED: %#lx  %ldx%ld@+%ld+%ld\n",
-                                    (gulong) msg->hwnd,
-                                    lpwp->cx, lpwp->cy, lpwp->x, lpwp->y));
+         _gdk_win32_adjust_client_rect (window, &rect);
 
-         if (ret_val_flagp)
-           *ret_val_flagp = TRUE;
-         if (ret_valp)
-           *ret_valp = 0;
+         mmi->ptMinTrackSize.x = rect.right - rect.left;
+         mmi->ptMinTrackSize.y = rect.bottom - rect.top;
        }
-      break;
-#endif
-    case WM_CLOSE:
-      GDK_NOTE (EVENTS, g_print ("WM_CLOSE: %#lx\n", (gulong) msg->hwnd));
 
-      event->any.type = GDK_DELETE;
-      event->any.window = window;
-      
-      return_val = !GDK_WINDOW_DESTROYED (window);
-      break;
+      if (impl->hint_flags & GDK_HINT_MAX_SIZE)
+       {
+         int maxw, maxh;
 
-#if 0
-    /* No, don't use delayed rendering after all. It works only if the
-     * delayed SetClipboardData is called from the WindowProc, it
-     * seems. (The #else part below is test code for that. It succeeds
-     * in setting the clipboard data. But if I call SetClipboardData
-     * in gdk_property_change (as a consequence of the
-     * GDK_SELECTION_REQUEST event), it fails.  I deduce that this is
-     * because delayed rendering requires that SetClipboardData is
-     * called in the window procedure.)
-     */
-    case WM_RENDERFORMAT:
-    case WM_RENDERALLFORMATS:
-      flag = FALSE;
-      GDK_NOTE (EVENTS, flag = TRUE);
-      if (flag)
-       g_print ("WM_%s: %#lx %#x (%s)\n",
-                (msg->message == WM_RENDERFORMAT ? "RENDERFORMAT" :
-                 "RENDERALLFORMATS"),
-                (gulong) msg->hwnd,
-                msg->wParam,
-                (msg->wParam == CF_TEXT ? "CF_TEXT" :
-                 (msg->wParam == CF_DIB ? "CF_DIB" :
-                  (msg->wParam == CF_UNICODETEXT ? "CF_UNICODETEXT" :
-                   (GetClipboardFormatName (msg->wParam, buf, sizeof (buf)), buf)))));
+         rect.left = rect.top = 0;
+         rect.right = impl->hints.max_width;
+         rect.bottom = impl->hints.max_height;
 
-#if 0
-      event->selection.type = GDK_SELECTION_REQUEST;
-      event->selection.window = window;
-      event->selection.selection = gdk_clipboard_atom;
-      if (msg->wParam == CF_TEXT)
-       event->selection.target = GDK_TARGET_STRING;
-      else
+         _gdk_win32_adjust_client_rect (window, &rect);
+
+         /* at least on win9x we have the 16 bit trouble */
+         maxw = rect.right - rect.left;
+         maxh = rect.bottom - rect.top;
+         mmi->ptMaxTrackSize.x = maxw > 0 && maxw < G_MAXSHORT ? maxw : G_MAXSHORT;
+         mmi->ptMaxTrackSize.y = maxh > 0 && maxh < G_MAXSHORT ? maxh : G_MAXSHORT;
+       }
+
+      if (impl->hint_flags & (GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE))
        {
-         GetClipboardFormatName (msg->wParam, buf, sizeof (buf));
-         event->selection.target = gdk_atom_intern (buf, FALSE);
+         /* Don't call DefWindowProc() */
+         GDK_NOTE (EVENTS, g_print (" (handled, mintrack:%ldx%ld maxtrack:%ldx%ld "
+                                    "maxpos:%+ld%+ld maxsize:%ldx%ld)",
+                                    mmi->ptMinTrackSize.x, mmi->ptMinTrackSize.y,
+                                    mmi->ptMaxTrackSize.x, mmi->ptMaxTrackSize.y,
+                                    mmi->ptMaxPosition.x, mmi->ptMaxPosition.y,
+                                    mmi->ptMaxSize.x, mmi->ptMaxSize.y));
+         return_val = TRUE;
        }
-      event->selection.property = _gdk_selection_property;
-      event->selection.requestor = (guint32) msg->hwnd;
-      event->selection.time = msg->time;
-      return_val = !GDK_WINDOW_DESTROYED (window);
-#else
-      /* Test code, to see if SetClipboardData works when called from
-       * the window procedure.
-       */
-      {
-       HGLOBAL hdata = GlobalAlloc (GMEM_MOVEABLE|GMEM_DDESHARE, 10);
-       char *ptr = GlobalLock (hdata);
-       strcpy (ptr, "Huhhaa");
-       GlobalUnlock (hdata);
-       if (!SetClipboardData (CF_TEXT, hdata))
-         WIN32_API_FAILED ("SetClipboardData");
-      }
-      *ret_valp = 0;
-      *ret_val_flagp = TRUE;
-      return_val = FALSE;
-#endif
       break;
-#endif /* No delayed rendering */
 
-    case WM_DESTROY:
-      GDK_NOTE (EVENTS, g_print ("WM_DESTROY: %#lx\n", (gulong) msg->hwnd));
+    case WM_MOVE:
+      GDK_NOTE (EVENTS, g_print (" (%d,%d)",
+                                GET_X_LPARAM (msg->lParam), GET_Y_LPARAM (msg->lParam)));
 
-      event->any.type = GDK_DESTROY;
-      event->any.window = window;
-      if (window != NULL && window == current_window)
+      if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&
+         !IsIconic (msg->hwnd))
        {
-         gdk_drawable_unref (current_window);
-         current_window = NULL;
+         if (!GDK_WINDOW_DESTROYED (window))
+           handle_configure_event (msg, window);
+
+         return_val = TRUE;
        }
+      break;
+
+    case WM_CLOSE:
+      if (GDK_WINDOW_DESTROYED (window))
+       break;
+
+      event = gdk_event_new (GDK_DELETE);
+      event->any.window = window;
+
+      append_event (event);
+
+      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);
@@ -3074,119 +3372,155 @@ gdk_event_translate (GdkEvent *event,
       if (k_grab_window == window)
        gdk_keyboard_ungrab (msg->time);
 
-      return_val = window != NULL && !GDK_WINDOW_DESTROYED (window);
-
-      if ((window != NULL) && (gdk_root_window != msg->hwnd))
+      if ((window != NULL) && (msg->hwnd != GetDesktopWindow ()))
        gdk_window_destroy_notify (window);
 
+      if (window == NULL || GDK_WINDOW_DESTROYED (window))
+       break;
+
+      event = gdk_event_new (GDK_DESTROY);
+      event->any.window = window;
+
+      append_event (event);
+
+      return_val = TRUE;
+      break;
+
+    case WM_DISPLAYCHANGE:
+      handle_display_change ();
+      break;
+      
+    case WM_DESTROYCLIPBOARD:
+      if (!_ignore_destroy_clipboard)
+       {
+         event = gdk_event_new (GDK_SELECTION_CLEAR);
+         event->selection.window = window;
+         event->selection.selection = GDK_SELECTION_CLIPBOARD;
+         event->selection.time = _gdk_win32_get_next_tick (msg->time);
+          append_event (event);
+       }
+      else
+       return_val = TRUE;
+      break;
+
+    case WM_RENDERFORMAT:
+      GDK_NOTE (EVENTS, g_print (" %s", _gdk_win32_cf_to_string (msg->wParam)));
+
+      if (!(target = g_hash_table_lookup (_format_atom_table, GINT_TO_POINTER (msg->wParam))))
+       {
+         GDK_NOTE (EVENTS, g_print (" (target not found)"));
+         return_val = TRUE;
+         break;
+       }
+
+      /* We need to render to clipboard immediately, don't call
+       * 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);
+
+         /* 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
+              */
+             API_CALL (SetClipboardData, (msg->wParam, _delayed_rendering_data));
+             _delayed_rendering_data = NULL;
+           }
+       }
       break;
 
 #ifdef HAVE_WINTAB
+    case WM_ACTIVATE:
+      /* 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
+       * instead
+       */
+      if (LOWORD(msg->wParam) != WA_INACTIVE)
+       _gdk_input_set_tablet_active ();
+      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 ("WT_PACKET: %#lx %d %#lx\n",
-                                (gulong) msg->hwnd,
+      GDK_NOTE (EVENTS, g_print (" %d %#lx",
                                 msg->wParam, msg->lParam));
       goto wintab;
       
     case WT_CSRCHANGE:
-      GDK_NOTE (EVENTS, g_print ("WT_CSRCHANGE: %#lx %d %#lx\n",
-                                (gulong) msg->hwnd,
+      GDK_NOTE (EVENTS, g_print (" %d %#lx",
                                 msg->wParam, msg->lParam));
       goto wintab;
       
     case WT_PROXIMITY:
-      GDK_NOTE (EVENTS, g_print ("WT_PROXIMITY: %#lx %#x %d %d\n",
-                                (gulong) msg->hwnd, msg->wParam,
+      GDK_NOTE (EVENTS, g_print (" %#x %d %d",
+                                msg->wParam,
                                 LOWORD (msg->lParam),
                                 HIWORD (msg->lParam)));
       /* Fall through */
     wintab:
+
+      event = gdk_event_new (GDK_NOTHING);
       event->any.window = window;
-      return_val = _gdk_input_other_event(event, msg, window);
+      g_object_ref (window);
+      if (_gdk_input_other_event (event, msg, window))
+       append_event (event);
+      else
+       gdk_event_free (event);
       break;
 #endif
-
-    default:
-      GDK_NOTE (EVENTS, g_print ("%s: %#lx %#x %#lx\n",
-                                gdk_win32_message_name (msg->message),
-                                (gulong) msg->hwnd,
-                                msg->wParam, msg->lParam));
     }
 
 done:
 
-  if (return_val)
-    {
-      if (event->any.window)
-       gdk_drawable_ref (event->any.window);
-      if (((event->any.type == GDK_ENTER_NOTIFY) ||
-          (event->any.type == GDK_LEAVE_NOTIFY)) &&
-         (event->crossing.subwindow != NULL))
-       gdk_drawable_ref (event->crossing.subwindow);
-
-      GDK_NOTE (EVENTS, print_event (event));
-    }
-  else
-    {
-      /* Mark this event as having no resources to be freed */
-      event->any.window = NULL;
-      event->any.type = GDK_NOTHING;
-    }
-
   if (window)
-    gdk_drawable_unref (window);
+    g_object_unref (window);
   
+#undef return
   return return_val;
 }
 
 void
-_gdk_events_queue (void)
+_gdk_events_queue (GdkDisplay *display)
 {
   MSG msg;
-  GdkEvent *event;
-  GList *node;
 
-  while (!_gdk_event_queue_find_first ()
-        && PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
+  while (!_gdk_event_queue_find_first (display) &&
+        PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
     {
-      GDK_NOTE (EVENTS, g_print ("PeekMessage: %#lx %s\n",
-                                (gulong) msg.hwnd, gdk_win32_message_name (msg.message)));
-
-      if (active_imm_msgpump_owner == NULL
-         || (active_imm_msgpump_owner->lpVtbl->OnTranslateMessage) (active_imm_msgpump_owner, &msg) != S_OK)
-       TranslateMessage (&msg);
-
-#if 1 /* It was like this all the time */
+      TranslateMessage (&msg);
       DispatchMessage (&msg);
-#else /* but this one is more similar to the X implementation. Any effect ? */
-      event = _gdk_event_new ();
-      
-      event->any.type = GDK_NOTHING;
-      event->any.window = NULL;
-      event->any.send_event = InSendMessage ();
-
-      ((GdkEventPrivate *)event)->flags |= GDK_EVENT_PENDING;
-
-      _gdk_event_queue_append (event);
-      node = _gdk_queued_tail;
-
-      if (gdk_event_translate (event, &msg, NULL, NULL, FALSE))
-       {
-         ((GdkEventPrivate *)event)->flags &= ~GDK_EVENT_PENDING;
-       }
-      else
-       {
-         _gdk_event_queue_remove_link (node);
-         g_list_free_1 (node);
-         gdk_event_free (event);
-        DispatchMessage (&msg);
-       }
-
-#endif
     }
 }
 
@@ -3196,13 +3530,13 @@ gdk_event_prepare (GSource *source,
 {
   MSG msg;
   gboolean retval;
-  
+
   GDK_THREADS_ENTER ();
 
   *timeout = -1;
 
-  retval = (_gdk_event_queue_find_first () != NULL)
-             || PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE);
+  retval = (_gdk_event_queue_find_first (_gdk_display) != NULL ||
+           PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE));
 
   GDK_THREADS_LEAVE ();
 
@@ -3218,8 +3552,8 @@ gdk_event_check (GSource *source)
   GDK_THREADS_ENTER ();
 
   if (event_poll_fd.revents & G_IO_IN)
-    retval = (_gdk_event_queue_find_first () != NULL)
-             || PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE);
+    retval = (_gdk_event_queue_find_first (_gdk_display) != NULL ||
+             PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE));
   else
     retval = FALSE;
 
@@ -3237,8 +3571,8 @@ gdk_event_dispatch (GSource     *source,
  
   GDK_THREADS_ENTER ();
 
-  _gdk_events_queue();
-  event = _gdk_event_unqueue();
+  _gdk_events_queue (_gdk_display);
+  event = _gdk_event_unqueue (_gdk_display);
 
   if (event)
     {
@@ -3253,271 +3587,78 @@ gdk_event_dispatch (GSource     *source,
   return TRUE;
 }
 
-/* Sends a ClientMessage to all toplevel client windows */
+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 (GdkEvent *event, guint32 xid)
+gdk_event_send_client_message_for_display (GdkDisplay     *display,
+                                           GdkEvent       *event, 
+                                           GdkNativeWindow winid)
 {
-  /* XXX */
-  return FALSE;
+  check_for_too_much_data (event);
+
+  return PostMessage ((HWND) winid, client_message,
+                     (WPARAM) event->client.message_type,
+                     event->client.data.l[0]);
 }
 
 void
-gdk_event_send_clientmessage_toall (GdkEvent *event)
+gdk_screen_broadcast_client_message (GdkScreen *screen, 
+                                    GdkEvent  *event)
 {
-  /* XXX */
+  check_for_too_much_data (event);
+
+  PostMessage (HWND_BROADCAST, client_message,
+              (WPARAM) event->client.message_type,
+              event->client.data.l[0]);
 }
 
 void
 gdk_flush (void)
 {
+#if 0
   MSG msg;
 
-#if 0
   /* Process all messages currently available */
   while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
     {
-      TranslateMessage (&msg); /* Translate virt. key codes */
-      DispatchMessage (&msg);  /* Dispatch msg. to window */
+      TranslateMessage (&msg);
+      DispatchMessage (&msg);
     }
 #endif
 
   GdiFlush ();
 }
 
-#ifdef G_ENABLE_DEBUG
+void
+gdk_display_sync (GdkDisplay * display)
+{
+  MSG msg;
 
-gchar *
-gdk_win32_message_name (UINT msg)
-{
-  static gchar bfr[100];
-
-  switch (msg)
-    {
-#define CASE(x) case x: return #x
-      CASE (WM_NULL);
-      CASE (WM_CREATE);
-      CASE (WM_DESTROY);
-      CASE (WM_MOVE);
-      CASE (WM_SIZE);
-      CASE (WM_ACTIVATE);
-      CASE (WM_SETFOCUS);
-      CASE (WM_KILLFOCUS);
-      CASE (WM_ENABLE);
-      CASE (WM_SETREDRAW);
-      CASE (WM_SETTEXT);
-      CASE (WM_GETTEXT);
-      CASE (WM_GETTEXTLENGTH);
-      CASE (WM_PAINT);
-      CASE (WM_CLOSE);
-      CASE (WM_QUERYENDSESSION);
-      CASE (WM_QUERYOPEN);
-      CASE (WM_ENDSESSION);
-      CASE (WM_QUIT);
-      CASE (WM_ERASEBKGND);
-      CASE (WM_SYSCOLORCHANGE);
-      CASE (WM_SHOWWINDOW);
-      CASE (WM_WININICHANGE);
-      CASE (WM_DEVMODECHANGE);
-      CASE (WM_ACTIVATEAPP);
-      CASE (WM_FONTCHANGE);
-      CASE (WM_TIMECHANGE);
-      CASE (WM_CANCELMODE);
-      CASE (WM_SETCURSOR);
-      CASE (WM_MOUSEACTIVATE);
-      CASE (WM_CHILDACTIVATE);
-      CASE (WM_QUEUESYNC);
-      CASE (WM_GETMINMAXINFO);
-      CASE (WM_PAINTICON);
-      CASE (WM_ICONERASEBKGND);
-      CASE (WM_NEXTDLGCTL);
-      CASE (WM_SPOOLERSTATUS);
-      CASE (WM_DRAWITEM);
-      CASE (WM_MEASUREITEM);
-      CASE (WM_DELETEITEM);
-      CASE (WM_VKEYTOITEM);
-      CASE (WM_CHARTOITEM);
-      CASE (WM_SETFONT);
-      CASE (WM_GETFONT);
-      CASE (WM_SETHOTKEY);
-      CASE (WM_GETHOTKEY);
-      CASE (WM_QUERYDRAGICON);
-      CASE (WM_COMPAREITEM);
-      CASE (WM_GETOBJECT);
-      CASE (WM_COMPACTING);
-      CASE (WM_WINDOWPOSCHANGING);
-      CASE (WM_WINDOWPOSCHANGED);
-      CASE (WM_POWER);
-      CASE (WM_COPYDATA);
-      CASE (WM_CANCELJOURNAL);
-      CASE (WM_NOTIFY);
-      CASE (WM_INPUTLANGCHANGEREQUEST);
-      CASE (WM_INPUTLANGCHANGE);
-      CASE (WM_TCARD);
-      CASE (WM_HELP);
-      CASE (WM_USERCHANGED);
-      CASE (WM_NOTIFYFORMAT);
-      CASE (WM_CONTEXTMENU);
-      CASE (WM_STYLECHANGING);
-      CASE (WM_STYLECHANGED);
-      CASE (WM_DISPLAYCHANGE);
-      CASE (WM_GETICON);
-      CASE (WM_SETICON);
-      CASE (WM_NCCREATE);
-      CASE (WM_NCDESTROY);
-      CASE (WM_NCCALCSIZE);
-      CASE (WM_NCHITTEST);
-      CASE (WM_NCPAINT);
-      CASE (WM_NCACTIVATE);
-      CASE (WM_GETDLGCODE);
-      CASE (WM_SYNCPAINT);
-      CASE (WM_NCMOUSEMOVE);
-      CASE (WM_NCLBUTTONDOWN);
-      CASE (WM_NCLBUTTONUP);
-      CASE (WM_NCLBUTTONDBLCLK);
-      CASE (WM_NCRBUTTONDOWN);
-      CASE (WM_NCRBUTTONUP);
-      CASE (WM_NCRBUTTONDBLCLK);
-      CASE (WM_NCMBUTTONDOWN);
-      CASE (WM_NCMBUTTONUP);
-      CASE (WM_NCMBUTTONDBLCLK);
-      CASE (WM_NCXBUTTONDOWN);
-      CASE (WM_NCXBUTTONUP);
-      CASE (WM_NCXBUTTONDBLCLK);
-      CASE (WM_KEYDOWN);
-      CASE (WM_KEYUP);
-      CASE (WM_CHAR);
-      CASE (WM_DEADCHAR);
-      CASE (WM_SYSKEYDOWN);
-      CASE (WM_SYSKEYUP);
-      CASE (WM_SYSCHAR);
-      CASE (WM_SYSDEADCHAR);
-      CASE (WM_KEYLAST);
-      CASE (WM_IME_STARTCOMPOSITION);
-      CASE (WM_IME_ENDCOMPOSITION);
-      CASE (WM_IME_COMPOSITION);
-      CASE (WM_INITDIALOG);
-      CASE (WM_COMMAND);
-      CASE (WM_SYSCOMMAND);
-      CASE (WM_TIMER);
-      CASE (WM_HSCROLL);
-      CASE (WM_VSCROLL);
-      CASE (WM_INITMENU);
-      CASE (WM_INITMENUPOPUP);
-      CASE (WM_MENUSELECT);
-      CASE (WM_MENUCHAR);
-      CASE (WM_ENTERIDLE);
-      CASE (WM_MENURBUTTONUP);
-      CASE (WM_MENUDRAG);
-      CASE (WM_MENUGETOBJECT);
-      CASE (WM_UNINITMENUPOPUP);
-      CASE (WM_MENUCOMMAND);
-      CASE (WM_CHANGEUISTATE);
-      CASE (WM_UPDATEUISTATE);
-      CASE (WM_QUERYUISTATE);
-      CASE (WM_CTLCOLORMSGBOX);
-      CASE (WM_CTLCOLOREDIT);
-      CASE (WM_CTLCOLORLISTBOX);
-      CASE (WM_CTLCOLORBTN);
-      CASE (WM_CTLCOLORDLG);
-      CASE (WM_CTLCOLORSCROLLBAR);
-      CASE (WM_CTLCOLORSTATIC);
-      CASE (WM_MOUSEMOVE);
-      CASE (WM_LBUTTONDOWN);
-      CASE (WM_LBUTTONUP);
-      CASE (WM_LBUTTONDBLCLK);
-      CASE (WM_RBUTTONDOWN);
-      CASE (WM_RBUTTONUP);
-      CASE (WM_RBUTTONDBLCLK);
-      CASE (WM_MBUTTONDOWN);
-      CASE (WM_MBUTTONUP);
-      CASE (WM_MBUTTONDBLCLK);
-      CASE (WM_MOUSEWHEEL);
-      CASE (WM_XBUTTONDOWN);
-      CASE (WM_XBUTTONUP);
-      CASE (WM_XBUTTONDBLCLK);
-      CASE (WM_PARENTNOTIFY);
-      CASE (WM_ENTERMENULOOP);
-      CASE (WM_EXITMENULOOP);
-      CASE (WM_NEXTMENU);
-      CASE (WM_SIZING);
-      CASE (WM_CAPTURECHANGED);
-      CASE (WM_MOVING);
-      CASE (WM_POWERBROADCAST);
-      CASE (WM_DEVICECHANGE);
-      CASE (WM_MDICREATE);
-      CASE (WM_MDIDESTROY);
-      CASE (WM_MDIACTIVATE);
-      CASE (WM_MDIRESTORE);
-      CASE (WM_MDINEXT);
-      CASE (WM_MDIMAXIMIZE);
-      CASE (WM_MDITILE);
-      CASE (WM_MDICASCADE);
-      CASE (WM_MDIICONARRANGE);
-      CASE (WM_MDIGETACTIVE);
-      CASE (WM_MDISETMENU);
-      CASE (WM_ENTERSIZEMOVE);
-      CASE (WM_EXITSIZEMOVE);
-      CASE (WM_DROPFILES);
-      CASE (WM_MDIREFRESHMENU);
-      CASE (WM_IME_SETCONTEXT);
-      CASE (WM_IME_NOTIFY);
-      CASE (WM_IME_CONTROL);
-      CASE (WM_IME_COMPOSITIONFULL);
-      CASE (WM_IME_SELECT);
-      CASE (WM_IME_CHAR);
-      CASE (WM_IME_REQUEST);
-      CASE (WM_IME_KEYDOWN);
-      CASE (WM_IME_KEYUP);
-      CASE (WM_MOUSEHOVER);
-      CASE (WM_MOUSELEAVE);
-      CASE (WM_NCMOUSEHOVER);
-      CASE (WM_NCMOUSELEAVE);
-      CASE (WM_CUT);
-      CASE (WM_COPY);
-      CASE (WM_PASTE);
-      CASE (WM_CLEAR);
-      CASE (WM_UNDO);
-      CASE (WM_RENDERFORMAT);
-      CASE (WM_RENDERALLFORMATS);
-      CASE (WM_DESTROYCLIPBOARD);
-      CASE (WM_DRAWCLIPBOARD);
-      CASE (WM_PAINTCLIPBOARD);
-      CASE (WM_VSCROLLCLIPBOARD);
-      CASE (WM_SIZECLIPBOARD);
-      CASE (WM_ASKCBFORMATNAME);
-      CASE (WM_CHANGECBCHAIN);
-      CASE (WM_HSCROLLCLIPBOARD);
-      CASE (WM_QUERYNEWPALETTE);
-      CASE (WM_PALETTEISCHANGING);
-      CASE (WM_PALETTECHANGED);
-      CASE (WM_HOTKEY);
-      CASE (WM_PRINT);
-      CASE (WM_PRINTCLIENT);
-      CASE (WM_APPCOMMAND);
-      CASE (WM_HANDHELDFIRST);
-      CASE (WM_HANDHELDLAST);
-      CASE (WM_AFXFIRST);
-      CASE (WM_AFXLAST);
-      CASE (WM_PENWINFIRST);
-      CASE (WM_PENWINLAST);
-      CASE (WM_APP);
-#undef CASE
-    default:
-      if (msg >= WM_HANDHELDFIRST && msg <= WM_HANDHELDLAST)
-       sprintf (bfr, "WM_HANDHELDFIRST+%d", msg - WM_HANDHELDFIRST);
-      else if (msg >= WM_AFXFIRST && msg <= WM_AFXLAST)
-       sprintf (bfr, "WM_AFXFIRST+%d", msg - WM_AFXFIRST);
-      else if (msg >= WM_PENWINFIRST && msg <= WM_PENWINLAST)
-       sprintf (bfr, "WM_PENWINFIRST+%d", msg - WM_PENWINFIRST);
-      else if (msg >= WM_USER && msg <= 0x7FFF)
-       sprintf (bfr, "WM_USER+%d", msg - WM_USER);
-      else if (msg >= 0xC000 && msg <= 0xFFFF)
-       sprintf (bfr, "reg-%#x", msg);
-      else
-       sprintf (bfr, "unk-%#x", msg);
-      return bfr;
-    }
-  g_assert_not_reached ();
+  g_return_if_fail (display == _gdk_display);
+
+  /* Process all messages currently available */
+  while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
+    DispatchMessage (&msg);
+}
+
+void
+gdk_display_flush (GdkDisplay * display)
+{
+  g_return_if_fail (display == _gdk_display);
+
+  /* Nothing */
+}
+
+gboolean
+gdk_net_wm_supports (GdkAtom property)
+{
+  return FALSE;
 }
-      
-#endif /* G_ENABLE_DEBUG */