]> Pileus Git - ~andy/gtk/blobdiff - gdk/win32/gdkevents-win32.c
Bypass calls to the grab/ungrab functions in gdkinput-win32.c, as they
[~andy/gtk] / gdk / win32 / gdkevents-win32.c
index e01740f132069ce7c6eea0fc808f018d86c22e8f..1189f95247e17233f90807b090e0f7956f511603 100644 (file)
@@ -1,47 +1,70 @@
 /* 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 Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
 
 /*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include "config.h"
+/* Cannot use TrackMouseEvent, as the stupid WM_MOUSELEAVE message
+ * doesn't tell us where the mouse has gone. Thus we cannot use it to
+ * generate a correct GdkNotifyType. Pity, as using TrackMouseEvent
+ * 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.
+ */
+/* define USE_TRACKMOUSEEVENT */
+
+/* Do use SetCapture, it works now. Thanks to jpe@archaeopteryx.com */
+#define USE_SETCAPTURE 1
 
 #include <stdio.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkkeysyms.h>
-#include "gdkx.h"
-#include "gdkinput.h"
 
-#define PING() printf("%s: %d\n",__FILE__,__LINE__),fflush(stdout)
+#include "gdk.h"
+#include "gdkprivate-win32.h"
+#include "gdkinput-win32.h"
+#include "gdkkeysyms.h"
 
-typedef struct _GdkIOClosure GdkIOClosure;
-typedef struct _GdkEventPrivate GdkEventPrivate;
+#include <objbase.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 <imm.h>
+
+#if defined (__GNUC__) && defined (HAVE_DIMM_H)
+# undef IMEMENUITEMINFOA
+# undef IMEMENUITEMINFOW
+#endif
 
-#define DOUBLE_CLICK_TIME      250
-#define TRIPLE_CLICK_TIME      500
-#define DOUBLE_CLICK_DIST      5
-#define TRIPLE_CLICK_DIST      5
+#ifdef HAVE_DIMM_H
+#include <dimm.h>
+#endif
+
+
+typedef struct _GdkEventPrivate GdkEventPrivate;
 
 typedef enum
 {
@@ -51,14 +74,6 @@ typedef enum
   GDK_EVENT_PENDING = 1 << 0
 } GdkEventFlags;
 
-struct _GdkIOClosure
-{
-  GdkInputFunction function;
-  GdkInputCondition condition;
-  GdkDestroyNotify notify;
-  gpointer data;
-};
-
 struct _GdkEventPrivate
 {
   GdkEvent event;
@@ -69,139 +84,172 @@ struct _GdkEventPrivate
  * Private function declarations
  */
 
-static GdkEvent *gdk_event_new         (void);
-static gint     gdk_event_apply_filters(MSG      *xevent,
+static GdkFilterReturn
+                gdk_event_apply_filters(MSG      *msg,
                                         GdkEvent *event,
                                         GList    *filters);
-static gint     gdk_event_translate    (GdkEvent *event, 
-                                        MSG      *xevent,
+static gboolean  gdk_event_translate   (GdkEvent *event, 
+                                        MSG      *msg,
                                         gboolean *ret_val_flagp,
-                                        gint     *ret_valp);
-static void      gdk_events_queue       (void);
-static GdkEvent *gdk_event_unqueue      (void);
-static gboolean  gdk_event_prepare      (gpointer  source_data, 
-                                        GTimeVal *current_time,
-                                        gint     *timeout);
-static gboolean  gdk_event_check        (gpointer  source_data,
-                                        GTimeVal *current_time);
-static gboolean  gdk_event_dispatch     (gpointer  source_data,
-                                        GTimeVal *current_time,
-                                        gpointer  user_data);
-
-static void     gdk_synthesize_click   (GdkEvent     *event, 
-                                        gint          nclicks);
+                                        gint     *ret_valp,
+                                        gboolean  return_exposes);
+
+static gboolean gdk_event_prepare  (GSource     *source,
+                                   gint        *timeout);
+static gboolean gdk_event_check    (GSource     *source);
+static gboolean gdk_event_dispatch (GSource     *source,
+                                   GSourceFunc  callback,
+                                   gpointer     user_data);
 
 /* Private variable declarations
  */
 
-static guint32 button_click_time[2];       /* The last 2 button click times. Used
-                                            *  to determine if the latest button click
-                                            *  is part of a double or triple click.
-                                            */
-static GdkWindow *button_window[2];        /* The last 2 windows to receive button presses.
-                                            *  Also used to determine if the latest button
-                                            *  click is part of a double or triple click.
-                                            */
-static guint button_number[2];             /* The last 2 buttons to be pressed.
-                                            */
-static GdkWindowPrivate *p_grab_window = NULL; /* Window that currently
-                                               * holds the pointer grab
-                                               */
-
-static GdkWindowPrivate *k_grab_window = NULL; /* Window the holds the
-                                               * keyboard grab
-                                               */
+static GdkWindow *p_grab_window = NULL; /* Window that currently
+                                        * holds the pointer grab
+                                        */
+
+static GdkWindow *k_grab_window = NULL; /* Window the holds the
+                                        * keyboard grab
+                                        */
 
 static GList *client_filters;  /* Filters for client messages */
 
 static gboolean p_grab_automatic;
-static GdkEventMask p_grab_event_mask;
+static GdkEventMask p_grab_mask;
 static gboolean p_grab_owner_events, k_grab_owner_events;
 static HCURSOR p_grab_cursor;
 
-static GdkEventFunc   event_func = NULL;    /* Callback for events */
-static gpointer       event_data = NULL;
-static GDestroyNotify event_notify = NULL;
-
-static GList *client_filters;              /* Filters for client messages */
-
-/* FIFO's for event queue, and for events put back using
- * gdk_event_put().
- */
-static GList *queued_events = NULL;
-static GList *queued_tail = NULL;
-
 static GSourceFuncs event_funcs = {
   gdk_event_prepare,
   gdk_event_check,
   gdk_event_dispatch,
-  (GDestroyNotify)g_free
+  NULL
 };
 
 GPollFD event_poll_fd;
 
-static GdkWindow *curWnd = NULL;
-static HWND active = NULL;
-static gint curX, curY;
-static gdouble curXroot, curYroot;
+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 gboolean ignore_WM_CHAR = FALSE;
-static gboolean is_AltGr_key = FALSE;
-
-LRESULT CALLBACK 
-gdk_WindowProc(HWND hwnd,
-              UINT message,
-              WPARAM wParam,
-              LPARAM lParam)
+static UINT msh_mousewheel_msg;
+static gboolean ignore_wm_char = FALSE;
+static gboolean is_altgr_key = FALSE;
+
+#ifdef HAVE_DIMM_H
+static IActiveIMMApp *active_imm_app = NULL;
+static IActiveIMMMessagePumpOwner *active_imm_msgpump_owner = NULL;
+#endif
+
+typedef BOOL (WINAPI *PFN_TrackMouseEvent) (LPTRACKMOUSEEVENT);
+static PFN_TrackMouseEvent track_mouse_event = NULL;
+
+static gboolean use_ime_composition = FALSE;
+
+static LRESULT 
+real_window_procedure (HWND   hwnd,
+                      UINT   message,
+                      WPARAM wparam,
+                      LPARAM lparam)
 {
-  GdkEvent event;
+  GdkEventPrivate event;
   GdkEvent *eventp;
   MSG msg;
   DWORD pos;
+#ifdef HAVE_DIMM_H
+  LRESULT lres;
+#endif
   gint ret_val;
   gboolean ret_val_flag;
 
-  GDK_NOTE (EVENTS, g_print ("gdk_WindowProc: %#x\n", message));
-
   msg.hwnd = hwnd;
   msg.message = message;
-  msg.wParam = wParam;
-  msg.lParam = lParam;
+  msg.wParam = wparam;
+  msg.lParam = lparam;
   msg.time = GetTickCount ();
   pos = GetMessagePos ();
   msg.pt.x = LOWORD (pos);
   msg.pt.y = HIWORD (pos);
 
-  if (gdk_event_translate (&event, &msg, &ret_val_flag, &ret_val))
+  event.flags = GDK_EVENT_PENDING;
+  if (gdk_event_translate (&event.event, &msg, &ret_val_flag, &ret_val, FALSE))
     {
+      event.flags &= ~GDK_EVENT_PENDING;
 #if 1
-      /* Compress configure events */
-      if (event.any.type == GDK_CONFIGURE)
+      if (event.event.any.type == GDK_CONFIGURE)
        {
-         GList *list = queued_events;
+         /* Compress configure events */
+         GList *list = _gdk_queued_events;
 
          while (list != NULL
                 && (((GdkEvent *)list->data)->any.type != GDK_CONFIGURE
-                    || ((GdkEvent *)list->data)->any.window != event.any.window))
+                    || ((GdkEvent *)list->data)->any.window != event.event.any.window))
            list = list->next;
          if (list != NULL)
            {
-             *((GdkEvent *)list->data) = event;
-             gdk_window_unref (event.any.window);
+             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;
            }
        }
-#endif
-      eventp = gdk_event_new ();
-      *eventp = event;
+      else if (event.event.any.type == GDK_EXPOSE)
+       {
+         /* Compress expose events */
+         GList *list = _gdk_queued_events;
 
-      gdk_event_queue_append (eventp);
+         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_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);
+         /* Wake up WaitMessage */
+         PostMessage (NULL, gdk_ping_msg, 0, 0);
 #endif
+       }
+      
       if (ret_val_flag)
        return ret_val;
       else
@@ -211,103 +259,111 @@ gdk_WindowProc(HWND hwnd,
   if (ret_val_flag)
     return ret_val;
   else
-    return DefWindowProc (hwnd, message, wParam, lParam);
-}
-
-/*********************************************
- * Functions for maintaining the event queue *
- *********************************************/
-
-/*************************************************************
- * gdk_event_queue_find_first:
- *     Find the first event on the queue that is not still
- *     being filled in.
- *   arguments:
- *     
- *   results:
- *     Pointer to the list node for that event, or NULL
- *************************************************************/
-
-static GList*
-gdk_event_queue_find_first (void)
-{
-  GList *tmp_list = queued_events;
-
-  while (tmp_list)
     {
-      GdkEventPrivate *event = tmp_list->data;
-      if (!(event->flags & GDK_EVENT_PENDING))
-       return tmp_list;
-
-      tmp_list = g_list_next (tmp_list);
+#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
     }
-
-  return NULL;
 }
 
-/*************************************************************
- * gdk_event_queue_remove_link:
- *     Remove a specified list node from the event queue.
- *   arguments:
- *     node: Node to remove.
- *   results:
- *************************************************************/
-
-static void
-gdk_event_queue_remove_link (GList *node)
+LRESULT CALLBACK
+_gdk_win32_window_procedure (HWND   hwnd,
+                             UINT   message,
+                             WPARAM wparam,
+                             LPARAM lparam)
 {
-  if (node->prev)
-    node->prev->next = node->next;
-  else
-    queued_events = node->next;
-  
-  if (node->next)
-    node->next->prev = node->prev;
-  else
-    queued_tail = node->prev;
-  
-}
+  LRESULT retval;
 
-/*************************************************************
- * gdk_event_queue_append:
- *     Append an event onto the tail of the event queue.
- *   arguments:
- *     event: Event to append.
- *   results:
- *************************************************************/
+  GDK_NOTE (MISC, g_print ("_gdk_win32_window_procedure: %p %s\n",
+                          hwnd, gdk_win32_message_name (message)));
 
-void
-gdk_event_queue_append (GdkEvent *event)
-{
-  queued_tail = g_list_append (queued_tail, event);
-  
-  if (!queued_events)
-    queued_events = queued_tail;
-  else
-    queued_tail = queued_tail->next;
+  retval = real_window_procedure (hwnd, message, wparam, lparam);
+
+  GDK_NOTE (MISC, g_print ("_gdk_win32_window_procedure: %p returns %ld\n",
+                          hwnd, retval));
+
+  return retval;
 }
 
 void 
-gdk_events_init (void)
+_gdk_events_init (void)
 {
-  if (g_pipe_readable_msg == 0)
-    g_pipe_readable_msg = RegisterWindowMessage ("g-pipe-readable");
+  GSource *source;
+#ifdef HAVE_DIMM_H
+  HRESULT hres;
+#endif
+#ifdef USE_TRACKMOUSEEVENT
+  HMODULE user32, imm32;
+  HINSTANCE commctrl32;
+#endif
 
-  g_source_add (GDK_PRIORITY_EVENTS, TRUE, &event_funcs, NULL, NULL, NULL);
+  gdk_ping_msg = RegisterWindowMessage ("gdk-ping");
+  GDK_NOTE (EVENTS, g_print ("gdk-ping = %#x\n", gdk_ping_msg));
+
+  /* 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));
+
+  source = g_source_new (&event_funcs, sizeof (GSource));
+  g_source_set_priority (source, GDK_PRIORITY_EVENTS);
 
   event_poll_fd.fd = G_WIN32_MSG_HANDLE;
   event_poll_fd.events = G_IO_IN;
   
-  g_main_add_poll (&event_poll_fd, GDK_PRIORITY_EVENTS);
-
-  button_click_time[0] = 0;
-  button_click_time[1] = 0;
-  button_window[0] = NULL;
-  button_window[1] = NULL;
-  button_number[0] = -1;
-  button_number[1] = -1;
+  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,
+                          &IID_IActiveIMMApp,
+                          (LPVOID *) &active_imm_app);
+  
+  if (hres == S_OK)
+    {
+      GDK_NOTE (EVENTS, g_print ("IActiveIMMApp created %p\n",
+                                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);
+      GDK_NOTE (EVENTS, g_print ("IActiveIMMMessagePumpOwner created %p\n",
+                                active_imm_msgpump_owner));
+      (active_imm_msgpump_owner->lpVtbl->Start) (active_imm_msgpump_owner);
+    }
+#endif
 
-  gdk_ping_msg = RegisterWindowMessage ("gdk-ping");
+#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;
+    }
 }
 
 /*
@@ -331,7 +387,8 @@ gdk_events_pending (void)
 {
   MSG msg;
 
-  return (gdk_event_queue_find_first() || PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE));
+  return (_gdk_event_queue_find_first() ||
+         PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE));
 }
 
 /*
@@ -353,23 +410,22 @@ gdk_events_pending (void)
 GdkEvent*
 gdk_event_get_graphics_expose (GdkWindow *window)
 {
-  MSG xevent;
+  MSG msg;
   GdkEvent *event;
-  GdkWindowPrivate *private = (GdkWindowPrivate *) window;
 
   g_return_val_if_fail (window != NULL, NULL);
   
   GDK_NOTE (EVENTS, g_print ("gdk_event_get_graphics_expose\n"));
 
-#if 1
+#if 0 /* ??? */
   /* Some nasty bugs here, just return NULL for now. */
   return NULL;
 #else
-  if (GetMessage (&xevent, private->xwindow, WM_PAINT, WM_PAINT))
+  if (PeekMessage (&msg, GDK_WINDOW_HWND (window), WM_PAINT, WM_PAINT, PM_REMOVE))
     {
-      event = gdk_event_new ();
+      event = _gdk_event_new ();
       
-      if (gdk_event_translate (event, &xevent, NULL, NULL))
+      if (gdk_event_translate (event, &msg, NULL, NULL, TRUE))
        return event;
       else
        gdk_event_free (event);
@@ -379,797 +435,1494 @@ gdk_event_get_graphics_expose (GdkWindow *window)
 #endif
 }
 
-/************************
- * Exposure compression *
- ************************/
+static char *
+event_mask_string (GdkEventMask mask)
+{
+  static char bfr[500];
+  char *p = bfr;
+
+  *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);
+#undef BIT
+
+  return bfr;
+}
 
-/* I don't bother with exposure compression on Win32. Windows compresses
- * WM_PAINT events by itself.
+/*
+ *--------------------------------------------------------------
+ * 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
+ *
+ *--------------------------------------------------------------
  */
 
-/*************************************************************
- * gdk_event_handler_set:
- *     
- *   arguments:
- *     func: Callback function to be called for each event.
- *     data: Data supplied to the function
- *     notify: function called when function is no longer needed
- * 
- *   results:
- *************************************************************/
-
-void 
-gdk_event_handler_set (GdkEventFunc   func,
-                      gpointer       data,
-                      GDestroyNotify notify)
+GdkGrabStatus
+gdk_pointer_grab (GdkWindow    *window,
+                 gboolean      owner_events,
+                 GdkEventMask  event_mask,
+                 GdkWindow    *confine_to,
+                 GdkCursor    *cursor,
+                 guint32       time)
 {
-  if (event_notify)
-    (*event_notify) (event_data);
+  HWND hwnd_confined_to;
+  HCURSOR hcursor;
+  GdkCursorPrivate *cursor_private;
+  gint return_val = GDK_GRAB_SUCCESS;
 
-  event_func = func;
-  event_data = data;
-  event_notify = notify;
+  g_return_val_if_fail (window != NULL, 0);
+  g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
+  g_return_val_if_fail (confine_to == NULL || GDK_IS_WINDOW (confine_to), 0);
+  
+  cursor_private = (GdkCursorPrivate*) cursor;
+  
+  if (!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;
+#if 0
+  return_val = _gdk_input_grab_pointer (window,
+                                       owner_events,
+                                       event_mask,
+                                       confine_to,
+                                       time);
+#endif
+  if (return_val == GDK_GRAB_SUCCESS)
+    {
+      if (!GDK_WINDOW_DESTROYED (window))
+       {
+         GDK_NOTE (EVENTS, g_print ("gdk_pointer_grab: %p %s %p %s\n",
+                                    GDK_WINDOW_HWND (window),
+                                    (owner_events ? "TRUE" : "FALSE"),
+                                    hcursor,
+                                    event_mask_string (event_mask)));
+         p_grab_mask = event_mask;
+         p_grab_owner_events = (owner_events != 0);
+         p_grab_automatic = FALSE;
+         
+#if USE_SETCAPTURE
+         SetCapture (GDK_WINDOW_HWND (window));
+#endif
+         return_val = GDK_GRAB_SUCCESS;
+       }
+      else
+       return_val = GDK_GRAB_ALREADY_GRABBED;
+    }
+  
+  if (return_val == GDK_GRAB_SUCCESS)
+    {
+      p_grab_window = window;
+      p_grab_cursor = hcursor;
+    }
+  
+  return return_val;
 }
 
 /*
  *--------------------------------------------------------------
- * gdk_event_get
+ * gdk_pointer_ungrab
  *
- *   Gets the next event.
+ *   Releases any pointer grab
  *
  * Arguments:
  *
  * Results:
- *   If an event is waiting that we care about, returns 
- *   a pointer to that event, to be freed with gdk_event_free.
- *   Otherwise, returns NULL.
  *
  * Side effects:
  *
  *--------------------------------------------------------------
  */
 
-GdkEvent*
-gdk_event_get (void)
+void
+gdk_pointer_ungrab (guint32 time)
 {
-  gdk_events_queue();
+  GDK_NOTE (EVENTS, g_print ("gdk_pointer_ungrab\n"));
+#if 0
+  _gdk_input_ungrab_pointer (time);
+#endif
+
+#if USE_SETCAPTURE
+  if (GetCapture () != NULL)
+    ReleaseCapture ();
+#endif
 
-  return gdk_event_unqueue();
+  p_grab_window = NULL;
 }
 
 /*
  *--------------------------------------------------------------
- * gdk_event_peek
+ * find_window_for_pointer_event
  *
- *   Gets the next 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:
- *   If an event is waiting that we care about, returns 
- *   a copy of that event, but does not remove it from
- *   the queue. The pointer is to be freed with gdk_event_free.
- *   Otherwise, returns NULL.
  *
  * Side effects:
  *
  *--------------------------------------------------------------
  */
 
-GdkEvent*
-gdk_event_peek (void)
+static GdkWindow* 
+find_window_for_pointer_event (GdkWindow*  reported_window,
+                               MSG*        msg)
 {
-  GList *tmp_list;
+  HWND hwnd;
+  POINTS points;
+  POINT pt;
+  GdkWindow* other_window;
 
-  tmp_list = gdk_event_queue_find_first ();
-  
-  if (tmp_list)
-    return gdk_event_copy (tmp_list->data);
-  else
-    return NULL;
-}
+  if (p_grab_window == NULL || !p_grab_owner_events)
+    return reported_window;
 
-void
-gdk_event_put (GdkEvent *event)
-{
-  GdkEvent *new_event;
-  GList *tmp_list;
-  
-  g_return_if_fail (event != NULL);
-  
-  new_event = gdk_event_copy (event);
+  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 %p for point (%ld, %ld)\n",
+                            hwnd, pt.x, pt.y));
 
-  gdk_event_queue_append (new_event);
+  gdk_window_unref (reported_window);
+  gdk_window_ref (other_window);
+
+  return other_window;
 }
 
 /*
  *--------------------------------------------------------------
- * gdk_event_copy
+ * gdk_pointer_is_grabbed
  *
- *   Copy a event structure into new storage.
+ *   Tell wether there is an active x pointer grab in effect
  *
  * Arguments:
- *   "event" is the event struct to copy.
  *
  * Results:
- *   A new event structure.  Free it with gdk_event_free.
  *
  * Side effects:
- *   The reference count of the window in the event is increased.
  *
  *--------------------------------------------------------------
  */
 
-static GMemChunk *event_chunk = NULL;
-
-static GdkEvent*
-gdk_event_new (void)
+gboolean
+gdk_pointer_is_grabbed (void)
 {
-  GdkEventPrivate *new_event;
-  
-  if (event_chunk == NULL)
-    event_chunk = g_mem_chunk_new ("events",
-                                  sizeof (GdkEventPrivate),
-                                  4096,
-                                  G_ALLOC_AND_FREE);
-  
-  new_event = g_chunk_new (GdkEventPrivate, event_chunk);
-  new_event->flags = 0;
-  
-  return (GdkEvent *) new_event;
+  GDK_NOTE (EVENTS, g_print ("gdk_pointer_is_grabbed: %s\n",
+                            p_grab_window != NULL ? "TRUE" : "FALSE"));
+  return p_grab_window != NULL;
 }
 
-GdkEvent*
-gdk_event_copy (GdkEvent *event)
+/**
+ * gdk_pointer_grab_info_libgtk_only:
+ * @grab_window: location to store current grab window
+ * @owner_events: location to store boolean indicating whether
+ *   the @owner_events flag to gdk_pointer_grab() was %TRUE.
+ * 
+ * Determines information about the current pointer grab.
+ * This is not public API and must not be used by applications.
+ * 
+ * Return value: %TRUE if this application currently has the
+ *  pointer grabbed.
+ **/
+gboolean
+gdk_pointer_grab_info_libgtk_only (GdkWindow **grab_window,
+                                  gboolean   *owner_events)
 {
-  GdkEvent *new_event;
-  
-  g_return_val_if_fail (event != NULL, NULL);
-  
-  new_event = gdk_event_new ();
-  
-  *new_event = *event;
-  gdk_window_ref (new_event->any.window);
-  
-  switch (event->any.type)
+  if (p_grab_window != NULL)
     {
-    case GDK_KEY_PRESS:
-    case GDK_KEY_RELEASE:
-      new_event->key.string = g_strdup (event->key.string);
-      break;
-      
-    case GDK_ENTER_NOTIFY:
-    case GDK_LEAVE_NOTIFY:
-      if (event->crossing.subwindow != NULL)
-       gdk_window_ref (event->crossing.subwindow);
-      break;
-      
-    case GDK_DRAG_ENTER:
-    case GDK_DRAG_LEAVE:
-    case GDK_DRAG_MOTION:
-    case GDK_DRAG_STATUS:
-    case GDK_DROP_START:
-    case GDK_DROP_FINISHED:
-      gdk_drag_context_ref (event->dnd.context);
-      break;
-      
-    default:
-      break;
+      if (grab_window)
+        *grab_window = p_grab_window;
+      if (owner_events)
+        *owner_events = p_grab_owner_events;
+
+      return TRUE;
     }
-  
-  return new_event;
+  else
+    return FALSE;
 }
 
 /*
  *--------------------------------------------------------------
- * gdk_event_free
+ * gdk_keyboard_grab
  *
- *   Free a event structure obtained from gdk_event_copy.  Do not use
- *   with other event structures.
+ *   Grabs the keyboard to a specific window
  *
  * Arguments:
- *   "event" is the event struct to free.
+ *   "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:
- *   The reference count of the window in the event is decreased and
- *   might be freed, too.
+ *   requires a corresponding call to gdk_keyboard_ungrab
  *
- *-------------------------------------------------------------- */
+ *--------------------------------------------------------------
+ */
 
-void
-gdk_event_free (GdkEvent *event)
+GdkGrabStatus
+gdk_keyboard_grab (GdkWindow *window,
+                  gboolean   owner_events,
+                  guint32    time)
 {
-  g_return_if_fail (event != NULL);
-
-  g_assert (event_chunk != NULL); /* paranoid */
+  gint return_val;
   
-  if (event->any.window)
-    gdk_window_unref (event->any.window);
+  g_return_val_if_fail (window != NULL, 0);
+  g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
   
-  switch (event->any.type)
+  GDK_NOTE (EVENTS, g_print ("gdk_keyboard_grab %p\n",
+                            GDK_WINDOW_HWND (window)));
+
+  if (!GDK_WINDOW_DESTROYED (window))
     {
-    case GDK_KEY_PRESS:
-    case GDK_KEY_RELEASE:
-      g_free (event->key.string);
-      break;
-      
-    case GDK_ENTER_NOTIFY:
-    case GDK_LEAVE_NOTIFY:
-      if (event->crossing.subwindow != NULL)
-       gdk_window_unref (event->crossing.subwindow);
-      break;
-      
-    case GDK_DRAG_ENTER:
-    case GDK_DRAG_LEAVE:
-    case GDK_DRAG_MOTION:
-    case GDK_DRAG_STATUS:
-    case GDK_DROP_START:
-    case GDK_DROP_FINISHED:
-      gdk_drag_context_unref (event->dnd.context);
-      break;
-      
-    default:
-      break;
+      k_grab_owner_events = owner_events != 0;
+      return_val = GDK_GRAB_SUCCESS;
     }
-  
-  g_mem_chunk_free (event_chunk, event);
-}
-
-/*
- *--------------------------------------------------------------
- * gdk_event_get_time:
- *    Get the timestamp from an event.
- *   arguments:
- *     event:
- *   results:
- *    The event's time stamp, if it has one, otherwise
- *    GDK_CURRENT_TIME.
- *--------------------------------------------------------------
- */
+  else
+    return_val = GDK_GRAB_ALREADY_GRABBED;
 
-guint32
-gdk_event_get_time (GdkEvent *event)
-{
-  if (event)
-    switch (event->type)
-      {
-      case GDK_MOTION_NOTIFY:
-       return event->motion.time;
-      case GDK_BUTTON_PRESS:
-      case GDK_2BUTTON_PRESS:
-      case GDK_3BUTTON_PRESS:
-      case GDK_BUTTON_RELEASE:
-       return event->button.time;
-      case GDK_KEY_PRESS:
-      case GDK_KEY_RELEASE:
-       return event->key.time;
-      case GDK_ENTER_NOTIFY:
-      case GDK_LEAVE_NOTIFY:
-       return event->crossing.time;
-      case GDK_PROPERTY_NOTIFY:
-       return event->property.time;
-      case GDK_SELECTION_CLEAR:
-      case GDK_SELECTION_REQUEST:
-      case GDK_SELECTION_NOTIFY:
-       return event->selection.time;
-      case GDK_PROXIMITY_IN:
-      case GDK_PROXIMITY_OUT:
-       return event->proximity.time;
-      case GDK_DRAG_ENTER:
-      case GDK_DRAG_LEAVE:
-      case GDK_DRAG_MOTION:
-      case GDK_DRAG_STATUS:
-      case GDK_DROP_START:
-      case GDK_DROP_FINISHED:
-       return event->dnd.time;
-      default:                 /* use current time */
-       break;
-      }
+  if (return_val == GDK_GRAB_SUCCESS)
+    k_grab_window = window;
   
-  return GDK_CURRENT_TIME;
+  return return_val;
 }
 
 /*
  *--------------------------------------------------------------
- * gdk_set_show_events
+ * gdk_keyboard_ungrab
  *
- *   Turns on/off the showing of events.
+ *   Releases any keyboard grab
  *
  * Arguments:
- *   "show_events" is a boolean describing whether or
- *   not to show the events gdk receives.
  *
  * Results:
  *
  * Side effects:
- *   When "show_events" is TRUE, calls to "gdk_event_get"
- *   will output debugging informatin regarding the event
- *   received to stdout.
  *
  *--------------------------------------------------------------
  */
 
 void
-gdk_set_show_events (gint show_events)
+gdk_keyboard_ungrab (guint32 time)
 {
-  if (show_events)
-    gdk_debug_flags |= GDK_DEBUG_EVENTS;
-  else
-    gdk_debug_flags &= ~GDK_DEBUG_EVENTS;
-}
+  GDK_NOTE (EVENTS, g_print ("gdk_keyboard_ungrab\n"));
 
-gint
-gdk_get_show_events (void)
-{
-  return gdk_debug_flags & GDK_DEBUG_EVENTS;
+  k_grab_window = NULL;
 }
 
-/*
- *--------------------------------------------------------------
- * 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
- *
- *--------------------------------------------------------------
- */
-
-gint
-gdk_pointer_grab (GdkWindow *    window,
-                 gint            owner_events,
-                 GdkEventMask    event_mask,
-                 GdkWindow *     confine_to,
-                 GdkCursor *     cursor,
-                 guint32         time)
+/**
+ * gdk_keyboard_grab_info_libgtk_only:
+ * @grab_window: location to store current grab window
+ * @owner_events: location to store boolean indicating whether
+ *   the @owner_events flag to gdk_keyboard_grab() was %TRUE.
+ * 
+ * Determines information about the current keyboard grab.
+ * This is not public API and must not be used by applications.
+ * 
+ * Return value: %TRUE if this application currently has the
+ *  keyboard grabbed.
+ **/
+gboolean
+gdk_keyboard_grab_info_libgtk_only (GdkWindow **grab_window,
+                                   gboolean   *owner_events)
 {
-  GdkWindowPrivate *window_private;
-  HWND xwindow;
-  HWND xconfine_to;
-  HCURSOR xcursor;
-  GdkWindowPrivate *confine_to_private;
-  GdkCursorPrivate *cursor_private;
-  gint return_val;
+  if (k_grab_window)
+    {
+      if (grab_window)
+        *grab_window = k_grab_window;
+      if (owner_events)
+        *owner_events = k_grab_owner_events;
 
-  g_return_val_if_fail (window != NULL, 0);
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+static GdkFilterReturn
+gdk_event_apply_filters (MSG      *msg,
+                        GdkEvent *event,
+                        GList    *filters)
+{
+  GdkEventFilter *filter;
+  GList *tmp_list;
+  GdkFilterReturn result;
   
-  window_private = (GdkWindowPrivate*) window;
-  confine_to_private = (GdkWindowPrivate*) confine_to;
-  cursor_private = (GdkCursorPrivate*) cursor;
+  tmp_list = filters;
   
-  xwindow = window_private->xwindow;
+  while (tmp_list)
+    {
+      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 (!confine_to || confine_to_private->destroyed)
-    xconfine_to = NULL;
-  else
-    xconfine_to = confine_to_private->xwindow;
+  return GDK_FILTER_CONTINUE;
+}
+
+void 
+gdk_add_client_message_filter (GdkAtom       message_type,
+                              GdkFilterFunc func,
+                              gpointer      data)
+{
+  GdkClientFilter *filter = g_new (GdkClientFilter, 1);
+
+  filter->type = message_type;
+  filter->function = func;
+  filter->data = data;
   
-  if (!cursor)
-    xcursor = NULL;
+  client_filters = g_list_prepend (client_filters, filter);
+}
+
+static void
+build_key_event_state (GdkEvent *event)
+{
+  if (GetKeyState (VK_SHIFT) < 0)
+    event->key.state |= GDK_SHIFT_MASK;
+  if (GetKeyState (VK_CAPITAL) & 0x1)
+    event->key.state |= GDK_LOCK_MASK;
+  if (!is_altgr_key)
+    {
+      if (GetKeyState (VK_CONTROL) < 0)
+       event->key.state |= GDK_CONTROL_MASK;
+      if (GetKeyState (VK_MENU) < 0)
+       event->key.state |= GDK_MOD1_MASK;
+    }
   else
-    xcursor = cursor_private->xcursor;
+    {
+      event->key.state |= GDK_MOD2_MASK;
+      event->key.group = 1;
+    }
+}
+
+static gint
+build_pointer_event_state (MSG *msg)
+{
+  gint state;
   
-  if (gdk_input_vtable.grab_pointer)
-    return_val = gdk_input_vtable.grab_pointer (window,
-                                               owner_events,
-                                               event_mask,
-                                               confine_to,
-                                               time);
-  else
-    return_val = Success;
+  state = 0;
+  if (msg->wParam & MK_CONTROL)
+    state |= GDK_CONTROL_MASK;
+  if (msg->wParam & MK_LBUTTON)
+    state |= GDK_BUTTON1_MASK;
+  if (msg->wParam & MK_MBUTTON)
+    state |= GDK_BUTTON2_MASK;
+  if (msg->wParam & MK_RBUTTON)
+    state |= GDK_BUTTON3_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;
+
+  return state;
+}
+
+static guint
+vk_from_char (guint c)
+{
+  switch (c)
+    {
+    case '\b':
+      return 'H';
+    case '\t':
+      return 'I';
+    default:
+      return (VkKeyScanEx (c, _gdk_input_locale) & 0xFF);
+    }
+}
+
+static void
+build_keypress_event (GdkEvent *event,
+                     MSG      *msg)
+{
+  HIMC himc;
+  gint i, bytecount, ucount;
+  guchar buf[100];
+  wchar_t wbuf[100];
+
+  event->key.type = GDK_KEY_PRESS;
+  event->key.time = msg->time;
+  event->key.state = 0;
+  event->key.group = 0;                /* ??? */
+  event->key.keyval = GDK_VoidSymbol;
   
-  if (return_val == Success)
+  if (msg->message == WM_IME_COMPOSITION)
     {
-      if (!window_private->destroyed)
-      {
-       GDK_NOTE (EVENTS, g_print ("gdk_pointer_grab: %#x %s %#x\n",
-                                  xwindow,
-                                  (owner_events ? "TRUE" : "FALSE"),
-                                  xcursor));
-       p_grab_event_mask = event_mask;
-       p_grab_owner_events = owner_events != 0;
-       p_grab_automatic = FALSE;
-
-#if 0 /* Menus don't work if we use mouse capture. Pity, because many other
-       * things work better with mouse capture.
+      himc = ImmGetContext (msg->hwnd);
+      bytecount = ImmGetCompositionStringW (himc, GCS_RESULTSTR,
+                                           wbuf, sizeof (wbuf));
+      ImmReleaseContext (msg->hwnd, himc);
+
+      ucount = bytecount / 2;
+      event->key.hardware_keycode = wbuf[0]; /* ??? */
+    }
+  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;
+         event->key.hardware_keycode = vk_from_char (msg->wParam);
+         if (msg->wParam < ' ')
+           {
+             /* For ASCII control chars, the keyval should be the
+              * corresponding ASCII character.
+              */
+             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 /* WM_IME_CHAR */
+       {
+         event->key.hardware_keycode = 0; /* ??? */
+         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 thread's current code page
+       * to Unicode. (Followed by conversion to UTF-8 below.)
        */
-       SetCapture (xwindow);
-#endif
-       return_val = GrabSuccess;
-      }
+      ucount = MultiByteToWideChar (_gdk_input_codepage,
+                                   0, buf, bytecount,
+                                   wbuf, G_N_ELEMENTS (wbuf));
+    }
+
+  build_key_event_state (event);
+
+  /* Build UTF-8 string */
+  if (ucount > 0)
+    {
+      if (ucount == 1 && wbuf[0] < 0200)
+       {
+         event->key.string = g_malloc (2);
+         event->key.string[0] = wbuf[0];
+         event->key.string[1] = '\0';
+         event->key.length = 1;
+       }
       else
-       return_val = AlreadyGrabbed;
+       {
+         event->key.string = _gdk_ucs2_to_utf8 (wbuf, ucount);
+         event->key.length = strlen (event->key.string);
+       }
+      if (event->key.keyval == GDK_VoidSymbol)
+       event->key.keyval = gdk_unicode_to_keyval (wbuf[0]);
     }
-  
-  if (return_val == GrabSuccess)
+}
+
+static void
+build_keyrelease_event (GdkEvent *event,
+                       MSG      *msg)
+{
+  guchar buf;
+  wchar_t wbuf;
+
+  event->key.type = GDK_KEY_RELEASE;
+  event->key.time = msg->time;
+  event->key.state = 0;
+  event->key.group = 0;                /* ??? */
+
+  if (msg->message == WM_CHAR || msg->message == WM_SYSCHAR)
     {
-      p_grab_window = window_private;
-      p_grab_cursor = xcursor;
+      if (msg->wParam < ' ')
+       {
+         event->key.keyval = msg->wParam + '@';
+         event->key.state |= GDK_CONTROL_MASK;
+       }
+      else
+       {
+         buf = msg->wParam;
+         MultiByteToWideChar (_gdk_input_codepage,
+                              0, &buf, 1, &wbuf, 1);
+         
+         event->key.keyval = gdk_unicode_to_keyval (wbuf);
+       }
+      event->key.hardware_keycode = vk_from_char (msg->wParam);
     }
-  
-  return return_val;
+  else
+    {
+      event->key.keyval = GDK_VoidSymbol;
+      event->key.hardware_keycode = 0; /* ??? */
+    }
+  build_key_event_state (event);
+  event->key.string = NULL;
+  event->key.length = 0;
 }
 
-/*
- *--------------------------------------------------------------
- * gdk_pointer_ungrab
- *
- *   Releases any pointer grab
- *
- * Arguments:
- *
- * Results:
- *
- * Side effects:
- *
- *--------------------------------------------------------------
- */
+static void
+print_event_state (gint 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);
+  CASE (BUTTON4);
+  CASE (BUTTON5);
+#undef CASE
+}
 
-void
-gdk_pointer_ungrab (guint32 time)
+static void
+print_window_state (GdkWindowState state)
 {
-  if (gdk_input_vtable.ungrab_pointer)
-    gdk_input_vtable.ungrab_pointer (time);
-#if 0
-  if (GetCapture () != NULL)
-    ReleaseCapture ();
-#endif
-  GDK_NOTE (EVENTS, g_print ("gdk_pointer_ungrab\n"));
+#define CASE(bit) if (state & GDK_WINDOW_STATE_ ## bit ) g_print (#bit " ");
+  CASE (WITHDRAWN);
+  CASE (ICONIFIED);
+  CASE (MAXIMIZED);
+  CASE (STICKY);
+#undef CASE
+}
 
-  p_grab_window = NULL;
+static void
+print_event (GdkEvent *event)
+{
+  gchar *escaped, *kvname;
+
+  switch (event->any.type)
+    {
+#define CASE(x) case x: g_print ( #x " "); break;
+    CASE (GDK_NOTHING);
+    CASE (GDK_DELETE);
+    CASE (GDK_DESTROY);
+    CASE (GDK_EXPOSE);
+    CASE (GDK_MOTION_NOTIFY);
+    CASE (GDK_BUTTON_PRESS);
+    CASE (GDK_2BUTTON_PRESS);
+    CASE (GDK_3BUTTON_PRESS);
+    CASE (GDK_BUTTON_RELEASE);
+    CASE (GDK_KEY_PRESS);
+    CASE (GDK_KEY_RELEASE);
+    CASE (GDK_ENTER_NOTIFY);
+    CASE (GDK_LEAVE_NOTIFY);
+    CASE (GDK_FOCUS_CHANGE);
+    CASE (GDK_CONFIGURE);
+    CASE (GDK_MAP);
+    CASE (GDK_UNMAP);
+    CASE (GDK_PROPERTY_NOTIFY);
+    CASE (GDK_SELECTION_CLEAR);
+    CASE (GDK_SELECTION_REQUEST);
+    CASE (GDK_SELECTION_NOTIFY);
+    CASE (GDK_PROXIMITY_IN);
+    CASE (GDK_PROXIMITY_OUT);
+    CASE (GDK_DRAG_ENTER);
+    CASE (GDK_DRAG_LEAVE);
+    CASE (GDK_DRAG_MOTION);
+    CASE (GDK_DRAG_STATUS);
+    CASE (GDK_DROP_START);
+    CASE (GDK_DROP_FINISHED);
+    CASE (GDK_CLIENT_EVENT);
+    CASE (GDK_VISIBILITY_NOTIFY);
+    CASE (GDK_NO_EXPOSE);
+    CASE (GDK_SCROLL);
+    CASE (GDK_WINDOW_STATE);
+    CASE (GDK_SETTING);
+#undef CASE
+    }
+  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,
+              event->expose.count);
+      break;
+    case GDK_MOTION_NOTIFY:
+      g_print ("(%.4g,%.4g) %s",
+              event->motion.x, event->motion.y,
+              event->motion.is_hint ? "HINT " : "");
+      print_event_state (event->motion.state);
+      break;
+    case GDK_BUTTON_PRESS:
+    case GDK_2BUTTON_PRESS:
+    case GDK_3BUTTON_PRESS:
+    case GDK_BUTTON_RELEASE:
+      g_print ("%d (%.4g,%.4g) ",
+              event->button.button,
+              event->button.x, event->button.y);
+      print_event_state (event->button.state);
+      break;
+    case GDK_KEY_PRESS: 
+    case GDK_KEY_RELEASE:
+      if (event->key.length == 0)
+       escaped = g_strdup ("");
+      else
+       escaped = g_strescape (event->key.string, NULL);
+      kvname = gdk_keyval_name (event->key.keyval);
+      g_print ("%#.02x %d %s %d:\"%s\" ",
+              event->key.hardware_keycode, event->key.group,
+              (kvname ? kvname : "??"),
+              event->key.length,
+              escaped);
+      g_free (escaped);
+      print_event_state (event->key.state);
+      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" :
+                 "???"))));
+      break;
+    case GDK_SCROLL:
+      g_print ("%s ",
+              (event->scroll.direction == GDK_SCROLL_UP ? "UP" :
+               (event->scroll.direction == GDK_SCROLL_DOWN ? "DOWN" :
+                (event->scroll.direction == GDK_SCROLL_LEFT ? "LEFT" :
+                 (event->scroll.direction == GDK_SCROLL_RIGHT ? "RIGHT" :
+                  "???")))));
+      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);
+    default:
+      /* Nothing */
+      break;
+    }  
+  g_print ("\n");
 }
 
-/*
- *--------------------------------------------------------------
- * gdk_pointer_is_grabbed
- *
- *   Tell wether there is an active x pointer grab in effect
- *
- * Arguments:
- *
- * Results:
- *
- * Side effects:
- *
- *--------------------------------------------------------------
- */
+static gboolean
+gdk_window_is_child (GdkWindow *parent,
+                    GdkWindow *window)
+{
+  if (parent == NULL || window == NULL)
+    return FALSE;
 
-gint
-gdk_pointer_is_grabbed (void)
+  return (gdk_window_get_parent (window) == parent ||
+         gdk_window_is_child (parent, gdk_window_get_parent (window)));
+}
+
+static void
+synthesize_enter_or_leave_event (GdkWindow    *window,
+                                MSG          *msg,
+                                GdkEventType  type,
+                                GdkNotifyType detail,
+                                gint          x,
+                                gint          y)
 {
-  return p_grab_window != NULL;
+  GdkEvent *event;
+  
+  event = _gdk_event_new ();
+  event->crossing.type = 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.detail = detail;
+  event->crossing.focus = TRUE; /* ??? */
+  event->crossing.state = 0; /* ??? */
+  
+  _gdk_event_queue_append (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));
 }
 
-/*
- *--------------------------------------------------------------
- * 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
- *
- *--------------------------------------------------------------
- */
+static void
+synthesize_leave_event (GdkWindow    *window,
+                       MSG          *msg,
+                       GdkNotifyType detail)
+{
+  POINT pt;
+
+  if (!(GDK_WINDOW_OBJECT (window)->event_mask & GDK_LEAVE_NOTIFY_MASK))
+    return;
+
+  /* Leave events are at (current_x,current_y) in current_window */
+
+  if (current_window != window)
+    {
+      pt.x = current_x;
+      pt.y = current_y;
+      ClientToScreen (GDK_WINDOW_HWND (current_window), &pt);
+      ScreenToClient (GDK_WINDOW_HWND (window), &pt);
+      synthesize_enter_or_leave_event (window, msg, GDK_LEAVE_NOTIFY, detail, pt.x, pt.y);
+    }
+  else
+    synthesize_enter_or_leave_event (window, msg, GDK_LEAVE_NOTIFY, detail, current_x, current_y);
 
-gint
-gdk_keyboard_grab (GdkWindow *    window,
-                  gint            owner_events,
-                  guint32         time)
+}
+  
+static void
+synthesize_enter_event (GdkWindow    *window,
+                       MSG          *msg,
+                       GdkNotifyType detail)
 {
-  GdkWindowPrivate *window_private;
-  gint return_val;
+  POINT pt;
+
+  if (!(GDK_WINDOW_OBJECT (window)->event_mask & GDK_ENTER_NOTIFY_MASK))
+    return;
+
+  /* Enter events are at LOWORD (msg->lParam), HIWORD
+   * (msg->lParam) in msg->hwnd */
+
+  pt.x = LOWORD (msg->lParam);
+  pt.y = HIWORD (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);
+}
   
-  g_return_val_if_fail (window != NULL, 0);
+static void
+synthesize_enter_events (GdkWindow    *from,
+                        GdkWindow    *to,
+                        MSG          *msg,
+                        GdkNotifyType detail)
+{
+  GdkWindow *prev = gdk_window_get_parent (to);
   
-  window_private = (GdkWindowPrivate*) window;
+  if (prev != from)
+    synthesize_enter_events (from, prev, msg, detail);
+  synthesize_enter_event (to, msg, detail);
+}
+                        
+static void
+synthesize_leave_events (GdkWindow    *from,
+                        GdkWindow    *to,
+                        MSG          *msg,
+                        GdkNotifyType detail)
+{
+  GdkWindow *next = gdk_window_get_parent (from);
   
-  GDK_NOTE (EVENTS, g_print ("gdk_keyboard_grab %#x\n",
-                            window_private->xwindow));
+  synthesize_leave_event (from, msg, detail);
+  if (next != to)
+    synthesize_leave_events (next, to, msg, detail);
+}
+                        
+static void
+synthesize_crossing_events (GdkWindow *window,
+                           MSG       *msg)
+{
+  GdkWindow *intermediate, *tem, *common_ancestor;
 
-  if (!window_private->destroyed)
+  if (gdk_window_is_child (current_window, window))
     {
-      k_grab_owner_events = owner_events != 0;
-      return_val = GrabSuccess;
+      /* Pointer has moved to an inferior window. */
+      synthesize_leave_event (current_window, msg, GDK_NOTIFY_INFERIOR);
+      
+      /* If there are intermediate windows, generate ENTER_NOTIFY
+       * events for them
+       */
+      intermediate = gdk_window_get_parent (window);
+      if (intermediate != current_window)
+       {
+         synthesize_enter_events (current_window, intermediate, msg, GDK_NOTIFY_VIRTUAL);
+       }
+      
+      synthesize_enter_event (window, msg, GDK_NOTIFY_ANCESTOR);
+    }
+  else if (gdk_window_is_child (window, current_window))
+    {
+      /* Pointer has moved to an ancestor window. */
+      synthesize_leave_event (current_window, msg, GDK_NOTIFY_ANCESTOR);
+      
+      /* If there are intermediate windows, generate LEAVE_NOTIFY
+       * events for them
+       */
+      intermediate = gdk_window_get_parent (current_window);
+      if (intermediate != window)
+       {
+         synthesize_leave_events (intermediate, window, msg, GDK_NOTIFY_VIRTUAL);
+       }
+    }
+  else if (current_window)
+    {
+      /* Find least common ancestor of current_window and window */
+      tem = current_window;
+      do {
+       common_ancestor = gdk_window_get_parent (tem);
+       tem = common_ancestor;
+      } while (common_ancestor &&
+              !gdk_window_is_child (common_ancestor, window));
+      if (common_ancestor)
+       {
+         synthesize_leave_event (current_window, msg, 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);
+           }
+         intermediate = gdk_window_get_parent (window);
+         if (intermediate != common_ancestor)
+           {
+             synthesize_enter_events (common_ancestor, intermediate,
+                                      msg, GDK_NOTIFY_NONLINEAR_VIRTUAL);
+           }
+         synthesize_enter_event (window, msg, GDK_NOTIFY_NONLINEAR);
+       }
     }
   else
-    return_val = AlreadyGrabbed;
+    {
+      /* Dunno where we are coming from */
+      synthesize_enter_event (window, msg, GDK_NOTIFY_UNKNOWN);
+    }
 
-  if (return_val == GrabSuccess)
-    k_grab_window = window_private;
-  
-  return return_val;
+  if (current_window)
+    gdk_window_unref (current_window);
+  current_window = window;
+  gdk_window_ref (current_window);
 }
 
-/*
- *--------------------------------------------------------------
- * gdk_keyboard_ungrab
- *
- *   Releases any keyboard grab
- *
- * Arguments:
- *
- * Results:
- *
- * Side effects:
- *
- *--------------------------------------------------------------
- */
+#if 0
 
-void
-gdk_keyboard_ungrab (guint32 time)
+static GList *
+get_descendants (GdkWindow *window)
 {
-  GDK_NOTE (EVENTS, g_print ("gdk_keyboard_ungrab\n"));
+  GList *list = gdk_window_get_children (window);
+  GList *head = list;
+  GList *tmp = NULL;
 
-  k_grab_window = NULL;
+  while (list)
+    {
+      tmp = g_list_concat (tmp, get_descendants ((GdkWindow *) list->data));
+      list = list->next;
+    }
+
+  return g_list_concat (tmp, head);
 }
 
+#endif
+
 static void
-gdk_io_destroy (gpointer data)
+synthesize_expose_events (GdkWindow *window)
 {
-  GdkIOClosure *closure = data;
+  RECT r;
+  HDC hdc;
+  GdkDrawableImplWin32 *impl = GDK_DRAWABLE_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
+  GList *list = gdk_window_get_children (window);
+  GList *head = list;
+  GdkEvent *event;
+  int k;
+  
+  while (list)
+    {
+      synthesize_expose_events ((GdkWindow *) list->data);
+      list = list->next;
+    }
 
-  if (closure->notify)
-    closure->notify (closure->data);
+  g_list_free (head);
 
-  g_free (closure);
+  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 ();
+         event->expose.type = GDK_EXPOSE;
+         event->expose.window = window;
+         gdk_window_ref (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;
+  
+         _gdk_event_queue_append (event);
+  
+         GDK_NOTE (EVENTS_OR_COLORMAP, print_event (event));
+       }
+      if (!ReleaseDC (impl->handle, hdc))
+       WIN32_GDI_FAILED ("ReleaseDC");
+    }
 }
 
-static gboolean  
-gdk_io_invoke (GIOChannel   *source,
-              GIOCondition  condition,
-              gpointer      data)
+static void
+update_colors (GdkWindow *window,
+              gboolean   top)
 {
-  GdkIOClosure *closure = data;
-  GdkInputCondition gdk_cond = 0;
+  HDC hdc;
+  GdkDrawableImplWin32 *impl = GDK_DRAWABLE_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
+  GList *list = gdk_window_get_children (window);
+  GList *head = list;
 
-  if (condition & (G_IO_IN | G_IO_PRI))
-    gdk_cond |= GDK_INPUT_READ;
-  if (condition & G_IO_OUT)
-    gdk_cond |= GDK_INPUT_WRITE;
-  if (condition & (G_IO_ERR | G_IO_HUP | G_IO_NVAL))
-    gdk_cond |= GDK_INPUT_EXCEPTION;
+  GDK_NOTE (COLORMAP, (top ? g_print ("update_colors:") : (void) 0));
 
-  if (closure->condition & gdk_cond)
-    closure->function (closure->data, g_io_channel_unix_get_fd (source), gdk_cond);
+  while (list)
+    {
+      update_colors ((GdkWindow *) list->data, FALSE);
+      list = list->next;
+    }
+  g_list_free (head);
 
-  return TRUE;
+  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)));
+         if (!UpdateColors (hdc))
+           WIN32_GDI_FAILED ("UpdateColors");
+         SelectPalette (hdc, holdpal, TRUE);
+         RealizePalette (hdc);
+       }
+      if (!ReleaseDC (impl->handle, hdc))
+       WIN32_GDI_FAILED ("ReleaseDC");
+    }
+  GDK_NOTE (COLORMAP, (top ? g_print ("\n") : (void) 0));
 }
 
-gint
-gdk_input_add_full (gint             source,
-                   GdkInputCondition condition,
-                   GdkInputFunction  function,
-                   gpointer          data,
-                   GdkDestroyNotify  destroy)
+static void
+translate_mouse_coords (GdkWindow *window1,
+                       GdkWindow *window2,
+                       MSG       *msg)
 {
-  guint result;
-  GdkIOClosure *closure = g_new (GdkIOClosure, 1);
-  GIOChannel *channel;
-  GIOCondition cond = 0;
-
-  closure->function = function;
-  closure->condition = condition;
-  closure->notify = destroy;
-  closure->data = data;
-
-  if (condition & GDK_INPUT_READ)
-    cond |= (G_IO_IN | G_IO_PRI);
-  if (condition & GDK_INPUT_WRITE)
-    cond |= G_IO_OUT;
-  if (condition & GDK_INPUT_EXCEPTION)
-    cond |= G_IO_ERR|G_IO_HUP|G_IO_NVAL;
-
-  channel = g_io_channel_unix_new (source);
-  result = g_io_add_watch_full (channel, G_PRIORITY_DEFAULT, cond,
-                               gdk_io_invoke,
-                               closure, gdk_io_destroy);
-  g_io_channel_unref (channel);
+  POINT pt;
 
-  return result;
+  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));
 }
 
-gint
-gdk_input_add (gint             source,
-              GdkInputCondition condition,
-              GdkInputFunction  function,
-              gpointer          data)
+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))
 {
-  return gdk_input_add_full (source, condition, function, data, NULL);
+  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, "));
+      if ((*doesnt_want_it) (grab_mask, msg))
+       {
+         GDK_NOTE (EVENTS, g_print ("...grabber doesn't want it\n"));
+         return FALSE;
+       }
+      else
+       {
+         GDK_NOTE (EVENTS, g_print ("...sending to grabber %p\n",
+                                    GDK_WINDOW_HWND (grab_window)));
+         gdk_drawable_unref (*window);
+         *window = grab_window;
+         gdk_drawable_ref (*window);
+         return TRUE;
+       }
+    }
+  while (TRUE)
+    {
+     if ((*doesnt_want_it) (GDK_WINDOW_OBJECT (*window)->event_mask, msg))
+       {
+         /* Owner doesn't want it, propagate to parent. */
+         if (GDK_WINDOW (GDK_WINDOW_OBJECT (*window)->parent) == _gdk_parent_root)
+           {
+             /* 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"));
+                 if ((*doesnt_want_it) (grab_mask, msg))
+                   {
+                     /* Grabber doesn't want it either */
+                     GDK_NOTE (EVENTS, g_print ("...grabber doesn't want it\n"));
+                     return FALSE;
+                   }
+                 else
+                   {
+                     /* Grabbed! */
+                     GDK_NOTE (EVENTS,
+                               g_print ("...sending to grabber %p\n",
+                                        GDK_WINDOW_HWND (grab_window)));
+                     gdk_drawable_unref (*window);
+                     *window = grab_window;
+                     gdk_drawable_ref (*window);
+                     return TRUE;
+                   }
+               }
+             else
+               {
+                 GDK_NOTE (EVENTS, g_print ("...undelivered\n"));
+                 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 %p",
+                                        (in_propagation ? "," : " ...propagating to"),
+                                        GDK_WINDOW_HWND (*window)));
+             /* The only branch where we actually continue the loop */
+             in_propagation = TRUE;
+           }
+       }
+      else
+       return TRUE;
+    }
 }
 
-void
-gdk_input_remove (gint tag)
+static gboolean
+doesnt_want_key (gint mask,
+                MSG *msg)
 {
-  g_source_remove (tag);
+  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 gint
-gdk_event_apply_filters (MSG      *xevent,
-                        GdkEvent *event,
-                        GList    *filters)
+static gboolean
+doesnt_want_char (gint mask,
+                 MSG *msg)
 {
-  GdkEventFilter *filter;
-  GList *tmp_list;
-  GdkFilterReturn result;
-  
-  tmp_list = filters;
-  
-  while (tmp_list)
-    {
-      filter = (GdkEventFilter *) tmp_list->data;
-      
-      result = (*filter->function) (xevent, event, filter->data);
-      if (result !=  GDK_FILTER_CONTINUE)
-       return result;
-      
-      tmp_list = tmp_list->next;
-    }
-  
-  return GDK_FILTER_CONTINUE;
+  return !(mask & (GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK));
 }
 
-void 
-gdk_add_client_message_filter (GdkAtom       message_type,
-                              GdkFilterFunc func,
-                              gpointer      data)
+static gboolean
+doesnt_want_button_press (gint mask,
+                         MSG *msg)
 {
-  GdkClientFilter *filter = g_new (GdkClientFilter, 1);
+  return !(mask & GDK_BUTTON_PRESS_MASK);
+}
 
-  filter->type = message_type;
-  filter->function = func;
-  filter->data = data;
-  
-  client_filters = g_list_prepend (client_filters, filter);
+static gboolean
+doesnt_want_button_release (gint mask,
+                           MSG *msg)
+{
+  return !(mask & GDK_BUTTON_RELEASE_MASK);
+}
+
+static gboolean
+doesnt_want_button_motion (gint mask,
+                          MSG *msg)
+{
+  return !((mask & GDK_POINTER_MOTION_MASK)
+          || ((msg->wParam & (MK_LBUTTON|MK_MBUTTON|MK_RBUTTON))
+              && (mask & GDK_BUTTON_MOTION_MASK))
+          || ((msg->wParam & MK_LBUTTON)
+              && (mask & GDK_BUTTON1_MOTION_MASK))
+          || ((msg->wParam & MK_MBUTTON)
+              && (mask & GDK_BUTTON2_MOTION_MASK))
+          || ((msg->wParam & MK_RBUTTON)
+              && (mask & GDK_BUTTON3_MOTION_MASK)));
+}
+
+static gboolean
+doesnt_want_scroll (gint mask,
+                   MSG *msg)
+{
+#if 0
+  return !(mask & GDK_SCROLL_MASK);
+#else
+  return !(mask & GDK_BUTTON_PRESS_MASK);
+#endif
+}
+
+static char *
+decode_key_lparam (LPARAM lParam)
+{
+  static char buf[100];
+  char *p = buf;
+
+  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));
+
+  return buf;
 }
 
 static void
-synthesize_crossing_events (GdkWindow *window,
-                           MSG       *xevent)
+erase_background (GdkWindow *window,
+                 HDC        hdc)
 {
-  GdkEvent *event;
-  GdkWindowPrivate *window_private = (GdkWindowPrivate *) window;
-  GdkWindowPrivate *curWnd_private = (GdkWindowPrivate *) curWnd;
+  HDC bgdc = NULL;
+  HBRUSH hbr = NULL;
+  HPALETTE holdpal = NULL;
+  RECT rect;
+  COLORREF bg;
+  GdkColormap *colormap;
+  GdkColormapPrivateWin32 *colormap_private;
+  int i, j;
   
-  if (curWnd && (curWnd_private->event_mask & GDK_LEAVE_NOTIFY_MASK))
-    {
-      GDK_NOTE (EVENTS, g_print ("synthesizing LEAVE_NOTIFY event\n"));
+  if (GDK_WINDOW_OBJECT (window)->input_only ||
+      GDK_WINDOW_OBJECT (window)->bg_pixmap == GDK_NO_BG ||
+      GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->position_info.no_bg)
+    return;
 
-      event = gdk_event_new ();
-      event->crossing.type = GDK_LEAVE_NOTIFY;
-      event->crossing.window = curWnd;
-      gdk_window_ref (event->crossing.window);
-      event->crossing.subwindow = NULL;
-      event->crossing.time = xevent->time;
-      event->crossing.x = curX;
-      event->crossing.y = curY;
-      event->crossing.x_root = curXroot;
-      event->crossing.y_root = curYroot;
-      event->crossing.mode = GDK_CROSSING_NORMAL;
-      event->crossing.detail = GDK_NOTIFY_UNKNOWN;
-
-      event->crossing.focus = TRUE; /* ??? */
-      event->crossing.state = 0; /* ??? */
+  colormap = gdk_drawable_get_colormap (window);
 
-      gdk_event_queue_append (event);
+  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 ("gdk_win32_erase_background: realized %p: %d colors\n",
+                                    colormap_private->hpal, k));
+    }
+  
+  while (window && 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.)
+       */
+      window = GDK_WINDOW (GDK_WINDOW_OBJECT (window)->parent);
+    }
+  
+  if (GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->position_info.no_bg)
+    {
+      /* Improves scolling effect, e.g. main buttons of testgtk */
+      return;
     }
 
-  if (window_private && (window_private->event_mask & GDK_ENTER_NOTIFY_MASK))
+  if (GDK_WINDOW_OBJECT (window)->bg_pixmap == NULL)
     {
-      GDK_NOTE (EVENTS, g_print ("synthesizing ENTER_NOTIFY event\n"));
+      bg = _gdk_win32_colormap_color (GDK_DRAWABLE_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->colormap,
+                                     GDK_WINDOW_OBJECT (window)->bg_color.pixel);
       
-      event = gdk_event_new ();
-      event->crossing.type = GDK_ENTER_NOTIFY;
-      event->crossing.window = window;
-      gdk_window_ref (event->crossing.window);
-      event->crossing.subwindow = NULL;
-      event->crossing.time = xevent->time;
-      event->crossing.x = LOWORD (xevent->lParam);
-      event->crossing.y = HIWORD (xevent->lParam);
-      event->crossing.x_root = (gfloat) xevent->pt.x;
-      event->crossing.y_root = (gfloat) xevent->pt.y;
-      event->crossing.mode = GDK_CROSSING_NORMAL;
-      event->crossing.detail = GDK_NOTIFY_UNKNOWN;
+      GetClipBox (hdc, &rect);
+      GDK_NOTE (EVENTS,
+               g_print ("...%ldx%ld@+%ld+%ld bg %06lx\n",
+                        rect.right - rect.left,
+                        rect.bottom - rect.top,
+                        rect.left, rect.top,
+                        (gulong) bg));
+      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 (GDK_WINDOW_OBJECT (window)->bg_pixmap != NULL &&
+          GDK_WINDOW_OBJECT (window)->bg_pixmap != GDK_NO_BG)
+    {
+      GdkPixmap *pixmap = GDK_WINDOW_OBJECT (window)->bg_pixmap;
+      GdkPixmapImplWin32 *pixmap_impl = GDK_PIXMAP_IMPL_WIN32 (GDK_PIXMAP_OBJECT (pixmap)->impl);
       
-      event->crossing.focus = TRUE; /* ??? */
-      event->crossing.state = 0; /* ??? */
+      GetClipBox (hdc, &rect);
       
-      gdk_event_queue_append (event);
+      if (pixmap_impl->width <= 8 && pixmap_impl->height <= 8)
+       {
+         GDK_NOTE (EVENTS, g_print ("...small pixmap, using brush\n"));
+         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);
+       }
+      else
+       {
+         HGDIOBJ oldbitmap;
 
-      if (window_private->extension_events != 0
-         && gdk_input_vtable.enter_event)
-       gdk_input_vtable.enter_event (&event->crossing, window);
+         GDK_NOTE (EVENTS,
+                   g_print ("...blitting pixmap %p (%dx%d) "
+                            "all over the place,\n"
+                            "...clip box = %ldx%ld@+%ld+%ld\n",
+                            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");
+             return;
+           }
+         if (!(oldbitmap = SelectObject (bgdc, GDK_PIXMAP_HBITMAP (pixmap))))
+           {
+             WIN32_GDI_FAILED ("SelectObject");
+             DeleteDC (bgdc);
+             return;
+           }
+         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");
+                         SelectObject (bgdc, oldbitmap);
+                         DeleteDC (bgdc);
+                         return;
+                       }
+                   }
+                 j += pixmap_impl->height;
+               }
+             i += pixmap_impl->width;
+           }
+         SelectObject (bgdc, oldbitmap);
+         DeleteDC (bgdc);
+       }
+    }
+  else
+    {
+      GDK_NOTE (EVENTS, g_print ("...BLACK_BRUSH (?)\n"));
+      hbr = GetStockObject (BLACK_BRUSH);
+      GetClipBox (hdc, &rect);
+      if (!FillRect (hdc, &rect, hbr))
+       WIN32_GDI_FAILED ("FillRect");
     }
-  
-  if (curWnd)
-    gdk_window_unref (curWnd);
-  curWnd = window;
-  gdk_window_ref (curWnd);
 }
 
-static gint
+static GdkRegion *
+_gdk_win32_hrgn_to_region (HRGN hrgn)
+{
+  RGNDATA *rgndata;
+  RECT *rects;
+  GdkRegion *result;
+  gint nbytes;
+  gint i;
+
+  if ((nbytes = GetRegionData (hrgn, 0, NULL)) == 0)
+    {
+      WIN32_GDI_FAILED ("GetRegionData");
+      return NULL;
+    }
+
+  rgndata = (RGNDATA *) g_malloc (nbytes);
+
+  if (GetRegionData (hrgn, nbytes, rgndata) == 0)
+    {
+      WIN32_GDI_FAILED ("GetRegionData");
+      g_free (rgndata);
+      return NULL;
+    }
+
+  result = gdk_region_new ();
+  rects = (RECT *) rgndata->Buffer;
+  for (i = 0; i < rgndata->rdh.nCount; i++)
+    {
+      GdkRectangle r;
+
+      r.x = rects[i].left;
+      r.y = rects[i].top;
+      r.width = rects[i].right - r.x;
+      r.height = rects[i].bottom - r.y;
+
+      gdk_region_union_with_rect (result, &r);
+    }
+
+  g_free (rgndata);
+
+  return result;
+}
+
+static gboolean
 gdk_event_translate (GdkEvent *event,
-                    MSG      *xevent,
+                    MSG      *msg,
                     gboolean *ret_val_flagp,
-                    gint     *ret_valp)
+                    gint     *ret_valp,
+                    gboolean  return_exposes)
 {
-  GdkWindow *window;
-  GdkWindowPrivate *window_private;
-
-  GdkColormapPrivate *colormap_private;
-  HWND owner;
-  DWORD dwStyle;
+  DWORD pidActWin;
+  DWORD pidThis;
   PAINTSTRUCT paintstruct;
   HDC hdc;
-  HBRUSH hbr;
   RECT rect;
   POINT pt;
-  GdkWindowPrivate *curWnd_private;
-  GdkEventMask mask;
-  int button;
-  int i, j;
+  MINMAXINFO *mmi;
+  HWND hwnd;
+  HCURSOR hcursor;
+  HRGN hrgn;
+  CHARSETINFO charset_info;
+
+  /* Invariant:
+   * private == GDK_WINDOW_OBJECT (window)
+   */
+  GdkWindow *window;
+  GdkWindowObject *private;
+
+#define ASSIGN_WINDOW(rhs)                                                \
+  (window = rhs,                                                          \
+   private = (GdkWindowObject *) window)
+
+  GdkWindowImplWin32 *impl;
+
+  GdkWindow *orig_window, *new_window;
+  gint xoffset, yoffset;
+
+  static gint update_colors_counter = 0;
+  gint button;
+  gint k;
+
   gchar buf[256];
-  gint charcount;
-  gint return_val;
-  gboolean flag;
-  
-  return_val = FALSE;
+  gboolean return_val = FALSE;
   
   if (ret_val_flagp)
     *ret_val_flagp = FALSE;
 
-  if (xevent->message == gdk_ping_msg)
-    {
-      /* Messages we post ourselves just to wakeup WaitMessage.  */
-      return FALSE;
-    }
-
-  window = gdk_window_lookup (xevent->hwnd);
-  window_private = (GdkWindowPrivate *) window;
+  ASSIGN_WINDOW (gdk_win32_handle_table_lookup ((GdkNativeWindow) msg->hwnd));
+  orig_window = window;
   
-  if (xevent->message == g_pipe_readable_msg)
-    {
-      GDK_NOTE (EVENTS, g_print ("g_pipe_readable_msg: %d %d\n",
-                                xevent->wParam, xevent->lParam));
+  event->any.window = window;
 
-      g_io_channel_win32_pipe_readable (xevent->wParam, xevent->lParam);
-      return FALSE;
-    }
+  /* 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 (); 
 
-  if (window != NULL)
-    gdk_window_ref (window);
-  else
+  if (window == NULL)
     {
       /* Handle WM_QUIT here ? */
-      if (xevent->message == WM_QUIT)
+      if (msg->message == WM_QUIT)
        {
-         GDK_NOTE (EVENTS, g_print ("WM_QUIT: %d\n", xevent->wParam));
-         exit (xevent->wParam);
+         GDK_NOTE (EVENTS, g_print ("WM_QUIT: %d\n", msg->wParam));
+         exit (msg->wParam);
        }
-      else if (xevent->message == WM_MOVE
-              || xevent->message == WM_SIZE)
+      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
@@ -1177,87 +1930,119 @@ gdk_event_translate (GdkEvent *event,
           * removed it. Repost the same message to our queue so that
           * we will get it later when we are prepared.
           */
-         PostMessage (xevent->hwnd, xevent->message,
-                      xevent->wParam, xevent->lParam);
+         GDK_NOTE(MISC, g_print("gdk_event_translate: %p %s posted.\n",
+                                msg->hwnd, 
+                                msg->message == WM_MOVE ?
+                                "WM_MOVE" : "WM_SIZE"));
+       
+         PostMessage (msg->hwnd, msg->message,
+                      msg->wParam, msg->lParam);
        }
-      else if (xevent->message == WM_NCCREATE
-              || xevent->message == WM_CREATE
-              || xevent->message == WM_GETMINMAXINFO
-              || xevent->message == WM_NCCALCSIZE
-              || xevent->message == WM_NCDESTROY
-              || xevent->message == WM_DESTROY)
+#ifndef WITHOUT_WM_CREATE
+      else if (WM_CREATE == msg->message)
        {
-         /* Nothing */
+         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
        }
+      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;
     }
   
-  event->any.window = window;
+  gdk_drawable_ref (window);
 
-  if (window_private && window_private->destroyed)
-    {
-    }
-  else
+  if (!GDK_WINDOW_DESTROYED (window))
     {
       /* Check for filters for this window */
       GdkFilterReturn result;
-      result = gdk_event_apply_filters (xevent, event,
-                                       window_private
-                                       ?window_private->filters
-                                       :gdk_default_filters);
+
+      result = gdk_event_apply_filters
+       (msg, event, GDK_WINDOW_OBJECT (window)->filters);
       
       if (result != GDK_FILTER_CONTINUE)
        {
-         return (result == GDK_FILTER_TRANSLATE) ? TRUE : FALSE;
+         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 (xevent->message == gdk_selection_notify_msg)
+  if (msg->message == msh_mousewheel_msg)
     {
-      GDK_NOTE (SELECTION, g_print ("gdk_selection_notify_msg: %#x\n",
-                                   xevent->hwnd));
-
-      event->selection.type = GDK_SELECTION_NOTIFY;
-      event->selection.window = window;
-      event->selection.selection = xevent->wParam;
-      event->selection.target = xevent->lParam;
-      event->selection.property = gdk_selection_property;
-      event->selection.time = xevent->time;
-
-      return_val = window_private && !window_private->destroyed;
+      GDK_NOTE (EVENTS, g_print ("MSH_MOUSEWHEEL: %p %d\n",
+                                msg->hwnd, msg->wParam));
+      
+      event->scroll.type = GDK_SCROLL;
 
-      /* Will pass through switch below without match */
-    }
-  else if (xevent->message == gdk_selection_request_msg)
-    {
-      GDK_NOTE (SELECTION, g_print ("gdk_selection_request_msg: %#x\n",
-                                   xevent->hwnd));
+      /* 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;
 
-      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) xevent->hwnd;
-      event->selection.time = xevent->time;
+      msg->hwnd = hwnd;
+      if ((new_window = gdk_win32_handle_table_lookup ((GdkNativeWindow) msg->hwnd)) == NULL)
+       goto done;
 
-      return_val = window_private && !window_private->destroyed;
+      if (new_window != window)
+       {
+         gdk_drawable_unref (window);
+         ASSIGN_WINDOW (new_window);
+         gdk_drawable_ref (window);
+       }
 
-      /* Again, will pass through switch below without match */
-    }
-  else if (xevent->message == gdk_selection_clear_msg)
-    {
-      GDK_NOTE (SELECTION, g_print ("gdk_selection_clear_msg: %#x\n",
-                                   xevent->hwnd));
+      if (GDK_WINDOW_OBJECT (window)->extension_events != 0
+         && _gdk_input_ignore_core)
+       {
+         GDK_NOTE (EVENTS, g_print ("...ignored\n"));
+         goto done;
+       }
 
-      event->selection.type = GDK_SELECTION_CLEAR;
-      event->selection.window = window;
-      event->selection.selection = xevent->wParam;
-      event->selection.time = xevent->time;
+      if (!propagate (&window, msg,
+                     p_grab_window, p_grab_owner_events, p_grab_mask,
+                     doesnt_want_scroll))
+       goto done;
 
-      return_val = window_private && !window_private->destroyed;
+      ASSIGN_WINDOW (window);
 
-      /* Once again, we will pass through switch below without match */
+      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;
+      _gdk_windowing_window_get_offsets (window, &xoffset, &yoffset);
+      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);
+
+      goto done;
     }
   else
     {
@@ -1268,13 +2053,20 @@ gdk_event_translate (GdkEvent *event,
       while (tmp_list)
        {
          GdkClientFilter *filter = tmp_list->data;
-         if (filter->type == xevent->message)
+         /* 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))
            {
              GDK_NOTE (EVENTS, g_print ("client filter matched\n"));
-             result = (*filter->function) (xevent, event, filter->data);
+             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;
 
@@ -1283,110 +2075,82 @@ gdk_event_translate (GdkEvent *event,
                  break;
 
                case GDK_FILTER_CONTINUE:
+                 *ret_val_flagp = TRUE;
+                 *ret_valp = 1;
                  return_val = TRUE;
                  event->client.type = GDK_CLIENT_EVENT;
                  event->client.window = window;
-                 event->client.message_type = xevent->message;
+                 /* 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] = xevent->wParam;
-                 event->client.data.l[1] = xevent->lParam;
+                 event->client.data.l[0] = msg->wParam;
+                 event->client.data.l[1] = msg->lParam;
                  break;
                }
-             goto bypass_switch; /* Ouch */
+             goto done;
            }
          tmp_list = tmp_list->next;
        }
     }
 
-  switch (xevent->message)
+  switch (msg->message)
     {
+    case WM_INPUTLANGCHANGE:
+      _gdk_input_locale = (HKL) msg->lParam;
+      TranslateCharsetInfo ((DWORD FAR *) msg->wParam,
+                           &charset_info,
+                           TCI_SRCCHARSET);
+      _gdk_input_codepage = charset_info.ciACP;
+      _gdk_keymap_serial++;
+      GDK_NOTE (EVENTS,
+               g_print ("WM_INPUTLANGCHANGE: %p  charset %lu locale %lx cp%d\n",
+                        msg->hwnd, (gulong) msg->wParam, msg->lParam,
+                        _gdk_input_codepage));
+      break;
+
     case WM_SYSKEYUP:
     case WM_SYSKEYDOWN:
       GDK_NOTE (EVENTS,
-               g_print ("WM_SYSKEY%s: %#x  key: %s  %#x %#.08x\n",
-                        (xevent->message == WM_SYSKEYUP ? "UP" : "DOWN"),
-                        xevent->hwnd,
-                        (GetKeyNameText (xevent->lParam, buf,
+               g_print ("WM_SYSKEY%s: %p  %s vk:%.02x %s\n",
+                        (msg->message == WM_SYSKEYUP ? "UP" : "DOWN"),
+                        msg->hwnd,
+                        (GetKeyNameText (msg->lParam, buf,
                                          sizeof (buf)) > 0 ?
                          buf : ""),
-                        xevent->wParam,
-                        xevent->lParam));
+                        msg->wParam,
+                        decode_key_lparam (msg->lParam)));
 
-      /* Let the system handle Alt-Tab and Alt-Enter */
-      if (xevent->wParam == VK_TAB
-         || xevent->wParam == VK_RETURN
-         || xevent->wParam == VK_F4)
-       break;
       /* If posted without us having keyboard focus, ignore */
-      if (!(xevent->lParam & 0x20000000))
+      if (!(msg->lParam & 0x20000000))
        break;
-#if 0
-      /* don't generate events for just the Alt key */
-      if (xevent->wParam == VK_MENU)
+      /* Let the system handle Alt-Tab, Alt-Enter and Alt-F4 */
+      if (msg->wParam == VK_TAB
+         || msg->wParam == VK_RETURN
+         || msg->wParam == VK_F4)
        break;
-#endif
+
       /* 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 ("WM_KEY%s: %#x  key: %s  %#x %#.08x\n",
-                        (xevent->message == WM_KEYUP ? "UP" : "DOWN"),
-                        xevent->hwnd,
-                        (GetKeyNameText (xevent->lParam, buf,
+               g_print ("WM_KEY%s: %p  %s vk:%.02x %s\n",
+                        (msg->message == WM_KEYUP ? "UP" : "DOWN"),
+                        msg->hwnd,
+                        (GetKeyNameText (msg->lParam, buf,
                                          sizeof (buf)) > 0 ?
                          buf : ""),
-                        xevent->wParam,
-                        xevent->lParam));
+                        msg->wParam,
+                        decode_key_lparam (msg->lParam)));
+
+      ignore_wm_char = TRUE;
 
-      ignore_WM_CHAR = TRUE;
     keyup_or_down:
-      if (k_grab_window != NULL
-         && !k_grab_owner_events)
-       {
-         /* Keyboard is grabbed with owner_events FALSE */
-         GDK_NOTE (EVENTS,
-                   g_print ("...grabbed, owner_events FALSE, "
-                            "sending to %#x\n", k_grab_window->xwindow));
-         event->key.window = (GdkWindow *) k_grab_window;
-       }
-      else if (window_private
-              && (((xevent->message == WM_KEYUP
-                    || xevent->message == WM_SYSKEYUP)
-                   && !(window_private->event_mask & GDK_KEY_RELEASE_MASK))
-                  || ((xevent->message == WM_KEYDOWN
-                       || xevent->message == WM_SYSKEYDOWN)
-                      && !(window_private->event_mask & GDK_KEY_PRESS_MASK))))
-       {
-         /* Owner window doesn't want it */
-         if (k_grab_window != NULL
-             && k_grab_owner_events)
-           {
-             /* Keyboard is grabbed with owner_events TRUE */
-             GDK_NOTE (EVENTS,
-                       g_print ("...grabbed, owner_events TRUE, doesn't want it, "
-                                "sending to %#x\n", k_grab_window->xwindow));
-             event->key.window = (GdkWindow *) k_grab_window;
-           }
-         else
-           {
-             /* Owner doesn't want it, neither is it grabbed, so
-              * propagate to parent.
-              */
-             if (window_private->parent == (GdkWindow *) &gdk_root_parent)
-               break;
-             gdk_window_unref (window);
-             window = window_private->parent;
-             gdk_window_ref (window);
-             window_private = (GdkWindowPrivate *) window;
-             GDK_NOTE (EVENTS, g_print ("...propagating to %#x\n",
-                                        window_private->xwindow));
-             goto keyup_or_down;
-           }
-       }
-             
-      switch (xevent->wParam)
+
+      event->key.window = window;
+
+      switch (msg->wParam)
        {
        case VK_LBUTTON:
          event->key.keyval = GDK_Pointer_Button1; break;
@@ -1399,32 +2163,52 @@ gdk_event_translate (GdkEvent *event,
        case VK_BACK:
          event->key.keyval = GDK_BackSpace; break;
        case VK_TAB:
-         event->key.keyval = GDK_Tab; break;
+         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:
-         event->key.keyval = GDK_Shift_L; break;
+         /* 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:
-         if (xevent->lParam & 0x01000000)
+         /* 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:
-         if (xevent->lParam & 0x01000000)
+         /* 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;
+                 ignore_wm_char = FALSE;
+                 is_altgr_key = TRUE;
                }
              event->key.keyval = GDK_Alt_R;
            }
          else
-           event->key.keyval = GDK_Alt_L;
+           {
+             event->key.keyval = GDK_Alt_L;
+             /* This needed in case she types Alt+nnn (on the numpad) */
+             ignore_wm_char = FALSE;
+           }
          break;
        case VK_PAUSE:
          event->key.keyval = GDK_Pause; break;
@@ -1473,27 +2257,27 @@ gdk_event_translate (GdkEvent *event,
          /* 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;
+         ignore_wm_char = FALSE;
          break;
        case VK_MULTIPLY:
          event->key.keyval = GDK_KP_Multiply; break;
        case VK_ADD:
-         event->key.keyval = GDK_KP_Add; break;
+         /* 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:
-         event->key.keyval = GDK_KP_Subtract; break;
+         /* Pass it on as an ASCII minus in WM_CHAR. */
+         ignore_wm_char = FALSE;
+         break;
        case VK_DECIMAL:
-#if 0
-         event->key.keyval = GDK_KP_Decimal; break;
-#else
          /* 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;
+         ignore_wm_char = FALSE;
          break;
-#endif
        case VK_DIVIDE:
          event->key.keyval = GDK_KP_Divide; break;
        case VK_F1:
@@ -1528,28 +2312,95 @@ gdk_event_translate (GdkEvent *event,
          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 (xevent->message == WM_SYSKEYDOWN || xevent->message == WM_SYSKEYUP)
-           {
-             event->key.keyval = xevent->wParam;
-           }
+         if (msg->message == WM_SYSKEYDOWN || msg->message == WM_SYSKEYUP)
+           event->key.keyval = msg->wParam;
          else
-           {
-             ignore_WM_CHAR = FALSE;
-             event->key.keyval = GDK_VoidSymbol;
-           }
+           ignore_wm_char = FALSE;
          break;
        }
 
-      if (!ignore_WM_CHAR)
+      if (!ignore_wm_char)
        break;
 
-      is_AltGr_key = FALSE;
-      event->key.type = ((xevent->message == WM_KEYDOWN
-                         || xevent->message == WM_SYSKEYDOWN) ?
+      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.window = window;
-      event->key.time = xevent->time;
+      event->key.time = msg->time;
       event->key.state = 0;
       if (GetKeyState (VK_SHIFT) < 0)
        event->key.state |= GDK_SHIFT_MASK;
@@ -1557,162 +2408,90 @@ gdk_event_translate (GdkEvent *event,
        event->key.state |= GDK_LOCK_MASK;
       if (GetKeyState (VK_CONTROL) < 0)
        event->key.state |= GDK_CONTROL_MASK;
-      if (xevent->wParam != VK_MENU && GetKeyState (VK_MENU) < 0)
+      if (msg->wParam != VK_MENU && GetKeyState (VK_MENU) < 0)
        event->key.state |= GDK_MOD1_MASK;
-      event->key.length = 0;
-      return_val = window_private && !window_private->destroyed;
+      event->key.hardware_keycode = msg->wParam;
+      event->key.group = 0;
       event->key.string = NULL;
+      event->key.length = 0;
+      return_val = !GDK_WINDOW_DESTROYED (window);
+      break;
+
+    case WM_IME_COMPOSITION:
+      if (!use_ime_composition)
+       break;
+
+      GDK_NOTE (EVENTS, g_print ("WM_IME_COMPOSITION: %p  %#lx\n",
+                                msg->hwnd, msg->lParam));
+      if (msg->lParam & GCS_RESULTSTR)
+       goto wm_char;
       break;
 
+    case WM_IME_CHAR:
+      GDK_NOTE (EVENTS,
+               g_print ("WM_IME_CHAR: %p  bytes: %#.04x\n",
+                        msg->hwnd, msg->wParam));
+      goto wm_char;
+      
     case WM_CHAR:
+    case WM_SYSCHAR:
       GDK_NOTE (EVENTS, 
-               g_print ("WM_CHAR: %#x  char: %#x %#.08x  %s\n",
-                        xevent->hwnd,
-                        xevent->wParam,
-                        xevent->lParam,
-                        (ignore_WM_CHAR ? "ignored" : "")));
+               g_print ("WM_%sCHAR: %p  %#x %s %s\n",
+                        (msg->message == WM_CHAR ? "" : "SYS"),
+                        msg->hwnd, msg->wParam,
+                        decode_key_lparam (msg->lParam),
+                        (ignore_wm_char ? "ignored" : "")));
 
-      if (ignore_WM_CHAR)
+      if (ignore_wm_char)
        {
-         ignore_WM_CHAR = FALSE;
+         ignore_wm_char = FALSE;
          break;
        }
 
     wm_char:
-      /* This doesn't handle the rather theorethical case that a window
-       * wants key presses but still wants releases to be propagated,
-       * for instance.
-       */
-      if (k_grab_window != NULL
-         && !k_grab_owner_events)
-       {
-         /* Keyboard is grabbed with owner_events FALSE */
-         GDK_NOTE (EVENTS,
-                   g_print ("...grabbed, owner_events FALSE, "
-                            "sending to %#x\n", k_grab_window->xwindow));
-         event->key.window = (GdkWindow *) k_grab_window;
-       }
-      else if (window_private
-              && !(window_private->event_mask & (GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK)))
+      if (!propagate (&window, msg,
+                     k_grab_window, k_grab_owner_events, GDK_ALL_EVENTS_MASK,
+                     doesnt_want_char))
+         break;
+      ASSIGN_WINDOW (window);
+
+      event->key.window = window;
+      return_val = !GDK_WINDOW_DESTROYED (window);
+
+      if (return_val && (event->key.window == k_grab_window
+                        || (private->event_mask & GDK_KEY_RELEASE_MASK)))
        {
-         /* Owner window doesn't want it */
-         if (k_grab_window != NULL
-             && k_grab_owner_events)
+         if (window == k_grab_window
+             || (private->event_mask & GDK_KEY_PRESS_MASK))
            {
-             /* Keyboard is grabbed with owner_events TRUE */
-             GDK_NOTE (EVENTS,
-                       g_print ("...grabbed, owner_events TRUE, doesn't want it, "
-                                "sending to %#x\n", k_grab_window->xwindow));
-             event->key.window = (GdkWindow *) k_grab_window;
-           }
-         else
-           {
-             /* Owner doesn't want it, neither is it grabbed, so
-              * propagate to parent.
+             /* Append a GDK_KEY_PRESS event to the pushback list
+              * (from which it will be fetched before the release
+              * event).
               */
-             if (window_private->parent == (GdkWindow *) &gdk_root_parent)
-               g_assert_not_reached (); /* Should've been handled above */
-
-             gdk_window_unref (window);
-             window = window_private->parent;
-             gdk_window_ref (window);
-             window_private = (GdkWindowPrivate *) window;
-             GDK_NOTE (EVENTS, g_print ("...propagating to %#x\n",
-                                        window_private->xwindow));
-             goto wm_char;
-           }
-       }
-      
-      return_val = window_private && !window_private->destroyed;
-      if (return_val && (window_private->event_mask & GDK_KEY_RELEASE_MASK))
-       {
-         /* Return the release event, and maybe append the press
-          * event to the queued_events list (from which it will vbe
-          * fetched before the release event).
-          */
-         event->key.type = GDK_KEY_RELEASE;
-         event->key.keyval = xevent->wParam;
-         event->key.window = window;
-         event->key.time = xevent->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 (is_AltGr_key)
-           ;
-         else if (GetKeyState (VK_CONTROL) < 0)
-           {
-             event->key.state |= GDK_CONTROL_MASK;
-             if (event->key.keyval < ' ')
-               event->key.keyval += '@';
-           }
-         else if (event->key.keyval < ' ')
-           {
-             event->key.state |= GDK_CONTROL_MASK;
-             event->key.keyval += '@';
-           }
-         if (!is_AltGr_key && GetKeyState (VK_MENU) < 0)
-           event->key.state |= GDK_MOD1_MASK;
-         event->key.string = g_strdup (" ");
-         event->key.length = 1;
-         event->key.string[0] = xevent->wParam; /* ??? */
-
-         if (window_private->event_mask & GDK_KEY_PRESS_MASK)
-           {
-             /* Append also a GDK_KEY_PRESS event to the pushback list.  */
-             GdkEvent *event2 = gdk_event_copy (event);
-             event2->key.type = GDK_KEY_PRESS;
-             charcount = xevent->lParam & 0xFFFF;
-             if (charcount > sizeof (buf)- 1)
-               charcount = sizeof (buf) - 1;
-             g_free (event2->key.string);
-             event2->key.string = g_malloc (charcount);
-             for (i = 0; i < charcount; i++)
-               event2->key.string[i] = event->key.keyval;
-             event2->key.length = charcount;
-
-             gdk_event_queue_append (event2);
+             GdkEvent *event2 = _gdk_event_new ();
+             build_keypress_event (event2, msg);
+             event2->key.window = window;
+             gdk_drawable_ref (window);
+             _gdk_event_queue_append (event2);
+             GDK_NOTE (EVENTS, print_event (event2));
            }
+         /* Return the key release event.  */
+         build_keyrelease_event (event, msg);
        }
-      else if (return_val && (window_private->event_mask & GDK_KEY_PRESS_MASK))
+      else if (return_val && (private->event_mask & GDK_KEY_PRESS_MASK))
        {
-         /* Return just the GDK_KEY_PRESS event. */
-         event->key.type = GDK_KEY_PRESS;
-         charcount = xevent->lParam & 0xFFFF;
-         if (charcount > sizeof (buf)- 1)
-           charcount = sizeof (buf) - 1;
-         event->key.keyval = xevent->wParam;
-         event->key.window = window;
-         event->key.time = xevent->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 (is_AltGr_key)
-           ;
-         else if (GetKeyState (VK_CONTROL) < 0)
-           {
-             event->key.state |= GDK_CONTROL_MASK;
-             if (event->key.keyval < ' ')
-               event->key.keyval += '@';
-           }
-         else if (event->key.keyval < ' ')
-           {
-             event->key.state |= GDK_CONTROL_MASK;
-             event->key.keyval += '@';
-           }
-         if (!is_AltGr_key && GetKeyState (VK_MENU) < 0)
-           event->key.state |= GDK_MOD1_MASK;
-         event->key.string = g_malloc (charcount);
-         for (i = 0; i < charcount; i++)
-           event->key.string[i] = event->key.keyval;
-         event->key.length = charcount;
+         /* Return just the key press event. */
+         build_keypress_event (event, msg);
        }
       else
        return_val = FALSE;
+
+#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
       break;
 
     case WM_LBUTTONDOWN:
@@ -1726,173 +2505,64 @@ gdk_event_translate (GdkEvent *event,
 
     buttondown0:
       GDK_NOTE (EVENTS, 
-               g_print ("WM_%cBUTTONDOWN: %#x  x,y: %d %d  button: %d\n",
+               g_print ("WM_%cBUTTONDOWN: %p  (%d,%d)\n",
                         " LMR"[button],
-                        xevent->hwnd,
-                        LOWORD (xevent->lParam), HIWORD (xevent->lParam),
-                        button));
+                        msg->hwnd,
+                        LOWORD (msg->lParam), HIWORD (msg->lParam)));
 
-      if (window_private
-         && (window_private->extension_events != 0)
-         && gdk_input_ignore_core)
+      if (GDK_WINDOW_OBJECT (window)->extension_events != 0
+         && _gdk_input_ignore_core)
        {
          GDK_NOTE (EVENTS, g_print ("...ignored\n"));
          break;
        }
 
+      ASSIGN_WINDOW (find_window_for_pointer_event (window, msg));
+
+      if (window != current_window)
+       synthesize_crossing_events (window, msg);
+
       event->button.type = GDK_BUTTON_PRESS;
-    buttondown:
-      event->button.window = window;
-      if (window_private)
-       mask = window_private->event_mask;
-      else
-       mask = 0;               /* ??? */
+      if (!propagate (&window, msg,
+                     p_grab_window, p_grab_owner_events, p_grab_mask,
+                     doesnt_want_button_press))
+         break;
+      ASSIGN_WINDOW (window);
 
-      if (p_grab_window != NULL
-          && !p_grab_owner_events)
-       {
-         /* Pointer is grabbed with owner_events FALSE */
-         GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events FALSE\n"));
-         mask = p_grab_event_mask;
-         if (!(mask & GDK_BUTTON_PRESS_MASK))
-           /* Grabber doesn't want it */
-           break;
-         else
-           event->button.window = (GdkWindow *) p_grab_window;
-         GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
-                                    p_grab_window->xwindow));
-       }
-      else if (window_private
-              && !(mask & GDK_BUTTON_PRESS_MASK))
-       {
-         /* Owner window doesn't want it */
-         if (p_grab_window != NULL
-             && p_grab_owner_events)
-           {
-             /* Pointer is grabbed wíth owner_events TRUE */ 
-             GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events TRUE, doesn't want it\n"));
-             mask = p_grab_event_mask;
-             if (!(mask & GDK_BUTTON_PRESS_MASK))
-               /* Grabber doesn't want it either */
-               break;
-             else
-               event->button.window = (GdkWindow *) p_grab_window;
-             GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
-                                        p_grab_window->xwindow));
-           }
-         else
-           {
-             /* Owner doesn't want it, neither is it grabbed, so
-              * propagate to parent.
-              */
-             /* Yes, this code is duplicated twice below. So shoot me. */
-             if (window_private->parent == (GdkWindow *) &gdk_root_parent)
-               break;
-             pt.x = LOWORD (xevent->lParam);
-             pt.y = HIWORD (xevent->lParam);
-             ClientToScreen (window_private->xwindow, &pt);
-             gdk_window_unref (window);
-             window = window_private->parent;
-             gdk_window_ref (window);
-             window_private = (GdkWindowPrivate *) window;
-             ScreenToClient (window_private->xwindow, &pt);
-             xevent->lParam = MAKELPARAM (pt.x, pt.y);
-             GDK_NOTE (EVENTS, g_print ("...propagating to %#x\n",
-                                        window_private->xwindow));
-             goto buttondown; /* What did Dijkstra say? */
-           }
-       }
+      event->button.window = window;
 
       /* Emulate X11's automatic active grab */
       if (!p_grab_window)
        {
          /* No explicit active grab, let's start one automatically */
+         gint owner_events = (private->event_mask & (GDK_BUTTON_PRESS_MASK|GDK_BUTTON_RELEASE_MASK));
+         
          GDK_NOTE (EVENTS, g_print ("...automatic grab started\n"));
-         gdk_pointer_grab (window, TRUE, window_private->event_mask,
+         gdk_pointer_grab (window,
+                           owner_events,
+                           private->event_mask,
                            NULL, NULL, 0);
          p_grab_automatic = TRUE;
        }
 
-      if (window != curWnd)
-       synthesize_crossing_events (window, xevent);
-
-      event->button.time = xevent->time;
-      event->button.x = LOWORD (xevent->lParam);
-      event->button.y = HIWORD (xevent->lParam);
-      event->button.x_root = (gfloat)xevent->pt.x;
-      event->button.y_root = (gfloat)xevent->pt.y;
-      event->button.pressure = 0.5;
-      event->button.xtilt = 0;
-      event->button.ytilt = 0;
-      event->button.state = 0;
-      if (xevent->wParam & MK_CONTROL)
-       event->button.state |= GDK_CONTROL_MASK;
-      if (xevent->wParam & MK_LBUTTON)
-       event->button.state |= GDK_BUTTON1_MASK;
-      if (xevent->wParam & MK_MBUTTON)
-       event->button.state |= GDK_BUTTON2_MASK;
-      if (xevent->wParam & MK_RBUTTON)
-       event->button.state |= GDK_BUTTON3_MASK;
-      if (xevent->wParam & MK_SHIFT)
-       event->button.state |= GDK_SHIFT_MASK;
-      if (GetKeyState (VK_MENU) < 0)
-       event->button.state |= GDK_MOD1_MASK;
-      if (GetKeyState (VK_CAPITAL) & 0x1)
-       event->button.state |= GDK_LOCK_MASK;
+      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);
+      _gdk_windowing_window_get_offsets (window, &xoffset, &yoffset);
+      event->button.x += xoffset;  /* XXX translate current_x, y too? */
+      event->button.y += yoffset;
+      event->button.x_root = current_x_root = msg->pt.x;
+      event->button.y_root = current_y_root = msg->pt.y;
+      event->button.axes = NULL;
+      event->button.state = build_pointer_event_state (msg);
       event->button.button = button;
-      event->button.source = GDK_SOURCE_MOUSE;
-      event->button.deviceid = GDK_CORE_POINTER;
+      event->button.device = _gdk_core_pointer;
 
-      if ((event->button.time < (button_click_time[1] + TRIPLE_CLICK_TIME)) &&
-         (event->button.window == button_window[1]) &&
-         (event->button.button == button_number[1]))
-       {
-         gdk_synthesize_click (event, 3);
-
-         button_click_time[1] = 0;
-         button_click_time[0] = 0;
-         button_window[1] = NULL;
-         button_window[0] = 0;
-         button_number[1] = -1;
-         button_number[0] = -1;
-       }
-      else if ((event->button.time < (button_click_time[0] + DOUBLE_CLICK_TIME)) &&
-              (event->button.window == button_window[0]) &&
-              (event->button.button == button_number[0]))
-       {
-         gdk_synthesize_click (event, 2);
-
-         button_click_time[1] = button_click_time[0];
-         button_click_time[0] = event->button.time;
-         button_window[1] = button_window[0];
-         button_window[0] = event->button.window;
-         button_number[1] = button_number[0];
-         button_number[0] = event->button.button;
-       }
-      else
-       {
-         button_click_time[1] = 0;
-         button_click_time[0] = event->button.time;
-         button_window[1] = NULL;
-         button_window[0] = event->button.window;
-         button_number[1] = -1;
-         button_number[0] = event->button.button;
-       }
-      return_val = window_private && !window_private->destroyed;
-      if (return_val
-         && p_grab_window != NULL
-         && event->any.window == (GdkWindow *) p_grab_window
-         && p_grab_window != window_private)
-       {
-         /* Translate coordinates to grabber */
-         pt.x = event->button.x;
-         pt.y = event->button.y;
-         ClientToScreen (window_private->xwindow, &pt);
-         ScreenToClient (p_grab_window->xwindow, &pt);
-         event->button.x = pt.x;
-         event->button.y = pt.y;
-         GDK_NOTE (EVENTS, g_print ("...new coords are +%d+%d\n", pt.x, pt.y));
-       }
+      _gdk_event_button_generate (event);
+      
+      return_val = !GDK_WINDOW_DESTROYED (window);
       break;
 
     case WM_LBUTTONUP:
@@ -1906,763 +2576,652 @@ gdk_event_translate (GdkEvent *event,
 
     buttonup0:
       GDK_NOTE (EVENTS, 
-               g_print ("WM_%cBUTTONUP: %#x  x,y: %d %d  button: %d\n",
+               g_print ("WM_%cBUTTONUP: %p  (%d,%d)\n",
                         " LMR"[button],
-                        xevent->hwnd,
-                        LOWORD (xevent->lParam), HIWORD (xevent->lParam),
-                        button));
+                        msg->hwnd,
+                        LOWORD (msg->lParam), HIWORD (msg->lParam)));
+
+      ASSIGN_WINDOW (find_window_for_pointer_event (window, msg));
 
-      if (window_private
-         && (window_private->extension_events != 0)
-         && gdk_input_ignore_core)
+      if (GDK_WINDOW_OBJECT (window)->extension_events != 0
+         && _gdk_input_ignore_core)
        {
          GDK_NOTE (EVENTS, g_print ("...ignored\n"));
          break;
        }
 
-      event->button.type = GDK_BUTTON_RELEASE;
-    buttonup:
-      event->button.window = window;
-      if (window_private)
-       mask = window_private->event_mask;
-      else
-       mask = 0;
+      if (window != current_window)
+       synthesize_crossing_events (window, msg);
 
-      if (p_grab_window != NULL
-          && !p_grab_owner_events)
+      event->button.type = GDK_BUTTON_RELEASE;
+      if (!propagate (&window, msg,
+                     p_grab_window, p_grab_owner_events, p_grab_mask,
+                     doesnt_want_button_release))
        {
-         /* Pointer is grabbed with owner_events FALSE */
-         GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events FALSE\n"));
-         mask = p_grab_event_mask;
-         if (!(mask & GDK_BUTTON_RELEASE_MASK))
-           /* Grabber doesn't want it */
-           break;
-         else
-           event->button.window = (GdkWindow *) p_grab_window;
-         GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
-                                    p_grab_window->xwindow));
        }
-      else if (window_private
-              && !(mask & GDK_BUTTON_RELEASE_MASK))
+      else
        {
-         /* Owner window doesn't want it */
-         if (p_grab_window != NULL
-             && p_grab_owner_events)
-           {
-             /* Pointer is grabbed wíth owner_events TRUE */
-             GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events TRUE, doesn't want it\n"));
-             mask = p_grab_event_mask;
-             if (!(mask & GDK_BUTTON_RELEASE_MASK))
-               /* Grabber doesn't want it */
-               break;
-             else
-               event->button.window = (GdkWindow *) p_grab_window;
-             GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
-                                        p_grab_window->xwindow));
-           }
-         else
-           {
-             /* Owner doesn't want it, neither is it grabbed, so
-              * propagate to parent.
-              */
-             if (window_private->parent == (GdkWindow *) &gdk_root_parent)
-               break;
-             pt.x = LOWORD (xevent->lParam);
-             pt.y = HIWORD (xevent->lParam);
-             ClientToScreen (window_private->xwindow, &pt);
-             gdk_window_unref (window);
-             window = window_private->parent;
-             gdk_window_ref (window);
-             window_private = (GdkWindowPrivate *) window;
-             ScreenToClient (window_private->xwindow, &pt);
-             xevent->lParam = MAKELPARAM (pt.x, pt.y);
-             GDK_NOTE (EVENTS, g_print ("...propagating to %#x\n",
-                                        window_private->xwindow));
-             goto buttonup;
-           }
+         ASSIGN_WINDOW (window);
+
+         event->button.window = window;
+         event->button.time = msg->time;
+         if (window != orig_window)
+           translate_mouse_coords (orig_window, window, msg);
+         _gdk_windowing_window_get_offsets (window, &xoffset, &yoffset);
+         event->button.x = (gint16) LOWORD (msg->lParam) + xoffset;
+         event->button.y = (gint16) HIWORD (msg->lParam) + yoffset;
+         event->button.x_root = current_x_root = msg->pt.x;
+         event->button.y_root = current_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);
        }
 
-      if (window != curWnd)
-       synthesize_crossing_events (window, xevent);
-
-      event->button.time = xevent->time;
-      event->button.x = LOWORD (xevent->lParam);
-      event->button.y = HIWORD (xevent->lParam);
-      event->button.x_root = (gfloat)xevent->pt.x;
-      event->button.y_root = (gfloat)xevent->pt.y;
-      event->button.pressure = 0.5;
-      event->button.xtilt = 0;
-      event->button.ytilt = 0;
-      event->button.state = 0;
-      if (xevent->wParam & MK_CONTROL)
-       event->button.state |= GDK_CONTROL_MASK;
-      if (xevent->wParam & MK_LBUTTON)
-       event->button.state |= GDK_BUTTON1_MASK;
-      if (xevent->wParam & MK_MBUTTON)
-       event->button.state |= GDK_BUTTON2_MASK;
-      if (xevent->wParam & MK_RBUTTON)
-       event->button.state |= GDK_BUTTON3_MASK;
-      if (xevent->wParam & MK_SHIFT)
-       event->button.state |= GDK_SHIFT_MASK;
-      event->button.button = button;
-      event->button.source = GDK_SOURCE_MOUSE;
-      event->button.deviceid = GDK_CORE_POINTER;
-      return_val = window_private && !window_private->destroyed;
-      if (return_val
-         && p_grab_window != NULL
-         && event->any.window == (GdkWindow *) p_grab_window
-         && p_grab_window != window_private)
-       {
-         /* Translate coordinates to grabber */
-         pt.x = event->button.x;
-         pt.y = event->button.y;
-         ClientToScreen (window_private->xwindow, &pt);
-         ScreenToClient (p_grab_window->xwindow, &pt);
-         event->button.x = pt.x;
-         event->button.y = pt.y;
-         GDK_NOTE (EVENTS, g_print ("...new coords are +%d+%d\n", pt.x, pt.y));
-       }
       if (p_grab_window != NULL
          && p_grab_automatic
-         && (event->button.state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)) == 0)
+         && (msg->wParam & (MK_LBUTTON | MK_MBUTTON | MK_RBUTTON)) == 0)
        gdk_pointer_ungrab (0);
       break;
 
     case WM_MOUSEMOVE:
       GDK_NOTE (EVENTS,
-               g_print ("WM_MOUSEMOVE: %#x  %#x +%d+%d\n",
-                        xevent->hwnd, xevent->wParam,
-                        LOWORD (xevent->lParam), HIWORD (xevent->lParam)));
+               g_print ("WM_MOUSEMOVE: %p  %#x (%d,%d)\n",
+                        msg->hwnd, msg->wParam,
+                        LOWORD (msg->lParam), HIWORD (msg->lParam)));
 
-#if 0
-      /* Try hard not to generate events for windows that shouldn't
-        get any.  This is hard because we don't want pushbuttons to
-        highlight when the cursor moves over them if the window is
-        inactive. We dont want tooltips windows to be active. OTOH,
-        also menus are popup windows, but they definitely should
-        get events. Aw shit. Skip this.
+      ASSIGN_WINDOW (find_window_for_pointer_event (window, msg));
+
+      /* 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.
        */
-      dwStyle = GetWindowLong (xevent->hwnd, GWL_STYLE);
-      if (active == NULL ||
-         !(active == xevent->hwnd
-           || (dwStyle & WS_POPUP)
-           || IsChild (active, xevent->hwnd)))
+      if (window == current_window
+         && LOWORD (msg->lParam) == current_x
+         && HIWORD (msg->lParam) == current_y)
        break;
-#else
-      { /* HB: only process mouse move messages
-         * if we own the active window.
-         */
-         DWORD ProcessID_ActWin;
-         DWORD ProcessID_this;
-
-         GetWindowThreadProcessId(GetActiveWindow(), &ProcessID_ActWin);
-         GetWindowThreadProcessId(xevent->hwnd, &ProcessID_this);
-         if (ProcessID_ActWin != ProcessID_this)
-          break;
-     }
-#endif
-      if (window != curWnd)
-       synthesize_crossing_events (window, xevent);
 
-      if (window_private
-         && (window_private->extension_events != 0)
-         && gdk_input_ignore_core)
-       {
-         GDK_NOTE (EVENTS, g_print ("...ignored\n"));
-         break;
-       }
+      /* HB: only process mouse move messages if we own the active window. */
+      GetWindowThreadProcessId(GetActiveWindow(), &pidActWin);
+      GetWindowThreadProcessId(msg->hwnd, &pidThis);
+      if (pidActWin != pidThis)
+       break;
+
+      if (window != current_window)
+       synthesize_crossing_events (window, msg);
+
+      if (GDK_WINDOW_OBJECT (window)->extension_events != 0
+         && _gdk_input_ignore_core)
+       {
+         GDK_NOTE (EVENTS, g_print ("...ignored\n"));
+         break;
+       }
+
+      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);
+
+      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);
+      _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.axes = NULL;
+      event->motion.state = build_pointer_event_state (msg);
+      event->motion.is_hint = FALSE;
+      event->motion.device = _gdk_core_pointer;
+
+      return_val = !GDK_WINDOW_DESTROYED (window);
+      break;
+
+    case WM_NCMOUSEMOVE:
+      GDK_NOTE (EVENTS,
+               g_print ("WM_NCMOUSEMOVE: %p  x,y: %d %d\n",
+                        msg->hwnd,
+                        LOWORD (msg->lParam), HIWORD (msg->lParam)));
+      if (track_mouse_event == NULL
+         && current_window != NULL
+         && (GDK_WINDOW_OBJECT (current_window)->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;
+         _gdk_windowing_window_get_offsets (current_window, &xoffset, &yoffset);
+         event->crossing.x = current_x + xoffset;
+         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)
+       {
+         gdk_drawable_unref (current_window);
+         current_window = NULL;
+       }
+
+      break;
+
+    case WM_MOUSEWHEEL:
+      GDK_NOTE (EVENTS, g_print ("WM_MOUSEWHEEL: %p %d\n",
+                                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);
+       }
+
+      if (GDK_WINDOW_OBJECT (window)->extension_events != 0
+         && _gdk_input_ignore_core)
+       {
+         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;
+      _gdk_windowing_window_get_offsets (window, &xoffset, &yoffset);
+      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: %p\n", msg->hwnd));
 
-    mousemotion:
-      event->motion.type = GDK_MOTION_NOTIFY;
-      event->motion.window = window;
-      if (window_private)
-       mask = window_private->event_mask;
+      if (!(private->event_mask & GDK_LEAVE_NOTIFY_MASK))
+       break;
+
+      event->crossing.type = GDK_LEAVE_NOTIFY;
+      event->crossing.window = window;
+      event->crossing.subwindow = NULL;
+      event->crossing.time = msg->time;
+      _gdk_windowing_window_get_offsets (window, &xoffset, &yoffset);
+      event->crossing.x = current_x + xoffset;
+      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;
+      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;
       else
-       mask = 0;
+       event->crossing.detail = GDK_NOTIFY_NONLINEAR;
 
-      if (p_grab_window
-         && !p_grab_owner_events)
-       {
-         /* Pointer is grabbed with owner_events FALSE */
-         GDK_NOTE (EVENTS,
-                   g_print ("...grabbed, owner_events FALSE\n"));
-         mask = p_grab_event_mask;
-         if (!((mask & GDK_POINTER_MOTION_MASK)
-               || ((xevent->wParam & (MK_LBUTTON|MK_MBUTTON|MK_RBUTTON))
-                   && (mask & GDK_BUTTON_MOTION_MASK))
-               || ((xevent->wParam & MK_LBUTTON)
-                   && (mask & GDK_BUTTON1_MOTION_MASK))
-               || ((xevent->wParam & MK_MBUTTON)
-                   && (mask & GDK_BUTTON2_MOTION_MASK))
-               || ((xevent->wParam & MK_RBUTTON)
-                   && (mask & GDK_BUTTON3_MOTION_MASK))))
-           break;
-         else
-           event->motion.window = (GdkWindow *) p_grab_window;
-         GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
-                                    p_grab_window->xwindow));
-       }
-      else if (window_private
-              && !((mask & GDK_POINTER_MOTION_MASK)
-                   || ((xevent->wParam & (MK_LBUTTON|MK_MBUTTON|MK_RBUTTON))
-                       && (mask & GDK_BUTTON_MOTION_MASK))
-                   || ((xevent->wParam & MK_LBUTTON)
-                       && (mask & GDK_BUTTON1_MOTION_MASK))
-                   || ((xevent->wParam & MK_MBUTTON)
-                       && (mask & GDK_BUTTON2_MOTION_MASK))
-                   || ((xevent->wParam & MK_RBUTTON)
-                       && (mask & GDK_BUTTON3_MOTION_MASK))))
+      event->crossing.focus = TRUE; /* ??? */
+      event->crossing.state = 0; /* ??? */
+
+      if (current_window)
        {
-         /* Owner window doesn't want it */
-         if (p_grab_window != NULL
-             && p_grab_owner_events)
-           {
-             /* Pointer is grabbed wíth owner_events TRUE */
-             GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events TRUE, doesn't want it\n"));
-             mask = p_grab_event_mask;
-             if (!((p_grab_event_mask & GDK_POINTER_MOTION_MASK)
-                   || ((xevent->wParam & (MK_LBUTTON|MK_MBUTTON|MK_RBUTTON))
-                       && (mask & GDK_BUTTON_MOTION_MASK))
-                   || ((xevent->wParam & MK_LBUTTON)
-                       && (mask & GDK_BUTTON1_MOTION_MASK))
-                   || ((xevent->wParam & MK_MBUTTON)
-                       && (mask & GDK_BUTTON2_MOTION_MASK))
-                   || ((xevent->wParam & MK_RBUTTON)
-                       && (mask & GDK_BUTTON3_MOTION_MASK))))
-               /* Grabber doesn't want it either */
-               break;
-             else
-               event->motion.window = (GdkWindow *) p_grab_window;
-             GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
-                                        p_grab_window->xwindow));
-           }
-         else
-           {
-             /* Owner doesn't want it, neither is it grabbed, so
-              * propagate to parent.
-              */
-             if (window_private->parent == (GdkWindow *) &gdk_root_parent)
-               break;
-             pt.x = LOWORD (xevent->lParam);
-             pt.y = HIWORD (xevent->lParam);
-             ClientToScreen (window_private->xwindow, &pt);
-             gdk_window_unref (window);
-             window = window_private->parent;
-             gdk_window_ref (window);
-             window_private = (GdkWindowPrivate *) window;
-             ScreenToClient (window_private->xwindow, &pt);
-             xevent->lParam = MAKELPARAM (pt.x, pt.y);
-             GDK_NOTE (EVENTS, g_print ("...propagating to %#x\n",
-                                        window_private->xwindow));
-             goto mousemotion;
-           }
+         gdk_drawable_unref (current_window);
+         current_window = NULL;
        }
 
-      event->motion.time = xevent->time;
-      event->motion.x = curX = LOWORD (xevent->lParam);
-      event->motion.y = curY = HIWORD (xevent->lParam);
-      event->motion.x_root = xevent->pt.x;
-      event->motion.y_root = xevent->pt.y;
-      curXroot = event->motion.x_root;
-      curYroot = event->motion.y_root;
-      event->motion.pressure = 0.5;
-      event->motion.xtilt = 0;
-      event->motion.ytilt = 0;
-      event->button.state = 0;
-      if (xevent->wParam & MK_CONTROL)
-       event->button.state |= GDK_CONTROL_MASK;
-      if (xevent->wParam & MK_LBUTTON)
-       event->button.state |= GDK_BUTTON1_MASK;
-      if (xevent->wParam & MK_MBUTTON)
-       event->button.state |= GDK_BUTTON2_MASK;
-      if (xevent->wParam & MK_RBUTTON)
-       event->button.state |= GDK_BUTTON3_MASK;
-      if (xevent->wParam & MK_SHIFT)
-       event->button.state |= GDK_SHIFT_MASK;
-      if (mask & GDK_POINTER_MOTION_HINT_MASK)
-       event->motion.is_hint = NotifyHint;
-      else
-       event->motion.is_hint = NotifyNormal;
-      event->motion.source = GDK_SOURCE_MOUSE;
-      event->motion.deviceid = GDK_CORE_POINTER;
-
-      return_val = window_private && !window_private->destroyed;
-      if (return_val
-         && p_grab_window != NULL
-         && event->any.window == (GdkWindow *) p_grab_window
-         && p_grab_window != window_private)
+      return_val = !GDK_WINDOW_DESTROYED (window);
+      break;
+#endif
+       
+    case WM_QUERYNEWPALETTE:
+      GDK_NOTE (EVENTS_OR_COLORMAP, g_print ("WM_QUERYNEWPALETTE: %p\n",
+                                            msg->hwnd));
+      if (gdk_visual_get_system ()->type == GDK_VISUAL_PSEUDO_COLOR)
        {
-         /* Translate coordinates to grabber */
-         pt.x = event->motion.x;
-         pt.y = event->motion.y;
-         ClientToScreen (window_private->xwindow, &pt);
-         ScreenToClient (p_grab_window->xwindow, &pt);
-         event->motion.x = pt.x;
-         event->motion.y = pt.y;
-         GDK_NOTE (EVENTS, g_print ("...new coords are +%d+%d\n", pt.x, pt.y));
+         synthesize_expose_events (window);
+         update_colors_counter = 0;
        }
+      *ret_val_flagp = TRUE;
+      *ret_valp = FALSE;
       break;
 
-    case WM_NCMOUSEMOVE:
-      GDK_NOTE (EVENTS,
-               g_print ("WM_NCMOUSEMOVE: %#x  x,y: %d %d\n",
-                        xevent->hwnd,
-                        LOWORD (xevent->lParam), HIWORD (xevent->lParam)));
-#if 0
-      if (active == NULL || active != xevent->hwnd)
-       break;
-#endif
-      curWnd_private = (GdkWindowPrivate *) curWnd;
-      if (curWnd != NULL
-         && (curWnd_private->event_mask & GDK_LEAVE_NOTIFY_MASK))
-       {
-         GDK_NOTE (EVENTS, g_print ("...synthesizing LEAVE_NOTIFY event\n"));
+    case WM_PALETTECHANGED:
+      GDK_NOTE (EVENTS_OR_COLORMAP, g_print ("WM_PALETTECHANGED: %p %p\n",
+                                            msg->hwnd, (HWND) msg->wParam));
+      *ret_val_flagp = TRUE;
+      *ret_valp = FALSE;
 
-         event->crossing.type = GDK_LEAVE_NOTIFY;
-         event->crossing.window = curWnd;
-         event->crossing.subwindow = NULL;
-         event->crossing.time = xevent->time;
-         event->crossing.x = curX;
-         event->crossing.y = curY;
-         event->crossing.x_root = curXroot;
-         event->crossing.y_root = curYroot;
-         event->crossing.mode = GDK_CROSSING_NORMAL;
-         event->crossing.detail = GDK_NOTIFY_UNKNOWN;
+      if (gdk_visual_get_system ()->type != GDK_VISUAL_PSEUDO_COLOR)
+       break;
 
-         event->crossing.focus = TRUE; /* ??? */
-         event->crossing.state = 0; /* ??? */
-         gdk_window_unref (curWnd);
-         curWnd = NULL;
+      if (msg->hwnd == (HWND) msg->wParam)
+       break;
 
-         return_val = TRUE;
+      if (++update_colors_counter == 5)
+       {
+         synthesize_expose_events (window);
+         update_colors_counter = 0;
+         break;
        }
+      
+      update_colors (window, TRUE);
       break;
 
     case WM_SETFOCUS:
     case WM_KILLFOCUS:
-      if (window_private
-         && !(window_private->event_mask & GDK_FOCUS_CHANGE_MASK))
+      GDK_NOTE (EVENTS, g_print ("WM_%sFOCUS: %p\n",
+                                (msg->message == WM_SETFOCUS ?
+                                 "SET" : "KILL"),
+                                msg->hwnd));
+      
+      if (!(private->event_mask & GDK_FOCUS_CHANGE_MASK))
        break;
 
-      GDK_NOTE (EVENTS, g_print ("WM_%sFOCUS: %#x\n",
-                                (xevent->message == WM_SETFOCUS ? "SET" : "KILL"),
-                                xevent->hwnd));
-      
       event->focus_change.type = GDK_FOCUS_CHANGE;
       event->focus_change.window = window;
-      event->focus_change.in = (xevent->message == WM_SETFOCUS);
-      return_val = window_private && !window_private->destroyed;
+      event->focus_change.in = (msg->message == WM_SETFOCUS);
+      return_val = !GDK_WINDOW_DESTROYED (window);
       break;
-#if 0
-    case WM_ACTIVATE:
-      GDK_NOTE (EVENTS, g_print ("WM_ACTIVATE: %#x  %d\n",
-                                xevent->hwnd, LOWORD (xevent->wParam)));
-      if (LOWORD (xevent->wParam) == WA_INACTIVE)
-       active = (HWND) xevent->lParam;
-      else
-       active = xevent->hwnd;
-      break;
-#endif
+
     case WM_ERASEBKGND:
-      GDK_NOTE (EVENTS, g_print ("WM_ERASEBKGND: %#x  dc %#x\n",
-                                xevent->hwnd, xevent->wParam));
+      GDK_NOTE (EVENTS, g_print ("WM_ERASEBKGND: %p  dc %#x\n",
+                                msg->hwnd, msg->wParam));
       
-      if (!window_private || window_private->destroyed)
+      if (GDK_WINDOW_DESTROYED (window))
        break;
-      colormap_private = (GdkColormapPrivate *) window_private->colormap;
-      hdc = (HDC) xevent->wParam;
-      if (colormap_private
-         && colormap_private->xcolormap->rc_palette)
-       {
-         int k;
 
-         if (SelectPalette (hdc,  colormap_private->xcolormap->palette,
-                            FALSE) == NULL)
-           g_warning ("WM_ERASEBKGND: SelectPalette failed");
-         if ((k = RealizePalette (hdc)) == GDI_ERROR)
-           g_warning ("WM_ERASEBKGND: RealizePalette failed");
-#if 0
-         g_print ("WM_ERASEBKGND: selected %#x, realized %d colors\n",
-                  colormap_private->xcolormap->palette, k);
-#endif
-       }
-      *ret_val_flagp = TRUE;
+      erase_background (window, (HDC) msg->wParam);
+      *ret_val_flagp = TRUE; /* always claim as handled */
       *ret_valp = 1;
 
-      if (window_private->bg_type == GDK_WIN32_BG_TRANSPARENT)
-       break;
-
-      if (window_private->bg_type == GDK_WIN32_BG_PARENT_RELATIVE)
-       {
-         /* 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_private
-                && window_private->bg_type == GDK_WIN32_BG_PARENT_RELATIVE)
-           window_private = (GdkWindowPrivate *) window_private->parent;
-       }
-
-      if (window_private->bg_type == GDK_WIN32_BG_PIXEL)
-       {
-         COLORREF bg;
-         GDK_NOTE (EVENTS, g_print ("...BG_PIXEL %s\n",
-                                    gdk_color_to_string (&window_private->bg_pixel)));
-         GetClipBox (hdc, &rect);
-#ifdef MULTIPLE_WINDOW_CLASSES
-         bg = PALETTEINDEX (window_private->bg_pixel.pixel);
-#else
-         bg = GetNearestColor (hdc, RGB (window_private->bg_pixel.red >> 8,
-                                         window_private->bg_pixel.green >> 8,
-                                         window_private->bg_pixel.blue >> 8));
-#endif
-         hbr = CreateSolidBrush (bg);
-#if 0
-         g_print ("...CreateSolidBrush (%.08x) = %.08x\n", bg, hbr);
-#endif
-         if (!FillRect (hdc, &rect, hbr))
-           g_warning ("WM_ERASEBKGND: FillRect failed");
-         DeleteObject (hbr);
-       }
-      else if (window_private->bg_type == GDK_WIN32_BG_PIXMAP)
-       {
-         GdkPixmapPrivate *pixmap_private;
-         HDC bgdc;
-         HGDIOBJ oldbitmap;
-
-         pixmap_private = (GdkPixmapPrivate *) window_private->bg_pixmap;
-         GetClipBox (hdc, &rect);
+      break;
 
-         if (pixmap_private->width <= 8
-             && pixmap_private->height <= 8)
-           {
-             GDK_NOTE (EVENTS, g_print ("...small pixmap, using brush\n"));
-             hbr = CreatePatternBrush (pixmap_private->xwindow);
-             if (!FillRect (hdc, &rect, hbr))
-               g_warning ("WM_ERASEBKGND: FillRect failed");
-             DeleteObject (hbr);
-           }
-         else
-           {
-             GDK_NOTE (EVENTS,
-                       g_print ("...blitting pixmap %#x (%dx%d) "
-                                "all over the place,\n"
-                                "...clip box = %dx%d@+%d+%d\n",
-                                pixmap_private->xwindow,
-                                pixmap_private->width, pixmap_private->height,
-                                rect.right - rect.left, rect.bottom - rect.top,
-                                rect.left, rect.top));
-
-             if (!(bgdc = CreateCompatibleDC (hdc)))
-               {
-                 g_warning ("WM_ERASEBKGND: CreateCompatibleDC failed");
-                 break;
-               }
-             if (!(oldbitmap = SelectObject (bgdc, pixmap_private->xwindow)))
-               {
-                 g_warning ("WM_ERASEBKGND: SelectObject failed");
-                 DeleteDC (bgdc);
-                 break;
-               }
-             i = 0;
-             while (i < rect.right)
-               {
-                 j = 0;
-                 while (j < rect.bottom)
-                   {
-                     if (i + pixmap_private->width >= rect.left
-                         && j + pixmap_private->height >= rect.top)
-                       {
-                         if (!BitBlt (hdc, i, j,
-                                      pixmap_private->width, pixmap_private->height,
-                                      bgdc, 0, 0, SRCCOPY))
-                           {
-                             g_warning ("WM_ERASEBKGND: BitBlt failed");
-                             goto loopexit;
-                           }
-                       }
-                     j += pixmap_private->height;
-                   }
-                 i += pixmap_private->width;
-               }
-           loopexit:
-             SelectObject (bgdc, oldbitmap);
-             DeleteDC (bgdc);
-           }
-       }
-      else
+    case WM_PAINT:
+      if (!GetUpdateRect (msg->hwnd, NULL, FALSE))
        {
-         GDK_NOTE (EVENTS, g_print ("...BLACK_BRUSH (?)\n"));
-#ifdef MULTIPLE_WINDOW_CLASSES
-         hbr = (HBRUSH) GetClassLong (window_private->xwindow,
-                                      GCL_HBRBACKGROUND);
-#else
-         hbr = GetStockObject (BLACK_BRUSH);
-#endif
-         GetClipBox (hdc, &rect);
-         if (!FillRect (hdc, &rect, hbr))
-           g_warning ("WM_ERASEBKGND: FillRect failed");
+          GDK_NOTE (EVENTS, g_print ("WM_PAINT: %p no update rgn\n",
+                                    msg->hwnd));
+         break;
        }
-      break;
 
-    case WM_PAINT:
-      hdc = BeginPaint (xevent->hwnd, &paintstruct);
+      hdc = BeginPaint (msg->hwnd, &paintstruct);
 
       GDK_NOTE (EVENTS,
-               g_print ("WM_PAINT: %#x  %dx%d@+%d+%d %s dc %#x\n",
-                        xevent->hwnd,
+               g_print ("WM_PAINT: %p  %ldx%ld@+%ld+%ld %s dc %p\n",
+                        msg->hwnd,
                         paintstruct.rcPaint.right - paintstruct.rcPaint.left,
                         paintstruct.rcPaint.bottom - paintstruct.rcPaint.top,
                         paintstruct.rcPaint.left, paintstruct.rcPaint.top,
                         (paintstruct.fErase ? "erase" : ""),
                         hdc));
 
-      EndPaint (xevent->hwnd, &paintstruct);
+      EndPaint (msg->hwnd, &paintstruct);
 
-      if (window_private
-         && !(window_private->event_mask & GDK_EXPOSURE_MASK))
+      /* HB: don't generate GDK_EXPOSE events for InputOnly
+       * windows -> backing store now works!
+       */
+      if (GDK_WINDOW_OBJECT (window)->input_only)
        break;
 
-      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.count = 1;
+      if (!(private->event_mask & GDK_EXPOSURE_MASK))
+       break;
 
-      return_val = window_private && !window_private->destroyed;
-      break;
+#if 0 /* we need to process exposes even with GDK_NO_BG
+       * Otherwise The GIMP canvas update is broken ....
+       */
+      if (GDK_WINDOW_OBJECT (window)->bg_pixmap == GDK_NO_BG)
+       break;
+#endif
 
-#ifndef MULTIPLE_WINDOW_CLASSES
-    case WM_SETCURSOR:
-      GDK_NOTE (EVENTS, g_print ("WM_SETCURSOR: %#x %#x %#x\n",
-                                xevent->hwnd,
-                                LOWORD (xevent->lParam), HIWORD (xevent->lParam)));
+      if ((paintstruct.rcPaint.right == paintstruct.rcPaint.left)
+          || (paintstruct.rcPaint.bottom == paintstruct.rcPaint.top))
+        break;
 
-      return_val = FALSE;
-      if (LOWORD (xevent->lParam) != HTCLIENT)
-       break;
-      if (p_grab_window != NULL && p_grab_cursor != NULL)
-       SetCursor (p_grab_cursor);
-      else if (window_private
-              && !window_private->destroyed
-              && window_private->xcursor)
-       SetCursor (window_private->xcursor);
-      *ret_val_flagp = TRUE;
-      *ret_valp = FALSE;
+      if (return_exposes)
+        {
+         hrgn = CreateRectRgn (0, 0, 0, 0);
+         if ((k = GetUpdateRgn (msg->hwnd, hrgn, FALSE)) == ERROR)
+           WIN32_GDI_FAILED ("GetUpdateRgn");
+         else if (k == NULLREGION)
+           {
+             DeleteObject (hrgn);
+             break;
+           }
+
+          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_win32_hrgn_to_region (hrgn);
+          event->expose.count = 0;
+
+         DeleteObject (hrgn);
+
+          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;
+
+         _gdk_windowing_window_get_offsets (window, &xoffset, &yoffset);
+          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;
+
+           _gdk_window_process_expose (window, msg->time, &expose_rect);
+
+           return_val = FALSE;
+        }
       break;
-#endif
 
-#if 0
-    case WM_QUERYOPEN:
-      GDK_NOTE (EVENTS, g_print ("WM_QUERYOPEN: %#x\n",
-                                xevent->hwnd));
-      *ret_val_flagp = TRUE;
-      *ret_valp = TRUE;
+    case WM_GETICON:
+      GDK_NOTE (EVENTS, g_print ("WM_GETICON: %p %s\n",
+                                msg->hwnd, 
+                                (ICON_BIG == msg->wParam ? "big" : "small")));
+      break;
+    case WM_SETCURSOR:
+      GDK_NOTE (EVENTS, g_print ("WM_SETCURSOR: %p %#x %#x\n",
+                                msg->hwnd,
+                                LOWORD (msg->lParam), HIWORD (msg->lParam)));
 
-      if (window_private
-         && !(window_private->event_mask & GDK_STRUCTURE_MASK))
+      if (LOWORD (msg->lParam) != HTCLIENT)
        break;
 
-      event->any.type = GDK_MAP;
-      event->any.window = window;
+      if (p_grab_window != NULL && p_grab_cursor != NULL)
+       hcursor = p_grab_cursor;
+      else if (!GDK_WINDOW_DESTROYED (window))
+       hcursor = GDK_WINDOW_IMPL_WIN32 (private->impl)->hcursor;
+      else
+       hcursor = NULL;
 
-      return_val = window_private && !window_private->destroyed;
+      if (hcursor != NULL)
+       {
+         GDK_NOTE (EVENTS, g_print ("...SetCursor(%p)\n", hcursor));
+         SetCursor (hcursor);
+         *ret_val_flagp = TRUE;
+         *ret_valp = TRUE;
+       }
       break;
-#endif
 
-#if 1
     case WM_SHOWWINDOW:
-      GDK_NOTE (EVENTS, g_print ("WM_SHOWWINDOW: %#x  %d\n",
-                                xevent->hwnd,
-                                xevent->wParam));
+      GDK_NOTE (EVENTS, g_print ("WM_SHOWWINDOW: %p  %d\n",
+                                msg->hwnd, msg->wParam));
 
-      if (window_private
-         && !(window_private->event_mask & GDK_STRUCTURE_MASK))
+      if (!(private->event_mask & GDK_STRUCTURE_MASK))
        break;
 
-      event->any.type = (xevent->wParam ? GDK_MAP : GDK_UNMAP);
+      event->any.type = (msg->wParam ? GDK_MAP : GDK_UNMAP);
       event->any.window = window;
 
       if (event->any.type == GDK_UNMAP
-         && p_grab_window == window_private)
-       gdk_pointer_ungrab (xevent->time);
+         && p_grab_window == window)
+       gdk_pointer_ungrab (msg->time);
 
       if (event->any.type == GDK_UNMAP
-         && k_grab_window == window_private)
-       gdk_keyboard_ungrab (xevent->time);
+         && k_grab_window == window)
+       gdk_keyboard_ungrab (msg->time);
 
-      return_val = window_private && !window_private->destroyed;
+      return_val = !GDK_WINDOW_DESTROYED (window);
       break;
-#endif
+
     case WM_SIZE:
       GDK_NOTE (EVENTS,
-               g_print ("WM_SIZE: %#x  %s %dx%d\n",
-                        xevent->hwnd,
-                        (xevent->wParam == SIZE_MAXHIDE ? "MAXHIDE" :
-                         (xevent->wParam == SIZE_MAXIMIZED ? "MAXIMIZED" :
-                          (xevent->wParam == SIZE_MAXSHOW ? "MAXSHOW" :
-                           (xevent->wParam == SIZE_MINIMIZED ? "MINIMIZED" :
-                            (xevent->wParam == SIZE_RESTORED ? "RESTORED" : "?"))))),
-                        LOWORD (xevent->lParam), HIWORD (xevent->lParam)));
-
-      if (window_private
-         && !(window_private->event_mask & GDK_STRUCTURE_MASK))
+               g_print ("WM_SIZE: %p  %s %dx%d\n",
+                        msg->hwnd,
+                        (msg->wParam == SIZE_MAXHIDE ? "MAXHIDE" :
+                         (msg->wParam == SIZE_MAXIMIZED ? "MAXIMIZED" :
+                          (msg->wParam == SIZE_MAXSHOW ? "MAXSHOW" :
+                           (msg->wParam == SIZE_MINIMIZED ? "MINIMIZED" :
+                            (msg->wParam == SIZE_RESTORED ? "RESTORED" : "?"))))),
+                        LOWORD (msg->lParam), HIWORD (msg->lParam)));
+
+      if (!(private->event_mask & GDK_STRUCTURE_MASK))
        break;
-      if (window_private != NULL
-         && xevent->wParam == SIZE_MINIMIZED)
+
+      if (msg->wParam == SIZE_MINIMIZED)
        {
-#if 1
          event->any.type = GDK_UNMAP;
          event->any.window = window;
 
-         if (p_grab_window == window_private)
-           gdk_pointer_ungrab (xevent->time);
+         if (p_grab_window == window)
+           gdk_pointer_ungrab (msg->time);
 
-         if (k_grab_window == window_private)
-           gdk_keyboard_ungrab (xevent->time);
+         if (k_grab_window == window)
+           gdk_keyboard_ungrab (msg->time);
 
-         return_val = !window_private->destroyed;
-#endif
+         return_val = !GDK_WINDOW_DESTROYED (window);
        }
-      else if (window_private != NULL
-              && (xevent->wParam == SIZE_RESTORED
-                  || xevent->wParam == SIZE_MAXIMIZED)
+      else if ((msg->wParam == SIZE_RESTORED
+               || msg->wParam == SIZE_MAXIMIZED)
 #if 1
-              && window_private->window_type != GDK_WINDOW_CHILD
+              && GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD
 #endif
                                                                 )
        {
-         if (LOWORD (xevent->lParam) == 0)
+         if (LOWORD (msg->lParam) == 0)
            break;
 
          event->configure.type = GDK_CONFIGURE;
          event->configure.window = window;
          pt.x = 0;
          pt.y = 0;
-         ClientToScreen (xevent->hwnd, &pt);
+         ClientToScreen (msg->hwnd, &pt);
          event->configure.x = pt.x;
          event->configure.y = pt.y;
-         event->configure.width = LOWORD (xevent->lParam);
-         event->configure.height = HIWORD (xevent->lParam);
-         window_private->x = event->configure.x;
-         window_private->y = event->configure.y;
-         window_private->width = event->configure.width;
-         window_private->height = event->configure.height;
-         if (window_private->resize_count > 1)
-           window_private->resize_count -= 1;
+         event->configure.width = LOWORD (msg->lParam);
+         event->configure.height = HIWORD (msg->lParam);
+         private->x = event->configure.x;
+         private->y = event->configure.y;
+         GDK_WINDOW_IMPL_WIN32 (private->impl)->width = event->configure.width;
+         GDK_WINDOW_IMPL_WIN32 (private->impl)->height = event->configure.height;
+
+         if (private->resize_count > 1)
+           private->resize_count -= 1;
          
-         return_val = !window_private->destroyed;
-         if (return_val
-             && window_private->extension_events != 0
-             && gdk_input_vtable.configure_event)
-           gdk_input_vtable.configure_event (&event->configure, window);
+         return_val = !GDK_WINDOW_DESTROYED (window);
+         if (return_val && private->extension_events != 0)
+           _gdk_input_configure_event (&event->configure, window);
        }
       break;
+#if 0
+    case WM_SIZING :
+      {
+        LPRECT lpr = (LPRECT) msg->lParam;
+        NONCLIENTMETRICS ncm;
+        ncm.cbSize = sizeof (NONCLIENTMETRICS);
 
-    case WM_SIZING:
-      GDK_NOTE (EVENTS, g_print ("WM_SIZING: %#x\n", xevent->hwnd));
-      if (ret_val_flagp == NULL)
-         g_warning ("ret_val_flagp is NULL but we got a WM_SIZING?");
-      else if (window_private != NULL
-              && window_private->hint_flags &
-              (GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE))
-       {
-         LPRECT lprc = (LPRECT) xevent->lParam;
+        SystemParametersInfo (SPI_GETNONCLIENTMETRICS, ncm.cbSize, &ncm, 0);
 
-         if (window_private->hint_flags & GDK_HINT_MIN_SIZE)
-           {
-             gint w = lprc->right - lprc->left;
-             gint h = lprc->bottom - lprc->top;
+        g_print ("WM_SIZING borderWidth %d captionHeight %d\n",
+                 ncm.iBorderWidth, ncm.iCaptionHeight);
+         event->configure.type = GDK_CONFIGURE;
+         event->configure.window = window;
 
-             if (w < window_private->hint_min_width)
-               {
-                 if (xevent->wParam == WMSZ_BOTTOMLEFT
-                     || xevent->wParam == WMSZ_LEFT
-                     || xevent->wParam == WMSZ_TOPLEFT)
-                   lprc->left = lprc->right - window_private->hint_min_width;
-                 else
-                   lprc->right = lprc->left + window_private->hint_min_width;
-                 *ret_val_flagp = TRUE;
-                 *ret_valp = TRUE;
-               }
-             if (h < window_private->hint_min_height)
-               {
-                 if (xevent->wParam == WMSZ_BOTTOMLEFT
-                     || xevent->wParam == WMSZ_BOTTOM
-                     || xevent->wParam == WMSZ_BOTTOMRIGHT)
-                   lprc->bottom = lprc->top + window_private->hint_min_height;
-                 else
-                   lprc->top = lprc->bottom - window_private->hint_min_height;
-                 *ret_val_flagp = TRUE;
-                 *ret_valp = TRUE;
-               }
-           }
-         if (window_private->hint_flags & GDK_HINT_MAX_SIZE)
-           {
-             gint w = lprc->right - lprc->left;
-             gint h = lprc->bottom - lprc->top;
+         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;
+         private->x = event->configure.x;
+         private->y = event->configure.y;
+         GDK_WINDOW_IMPL_WIN32 (private->impl)->width = event->configure.width;
+         GDK_WINDOW_IMPL_WIN32 (private->impl)->height = event->configure.height;
+
+         if (private->resize_count > 1)
+           private->resize_count -= 1;
+
+         return_val = !GDK_WINDOW_DESTROYED (window);
+         if (return_val && private->extension_events != 0)
+           _gdk_input_configure_event (&event->configure, window);
+      }
+      break;
+#endif
+    case WM_GETMINMAXINFO:
+      GDK_NOTE (EVENTS, g_print ("WM_GETMINMAXINFO: %p\n", msg->hwnd));
 
-             if (w > window_private->hint_max_width)
-               {
-                 if (xevent->wParam == WMSZ_BOTTOMLEFT
-                     || xevent->wParam == WMSZ_LEFT
-                     || xevent->wParam == WMSZ_TOPLEFT)
-                   lprc->left = lprc->right - window_private->hint_max_width;
-                 else
-                   lprc->right = lprc->left + window_private->hint_max_width;
-                 *ret_val_flagp = TRUE;
-                 *ret_valp = TRUE;
-               }
-             if (h > window_private->hint_max_height)
-               {
-                 if (xevent->wParam == WMSZ_BOTTOMLEFT
-                     || xevent->wParam == WMSZ_BOTTOM
-                     || xevent->wParam == WMSZ_BOTTOMRIGHT)
-                   lprc->bottom = lprc->top + window_private->hint_max_height;
-                 else
-                   lprc->top = lprc->bottom - window_private->hint_max_height;
-                 *ret_val_flagp = TRUE;
-                 *ret_valp = TRUE;
-               }
-           }
+      impl = GDK_WINDOW_IMPL_WIN32 (private->impl);
+      mmi = (MINMAXINFO*) msg->lParam;
+      if (impl->hint_flags & GDK_HINT_MIN_SIZE)
+       {
+         mmi->ptMinTrackSize.x = impl->hint_min_width;
+         mmi->ptMinTrackSize.y = impl->hint_min_height;
+       }
+      if (impl->hint_flags & GDK_HINT_MAX_SIZE)
+       {
+         mmi->ptMaxTrackSize.x = impl->hint_max_width;
+         mmi->ptMaxTrackSize.y = impl->hint_max_height;
+
+         /* kind of WM functionality, limit maximized size to screen */
+         mmi->ptMaxPosition.x = 0;
+         mmi->ptMaxPosition.y = 0;         
+         mmi->ptMaxSize.x = MIN (impl->hint_max_width, gdk_screen_width ());
+         mmi->ptMaxSize.y = MIN (impl->hint_max_height, gdk_screen_height ());
        }
+      else if (impl->hint_flags & GDK_HINT_MIN_SIZE)
+       {
+         /* need to initialize */
+         mmi->ptMaxSize.x = gdk_screen_width ();
+         mmi->ptMaxSize.y = gdk_screen_height ();
+       }
+      /* lovely API inconsistence: return FALSE when handled */
+      if (ret_val_flagp)
+       *ret_val_flagp = !(impl->hint_flags & (GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE));
       break;
 
     case WM_MOVE:
-      GDK_NOTE (EVENTS, g_print ("WM_MOVE: %#x  +%d+%d\n",
-                                xevent->hwnd,
-                                LOWORD (xevent->lParam), HIWORD (xevent->lParam)));
+      GDK_NOTE (EVENTS, g_print ("WM_MOVE: %p  (%d,%d)\n",
+                                msg->hwnd,
+                                LOWORD (msg->lParam), HIWORD (msg->lParam)));
 
-      if (window_private
-         && !(window_private->event_mask & GDK_STRUCTURE_MASK))
+      if (!(private->event_mask & GDK_STRUCTURE_MASK))
        break;
-      if (window_private != NULL
-         && window_private->window_type != GDK_WINDOW_CHILD)
+
+      if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD
+         && !IsIconic(msg->hwnd)
+          && IsWindowVisible(msg->hwnd))
        {
          event->configure.type = GDK_CONFIGURE;
          event->configure.window = window;
-         event->configure.x = LOWORD (xevent->lParam);
-         event->configure.y = HIWORD (xevent->lParam);
-         GetClientRect (xevent->hwnd, &rect);
+         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;
-         window_private->x = event->configure.x;
-         window_private->y = event->configure.y;
-         window_private->width = event->configure.width;
-         window_private->height = event->configure.height;
+         private->x = event->configure.x;
+         private->y = event->configure.y;
+         GDK_WINDOW_IMPL_WIN32 (private->impl)->width = event->configure.width;
+         GDK_WINDOW_IMPL_WIN32 (private->impl)->height = event->configure.height;
          
-         return_val = !window_private->destroyed;
+         return_val = !GDK_WINDOW_DESTROYED (window);
        }
       break;
 
+#if 0 /* Not quite right, otherwise it may be faster/better than
+       * WM_(MOVE|SIZE) remove decoration (frame) sizes ?
+       */
+    case WM_WINDOWPOSCHANGED :
+
+      if (!(private->event_mask & GDK_STRUCTURE_MASK))
+       break;
+
+      if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD
+         && !IsIconic(msg->hwnd)
+          && IsWindowVisible(msg->hwnd))
+       {
+         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;
+         private->x = event->configure.x;
+         private->y = event->configure.y;
+         GDK_WINDOW_IMPL_WIN32 (private->impl)->width = event->configure.width;
+         GDK_WINDOW_IMPL_WIN32 (private->impl)->height = event->configure.height;
+         
+         return_val = !GDK_WINDOW_DESTROYED (window);
+
+          GDK_NOTE (EVENTS, g_print ("WM_WINDOWPOSCHANGED: %p  %ldx%ld@+%ld+%ld\n",
+                                    msg->hwnd,
+                                    lpwp->cx, lpwp->cy, lpwp->x, lpwp->y));
+
+         if (ret_val_flagp)
+           *ret_val_flagp = TRUE;
+         if (ret_valp)
+           *ret_valp = 0;
+       }
+      break;
+#endif
     case WM_CLOSE:
-      GDK_NOTE (EVENTS, g_print ("WM_CLOSE: %#x\n", xevent->hwnd));
+      GDK_NOTE (EVENTS, g_print ("WM_CLOSE: %p\n", msg->hwnd));
+
       event->any.type = GDK_DELETE;
       event->any.window = window;
       
-      return_val = window_private && !window_private->destroyed;
+      return_val = !GDK_WINDOW_DESTROYED (window);
       break;
 
 #if 0
@@ -2679,33 +3238,32 @@ gdk_event_translate (GdkEvent *event,
     case WM_RENDERALLFORMATS:
       flag = FALSE;
       GDK_NOTE (EVENTS, flag = TRUE);
-      GDK_NOTE (SELECTION, flag = TRUE);
       if (flag)
-       g_print ("WM_%s: %#x %#x (%s)\n",
-                (xevent->message == WM_RENDERFORMAT ? "RENDERFORMAT" :
+       g_print ("WM_%s: %p %#x (%s)\n",
+                (msg->message == WM_RENDERFORMAT ? "RENDERFORMAT" :
                  "RENDERALLFORMATS"),
-                xevent->hwnd,
-                xevent->wParam,
-                (xevent->wParam == CF_TEXT ? "CF_TEXT" :
-                 (xevent->wParam == CF_DIB ? "CF_DIB" :
-                  (xevent->wParam == CF_UNICODETEXT ? "CF_UNICODETEXT" :
-                   (GetClipboardFormatName (xevent->wParam, buf, sizeof (buf)), buf)))));
+                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)))));
 
 #if 0
       event->selection.type = GDK_SELECTION_REQUEST;
       event->selection.window = window;
       event->selection.selection = gdk_clipboard_atom;
-      if (xevent->wParam == CF_TEXT)
+      if (msg->wParam == CF_TEXT)
        event->selection.target = GDK_TARGET_STRING;
       else
        {
-         GetClipboardFormatName (xevent->wParam, buf, sizeof (buf));
+         GetClipboardFormatName (msg->wParam, buf, sizeof (buf));
          event->selection.target = gdk_atom_intern (buf, FALSE);
        }
-      event->selection.property = gdk_selection_property;
-      event->selection.requestor = (guint32) xevent->hwnd;
-      event->selection.time = xevent->time;
-      return_val = window_private && !window_private->destroyed;
+      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.
@@ -2716,7 +3274,7 @@ gdk_event_translate (GdkEvent *event,
        strcpy (ptr, "Huhhaa");
        GlobalUnlock (hdata);
        if (!SetClipboardData (CF_TEXT, hdata))
-         g_print ("SetClipboardData failed: %d\n", GetLastError ());
+         WIN32_API_FAILED ("SetClipboardData");
       }
       *ret_valp = 0;
       *ret_val_flagp = TRUE;
@@ -2726,58 +3284,74 @@ gdk_event_translate (GdkEvent *event,
 #endif /* No delayed rendering */
 
     case WM_DESTROY:
-      GDK_NOTE (EVENTS, g_print ("WM_DESTROY: %#x\n", xevent->hwnd));
+      GDK_NOTE (EVENTS, g_print ("WM_DESTROY: %p\n", msg->hwnd));
+
       event->any.type = GDK_DESTROY;
       event->any.window = window;
-      if (window != NULL && window == curWnd)
+      if (window != NULL && window == current_window)
        {
-         gdk_window_unref (curWnd);
-         curWnd = NULL;
+         gdk_drawable_unref (current_window);
+         current_window = NULL;
        }
 
-      if (p_grab_window == window_private)
-       gdk_pointer_ungrab (xevent->time);
+      if (p_grab_window == window)
+       gdk_pointer_ungrab (msg->time);
+
+      if (k_grab_window == window)
+       gdk_keyboard_ungrab (msg->time);
 
-      if (k_grab_window == window_private)
-       gdk_keyboard_ungrab (xevent->time);
+      return_val = window != NULL && !GDK_WINDOW_DESTROYED (window);
+
+      if ((window != NULL) && (gdk_root_window != msg->hwnd))
+       gdk_window_destroy_notify (window);
 
-      return_val = window_private && !window_private->destroyed;
       break;
 
+#ifdef HAVE_WINTAB
       /* 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: %d %#x\n",
-                                xevent->wParam, xevent->lParam));
+      GDK_NOTE (EVENTS, g_print ("WT_PACKET: %p %d %#lx\n",
+                                msg->hwnd, msg->wParam, msg->lParam));
       goto wintab;
       
     case WT_CSRCHANGE:
-      GDK_NOTE (EVENTS, g_print ("WT_CSRCHANGE: %d %#x\n",
-                                xevent->wParam, xevent->lParam));
+      GDK_NOTE (EVENTS, g_print ("WT_CSRCHANGE: %p %d %#lx\n",
+                                msg->hwnd, msg->wParam, msg->lParam));
       goto wintab;
       
     case WT_PROXIMITY:
-      GDK_NOTE (EVENTS,
-               g_print ("WT_PROXIMITY: %#x %d %d\n",
-                        xevent->wParam,
-                        LOWORD (xevent->lParam), HIWORD (xevent->lParam)));
+      GDK_NOTE (EVENTS, g_print ("WT_PROXIMITY: %p %#x %d %d\n",
+                                msg->hwnd, msg->wParam,
+                                LOWORD (msg->lParam),
+                                HIWORD (msg->lParam)));
+      /* Fall through */
     wintab:
-      return_val = gdk_input_vtable.other_event(event, xevent);
+      event->any.window = window;
+      return_val = _gdk_input_other_event(event, msg, window);
       break;
+#endif
+
+    default:
+      GDK_NOTE (EVENTS, g_print ("%s: %p %#x %#lx\n",
+                                gdk_win32_message_name (msg->message),
+                                msg->hwnd, msg->wParam, msg->lParam));
     }
 
-bypass_switch:
+done:
 
   if (return_val)
     {
       if (event->any.window)
-       gdk_window_ref (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_window_ref (event->crossing.subwindow);
+       gdk_drawable_ref (event->crossing.subwindow);
+
+      GDK_NOTE (EVENTS, print_event (event));
     }
   else
     {
@@ -2787,54 +3361,62 @@ bypass_switch:
     }
 
   if (window)
-    gdk_window_unref (window);
+    gdk_drawable_unref (window);
   
   return return_val;
 }
 
-static void
-gdk_events_queue (void)
+void
+_gdk_events_queue (void)
 {
-  GList *node;
-  GdkEvent *event;
   MSG msg;
+  GdkEvent *event;
+  GList *node;
 
-  GDK_NOTE (EVENTS, g_print ("gdk_events_queue: %s\n",
-                            (queued_events ? "yes" : "none")));
-
-  while (!gdk_event_queue_find_first()
+  while (!_gdk_event_queue_find_first ()
         && PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
     {
-      GDK_NOTE (EVENTS, g_print ("gdk_events_queue: got event\n"));
+#ifndef HAVE_DIMM_H
       TranslateMessage (&msg);
+#else
+      if (active_imm_msgpump_owner == NULL
+         || (active_imm_msgpump_owner->lpVtbl->OnTranslateMessage) (active_imm_msgpump_owner, &msg) != S_OK)
+       TranslateMessage (&msg);
+#endif
 
-      event = gdk_event_new ();
+#if 1 /* It was like this all the time */
+      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 = FALSE;
+      event->any.send_event = InSendMessage ();
 
       ((GdkEventPrivate *)event)->flags |= GDK_EVENT_PENDING;
 
-      gdk_event_queue_append (event);
-      node = queued_tail;
+      _gdk_event_queue_append (event);
+      node = _gdk_queued_tail;
 
-      if (gdk_event_translate (event, &msg, NULL, NULL))
+      if (gdk_event_translate (event, &msg, NULL, NULL, FALSE))
+       {
          ((GdkEventPrivate *)event)->flags &= ~GDK_EVENT_PENDING;
+       }
       else
        {
-         DefWindowProc (msg.hwnd, msg.message, msg.wParam, msg.lParam);
-         gdk_event_queue_remove_link (node);
+         _gdk_event_queue_remove_link (node);
          g_list_free_1 (node);
          gdk_event_free (event);
+        DispatchMessage (&msg);
        }
+
+#endif
     }
 }
 
-static gboolean  
-gdk_event_prepare (gpointer  source_data, 
-                  GTimeVal *current_time,
-                  gint     *timeout)
+static gboolean
+gdk_event_prepare (GSource *source,
+                  gint    *timeout)
 {
   MSG msg;
   gboolean retval;
@@ -2843,9 +3425,7 @@ gdk_event_prepare (gpointer  source_data,
 
   *timeout = -1;
 
-  GDK_NOTE (EVENTS, g_print ("gdk_event_prepare\n"));
-
-  retval = (gdk_event_queue_find_first () != NULL)
+  retval = (_gdk_event_queue_find_first () != NULL)
              || PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE);
 
   GDK_THREADS_LEAVE ();
@@ -2853,19 +3433,16 @@ gdk_event_prepare (gpointer  source_data,
   return retval;
 }
 
-static gboolean  
-gdk_event_check (gpointer  source_data,
-                GTimeVal *current_time)
+static gboolean
+gdk_event_check (GSource *source)
 {
   MSG msg;
   gboolean retval;
   
-  GDK_NOTE (EVENTS, g_print ("gdk_event_check\n"));
-
   GDK_THREADS_ENTER ();
 
   if (event_poll_fd.revents & G_IO_IN)
-    retval = (gdk_event_queue_find_first () != NULL)
+    retval = (_gdk_event_queue_find_first () != NULL)
              || PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE);
   else
     retval = FALSE;
@@ -2875,42 +3452,22 @@ gdk_event_check (gpointer  source_data,
   return retval;
 }
 
-static GdkEvent*
-gdk_event_unqueue (void)
-{
-  GdkEvent *event = NULL;
-  GList *tmp_list;
-
-  tmp_list = gdk_event_queue_find_first ();
-
-  if (tmp_list)
-    {
-      event = tmp_list->data;
-      gdk_event_queue_remove_link (tmp_list);
-      g_list_free_1 (tmp_list);
-    }
-
-  return event;
-}
-
-static gboolean  
-gdk_event_dispatch (gpointer  source_data,
-                   GTimeVal *current_time,
-                   gpointer  user_data)
+static gboolean
+gdk_event_dispatch (GSource     *source,
+                   GSourceFunc  callback,
+                   gpointer     user_data)
 {
   GdkEvent *event;
  
-  GDK_NOTE (EVENTS, g_print ("gdk_event_dispatch\n"));
-
   GDK_THREADS_ENTER ();
 
-  gdk_events_queue();
-  event = gdk_event_unqueue();
+  _gdk_events_queue();
+  event = _gdk_event_unqueue();
 
   if (event)
     {
-      if (event_func)
-       (*event_func) (event, event_data);
+      if (_gdk_event_func)
+       (*_gdk_event_func) (event, _gdk_event_data);
       
       gdk_event_free (event);
     }
@@ -2920,20 +3477,6 @@ gdk_event_dispatch (gpointer  source_data,
   return TRUE;
 }
 
-static void
-gdk_synthesize_click (GdkEvent *event,
-                     gint      nclicks)
-{
-  GdkEvent temp_event;
-  
-  g_return_if_fail (event != NULL);
-  
-  temp_event = *event;
-  temp_event.type = (nclicks == 2) ? GDK_2BUTTON_PRESS : GDK_3BUTTON_PRESS;
-  
-  gdk_event_put (&temp_event);
-}
-
 /* Sends a ClientMessage to all toplevel client windows */
 gboolean
 gdk_event_send_client_message (GdkEvent *event, guint32 xid)
@@ -2948,3 +3491,257 @@ gdk_event_send_clientmessage_toall (GdkEvent *event)
   /* XXX */
 }
 
+void
+gdk_flush (void)
+{
+#if 0
+  MSG msg;
+
+  /* Process all messages currently available */
+  while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
+    {
+      TranslateMessage (&msg);
+      DispatchMessage (&msg);
+    }
+#endif
+
+  GdiFlush ();
+}
+
+#ifdef G_ENABLE_DEBUG
+
+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 ();
+}
+      
+#endif /* G_ENABLE_DEBUG */