]> Pileus Git - ~andy/gtk/blobdiff - gdk/win32/gdkevents-win32.c
Handle also WM_SYSCHAR, and other changes to get handling of Alt+nnn or
[~andy/gtk] / gdk / win32 / gdkevents-win32.c
index 461d3a553864e2a70c5e9b13abe9df4afde3fde9..427c06b52bbe462c48128cbef8ae0ae2aa394282 100644 (file)
 
 #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 */
+
 #include <stdio.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkkeysyms.h>
-#include "gdkx.h"
-#include "gdkinput.h"
+
+#include "gdk.h"
+#include "gdkinternals.h"
+#include "gdkprivate-win32.h"
+
+#include "gdkkeysyms.h"
+
+#include "gdkinputprivate.h"
+
+#include <objbase.h>
+#include <imm.h>
+
+#ifdef HAVE_DIMM_H
+#include <dimm.h>
+#else
+#include "surrogate-dimm.h"
+#endif
+
+#ifdef HAVE_WINTAB
+#include <wintab.h>
+#endif
 
 #define PING() printf("%s: %d\n",__FILE__,__LINE__),fflush(stdout)
 
+#define WINDOW_PRIVATE(wp) GDK_WINDOW_WIN32DATA (wp)
+
 typedef struct _GdkIOClosure GdkIOClosure;
 typedef struct _GdkEventPrivate GdkEventPrivate;
 
-#define DOUBLE_CLICK_TIME      250
-#define TRIPLE_CLICK_TIME      500
-#define DOUBLE_CLICK_DIST      5
-#define TRIPLE_CLICK_DIST      5
-
 typedef enum
 {
   /* Following flag is set for events on the event queue during
@@ -69,21 +92,21 @@ 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      *xevent,
                                         GdkEvent *event,
                                         GList    *filters);
-static gint     gdk_event_translate    (GdkEvent *event, 
+static gboolean  gdk_event_translate   (GdkEvent *event, 
                                         MSG      *xevent,
                                         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);
+                                        gint     *timeout,
+                                        gpointer  user_data);
 static gboolean  gdk_event_check        (gpointer  source_data,
-                                        GTimeVal *current_time);
+                                        GTimeVal *current_time,
+                                        gpointer  user_data);
 static gboolean  gdk_event_dispatch     (gpointer  source_data,
                                         GTimeVal *current_time,
                                         gpointer  user_data);
@@ -94,43 +117,23 @@ static void         gdk_synthesize_click   (GdkEvent     *event,
 /* 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,
@@ -148,22 +151,32 @@ static UINT gdk_ping_msg;
 static gboolean ignore_WM_CHAR = FALSE;
 static gboolean is_AltGr_key = FALSE;
 
+static IActiveIMMApp *paimmapp = NULL;
+static IActiveIMMMessagePumpOwner *paimmmpo = NULL;
+
+typedef BOOL (WINAPI *PFN_TrackMouseEvent) (LPTRACKMOUSEEVENT);
+static PFN_TrackMouseEvent p_TrackMouseEvent = NULL;
+
+static gboolean use_IME_COMPOSITION = FALSE;
+
 LRESULT CALLBACK 
-gdk_WindowProc(HWND hwnd,
-              UINT message,
-              WPARAM wParam,
-              LPARAM lParam)
+gdk_WindowProc (HWND hWnd,
+               UINT message,
+               WPARAM wParam,
+               LPARAM lParam)
 {
-  GdkEvent event;
+  GdkEventPrivate event;
   GdkEvent *eventp;
   MSG msg;
   DWORD pos;
+  LRESULT lres;
   gint ret_val;
   gboolean ret_val_flag;
 
-  GDK_NOTE (EVENTS, g_print ("gdk_WindowProc: %#x\n", message));
+  GDK_NOTE (EVENTS, g_print ("gdk_WindowProc: %#x %s\n",
+                            hWnd, gdk_win32_message_name (message)));
 
-  msg.hwnd = hwnd;
+  msg.hwnd = hWnd;
   msg.message = message;
   msg.wParam = wParam;
   msg.lParam = lParam;
@@ -172,36 +185,85 @@ gdk_WindowProc(HWND hwnd,
   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))
     {
+      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;
+           }
+       }
+      else if (event.event.any.type == GDK_EXPOSE)
+       {
+         /* Compress expose events */
+         GList *list = gdk_queued_events;
+
+         while (list != NULL
+                && (((GdkEvent *)list->data)->any.type != GDK_EXPOSE
+                    || ((GdkEvent *)list->data)->any.window != event.event.any.window))
+           list = list->next;
+         if (list != NULL)
+           {
+             GdkRectangle u;
+
+             GDK_NOTE (EVENTS, g_print ("... compressing an EXPOSE event\n"));
+             gdk_rectangle_union (&event.event.expose.area,
+                                  &((GdkEvent *)list->data)->expose.area,
+                                  &u);
+             ((GdkEvent *)list->data)->expose.area = u;
+             gdk_drawable_unref (event.event.any.window);
+#if 0
              /* Wake up WaitMessage */
              PostMessage (NULL, gdk_ping_msg, 0, 0);
+#endif
              return FALSE;
            }
        }
 #endif
       eventp = gdk_event_new ();
-      *eventp = event;
+      *((GdkEventPrivate *) eventp) = event;
 
-      gdk_event_queue_append (eventp);
+      /* 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,87 +273,30 @@ 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);
+      if (paimmapp == NULL
+         || (*paimmapp->lpVtbl->OnDefWindowProc) (paimmapp, hWnd, message, wParam, lParam, &lres) == S_FALSE)
+       return DefWindowProc (hWnd, message, wParam, lParam);
+      else
+       return lres;
     }
-
-  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)
-{
-  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;
-  
-}
-
-/*************************************************************
- * gdk_event_queue_append:
- *     Append an event onto the tail of the event queue.
- *   arguments:
- *     event: Event to append.
- *   results:
- *************************************************************/
-
-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;
 }
 
 void 
 gdk_events_init (void)
 {
+  HRESULT hres;
+  HMODULE user32, imm32;
+  HINSTANCE commctrl32;
+
   if (g_pipe_readable_msg == 0)
     g_pipe_readable_msg = RegisterWindowMessage ("g-pipe-readable");
+  GDK_NOTE (EVENTS, g_print ("g-pipe-readable = %#.03x\n",
+                            g_pipe_readable_msg));
+
+  gdk_ping_msg = RegisterWindowMessage ("gdk-ping");
+  GDK_NOTE (EVENTS, g_print ("gdk-ping = %#.03x\n",
+                            gdk_ping_msg));
 
   g_source_add (GDK_PRIORITY_EVENTS, TRUE, &event_funcs, NULL, NULL, NULL);
 
@@ -300,14 +305,44 @@ gdk_events_init (void)
   
   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;
+  hres = CoCreateInstance (&CLSID_CActiveIMM,
+                          NULL,
+                          CLSCTX_ALL,
+                          &IID_IActiveIMMApp,
+                          (LPVOID *) &paimmapp);
+  
+  if (hres == S_OK)
+    {
+      GDK_NOTE (EVENTS, g_print ("IActiveIMMApp created %#x\n",
+                                paimmapp));
+      (*paimmapp->lpVtbl->Activate) (paimmapp, TRUE);
+      
+      hres = (*paimmapp->lpVtbl->QueryInterface) (paimmapp, &IID_IActiveIMMMessagePumpOwner, &paimmmpo);
+      GDK_NOTE (EVENTS, g_print ("IActiveIMMMessagePumpOwner created %#x\n",
+                                paimmmpo));
+      (paimmmpo->lpVtbl->Start) (paimmmpo);
+    }
 
-  gdk_ping_msg = RegisterWindowMessage ("gdk-ping");
+#ifdef USE_TRACKMOUSEEVENT
+  user32 = GetModuleHandle ("user32.dll");
+  if ((p_TrackMouseEvent = GetProcAddress (user32, "TrackMouseEvent")) == NULL)
+    {
+      if ((commctrl32 = LoadLibrary ("commctrl32.dll")) != NULL)
+       p_TrackMouseEvent = (PFN_TrackMouseEvent)
+         GetProcAddress (commctrl32, "_TrackMouseEvent");
+    }
+  if (p_TrackMouseEvent != NULL)
+    GDK_NOTE (EVENTS, g_print ("Using TrackMouseEvent to detect leave events\n"));
+#endif
+  if (IS_WIN_NT (windows_version) && (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;
+    }
 }
 
 /*
@@ -355,17 +390,16 @@ gdk_event_get_graphics_expose (GdkWindow *window)
 {
   MSG xevent;
   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 (&xevent, GDK_DRAWABLE_XID (window), WM_PAINT, WM_PAINT, PM_REMOVE))
     {
       event = gdk_event_new ();
       
@@ -379,331 +413,40 @@ gdk_event_get_graphics_expose (GdkWindow *window)
 #endif
 }
 
-/************************
- * Exposure compression *
- ************************/
-
-/* I don't bother with exposure compression on Win32. Windows compresses
- * WM_PAINT events by itself.
- */
-
-/*************************************************************
- * 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)
+static char *
+event_mask_string (GdkEventMask mask)
 {
-  if (event_notify)
-    (*event_notify) (event_data);
-
-  event_func = func;
-  event_data = data;
-  event_notify = notify;
-}
-
-/*
- *--------------------------------------------------------------
- * gdk_event_get
- *
- *   Gets the next event.
- *
- * 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)
-{
-  gdk_events_queue();
-
-  return gdk_event_unqueue();
-}
-
-/*
- *--------------------------------------------------------------
- * gdk_event_peek
- *
- *   Gets the next event.
- *
- * Arguments:
- *
- * 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)
-{
-  GList *tmp_list;
-
-  tmp_list = gdk_event_queue_find_first ();
-  
-  if (tmp_list)
-    return gdk_event_copy (tmp_list->data);
-  else
-    return NULL;
-}
-
-void
-gdk_event_put (GdkEvent *event)
-{
-  GdkEvent *new_event;
-  GList *tmp_list;
-  
-  g_return_if_fail (event != NULL);
-  
-  new_event = gdk_event_copy (event);
-
-  gdk_event_queue_append (new_event);
-}
-
-/*
- *--------------------------------------------------------------
- * gdk_event_copy
- *
- *   Copy a event structure into new storage.
- *
- * 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)
-{
-  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;
-}
-
-GdkEvent*
-gdk_event_copy (GdkEvent *event)
-{
-  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)
-    {
-    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;
-    }
-  
-  return new_event;
-}
-
-/*
- *--------------------------------------------------------------
- * gdk_event_free
- *
- *   Free a event structure obtained from gdk_event_copy.  Do not use
- *   with other event structures.
- *
- * Arguments:
- *   "event" is the event struct to free.
- *
- * Results:
- *
- * Side effects:
- *   The reference count of the window in the event is decreased and
- *   might be freed, too.
- *
- *-------------------------------------------------------------- */
-
-void
-gdk_event_free (GdkEvent *event)
-{
-  g_return_if_fail (event != NULL);
-
-  g_assert (event_chunk != NULL); /* paranoid */
-  
-  if (event->any.window)
-    gdk_window_unref (event->any.window);
-  
-  switch (event->any.type)
-    {
-    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;
-    }
-  
-  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.
- *--------------------------------------------------------------
- */
-
-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;
-      }
-  
-  return GDK_CURRENT_TIME;
-}
-
-/*
- *--------------------------------------------------------------
- * gdk_set_show_events
- *
- *   Turns on/off the showing of events.
- *
- * 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)
-{
-  if (show_events)
-    gdk_debug_flags |= GDK_DEBUG_EVENTS;
-  else
-    gdk_debug_flags &= ~GDK_DEBUG_EVENTS;
-}
-
-gint
-gdk_get_show_events (void)
-{
-  return gdk_debug_flags & GDK_DEBUG_EVENTS;
+  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;
 }
 
 /*
@@ -731,32 +474,30 @@ gdk_get_show_events (void)
 
 gint
 gdk_pointer_grab (GdkWindow *    window,
-                 gint            owner_events,
+                 gboolean        owner_events,
                  GdkEventMask    event_mask,
                  GdkWindow *     confine_to,
                  GdkCursor *     cursor,
                  guint32         time)
 {
-  GdkWindowPrivate *window_private;
   HWND xwindow;
   HWND xconfine_to;
   HCURSOR xcursor;
-  GdkWindowPrivate *confine_to_private;
   GdkCursorPrivate *cursor_private;
   gint return_val;
 
   g_return_val_if_fail (window != NULL, 0);
+  g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
+  g_return_val_if_fail (confine_to == NULL || GDK_IS_WINDOW (confine_to), 0);
   
-  window_private = (GdkWindowPrivate*) window;
-  confine_to_private = (GdkWindowPrivate*) confine_to;
   cursor_private = (GdkCursorPrivate*) cursor;
   
-  xwindow = window_private->xwindow;
+  xwindow = GDK_DRAWABLE_XID (window);
   
-  if (!confine_to || confine_to_private->destroyed)
+  if (!confine_to || GDK_DRAWABLE_DESTROYED (confine_to))
     xconfine_to = NULL;
   else
-    xconfine_to = confine_to_private->xwindow;
+    xconfine_to = GDK_DRAWABLE_XID (confine_to);
   
   if (!cursor)
     xcursor = NULL;
@@ -774,17 +515,18 @@ gdk_pointer_grab (GdkWindow *       window,
   
   if (return_val == Success)
     {
-      if (!window_private->destroyed)
+      if (!GDK_DRAWABLE_DESTROYED (window))
       {
-       GDK_NOTE (EVENTS, g_print ("gdk_pointer_grab: %#x %s %#x\n",
+       GDK_NOTE (EVENTS, g_print ("gdk_pointer_grab: %#x %s %#x %s\n",
                                   xwindow,
                                   (owner_events ? "TRUE" : "FALSE"),
-                                  xcursor));
-       p_grab_event_mask = event_mask;
-       p_grab_owner_events = owner_events != 0;
+                                  xcursor,
+                                  event_mask_string (event_mask)));
+       p_grab_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
+#if 1 /* Menus don't work if we use mouse capture. Pity, because many other
        * things work better with mouse capture.
        */
        SetCapture (xwindow);
@@ -797,7 +539,7 @@ gdk_pointer_grab (GdkWindow *         window,
   
   if (return_val == GrabSuccess)
     {
-      p_grab_window = window_private;
+      p_grab_window = window;
       p_grab_cursor = xcursor;
     }
   
@@ -824,7 +566,7 @@ gdk_pointer_ungrab (guint32 time)
 {
   if (gdk_input_vtable.ungrab_pointer)
     gdk_input_vtable.ungrab_pointer (time);
-#if 0
+#if 1
   if (GetCapture () != NULL)
     ReleaseCapture ();
 #endif
@@ -848,7 +590,7 @@ gdk_pointer_ungrab (guint32 time)
  *--------------------------------------------------------------
  */
 
-gint
+gboolean
 gdk_pointer_is_grabbed (void)
 {
   return p_grab_window != NULL;
@@ -876,20 +618,18 @@ gdk_pointer_is_grabbed (void)
 
 gint
 gdk_keyboard_grab (GdkWindow *    window,
-                  gint            owner_events,
+                  gboolean        owner_events,
                   guint32         time)
 {
-  GdkWindowPrivate *window_private;
   gint return_val;
   
   g_return_val_if_fail (window != NULL, 0);
-  
-  window_private = (GdkWindowPrivate*) window;
+  g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
   
   GDK_NOTE (EVENTS, g_print ("gdk_keyboard_grab %#x\n",
-                            window_private->xwindow));
+                            GDK_DRAWABLE_XID (window)));
 
-  if (!window_private->destroyed)
+  if (!GDK_DRAWABLE_DESTROYED (window))
     {
       k_grab_owner_events = owner_events != 0;
       return_val = GrabSuccess;
@@ -898,7 +638,7 @@ gdk_keyboard_grab (GdkWindow *         window,
     return_val = AlreadyGrabbed;
 
   if (return_val == GrabSuccess)
-    k_grab_window = window_private;
+    k_grab_window = window;
   
   return return_val;
 }
@@ -958,91 +698,392 @@ gdk_io_invoke (GIOChannel   *source,
   return TRUE;
 }
 
-gint
-gdk_input_add_full (gint             source,
-                   GdkInputCondition condition,
-                   GdkInputFunction  function,
-                   gpointer          data,
-                   GdkDestroyNotify  destroy)
+static GdkFilterReturn
+gdk_event_apply_filters (MSG      *xevent,
+                        GdkEvent *event,
+                        GList    *filters)
+{
+  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;
+}
+
+void 
+gdk_add_client_message_filter (GdkAtom       message_type,
+                              GdkFilterFunc func,
+                              gpointer      data)
+{
+  GdkClientFilter *filter = g_new (GdkClientFilter, 1);
+
+  filter->type = message_type;
+  filter->function = func;
+  filter->data = data;
+  
+  client_filters = g_list_prepend (client_filters, filter);
+}
+
+/* Thanks to Markus G. Kuhn <mkuhn@acm.org> for the ksysym<->Unicode
+ * mapping functions, from the xterm sources.
+ */
+
+static void
+build_key_event_state (GdkEvent *event)
+{
+  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 0
+         if (event->key.keyval < ' ')
+           event->key.keyval += '@';
+#endif
+       }
+#if 0
+      else if (event->key.keyval < ' ')
+       {
+         event->key.state |= GDK_CONTROL_MASK;
+         event->key.keyval += '@';
+       }
+#endif
+      if (GetKeyState (VK_MENU) < 0)
+       event->key.state |= GDK_MOD1_MASK;
+    }
+}
+
+static gint
+build_pointer_event_state (MSG *xevent)
+{
+  gint state;
+  
+  state = 0;
+  if (xevent->wParam & MK_CONTROL)
+    state |= GDK_CONTROL_MASK;
+  if (xevent->wParam & MK_LBUTTON)
+    state |= GDK_BUTTON1_MASK;
+  if (xevent->wParam & MK_MBUTTON)
+    state |= GDK_BUTTON2_MASK;
+  if (xevent->wParam & MK_RBUTTON)
+    state |= GDK_BUTTON3_MASK;
+  if (xevent->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 void
+build_keypress_event (GdkWindowWin32Data *windata,
+                     GdkEvent           *event,
+                     MSG                *xevent)
 {
-  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);
-
-  return result;
+  HIMC hIMC;
+  gint i, bytecount, ucount, ucleft, len;
+  guchar buf[100], *bp;
+  wchar_t wbuf[100], *wcp;
+
+  event->key.type = GDK_KEY_PRESS;
+  event->key.time = xevent->time;
+  event->key.state = 0;
+  
+  if (xevent->message == WM_IME_COMPOSITION)
+    {
+      hIMC = ImmGetContext (xevent->hwnd);
+
+      bytecount = ImmGetCompositionStringW (hIMC, GCS_RESULTSTR,
+                                           wbuf, sizeof (wbuf));
+      ucount = bytecount / 2;
+    }
+  else
+    {
+      if (xevent->message == WM_CHAR || xevent->message == WM_SYSCHAR)
+       {
+         bytecount = MIN ((xevent->lParam & 0xFFFF), sizeof (buf));
+         for (i = 0; i < bytecount; i++)
+           buf[i] = xevent->wParam;
+       }
+      else /* WM_IME_CHAR */
+       {
+         event->key.keyval = GDK_VoidSymbol;
+         if (xevent->wParam & 0xFF00)
+           {
+             /* Contrary to some versions of the documentation,
+              * the lead byte is the most significant byte.
+              */
+             buf[0] = ((xevent->wParam >> 8) & 0xFF);
+             buf[1] = (xevent->wParam & 0xFF);
+             bytecount = 2;
+           }
+         else
+           {
+             buf[0] = (xevent->wParam & 0xFF);
+             bytecount = 1;
+           }
+       }
+
+      /* Convert from the window's current code page
+       * to Unicode. Then convert to UTF-8.
+       * We don't handle the surrogate stuff. Should we?
+       */
+      ucount = MultiByteToWideChar (windata->charset_info.ciACP,
+                                   0, buf, bytecount,
+                                   wbuf, sizeof (wbuf) / sizeof (wbuf[0]));
+      
+    }
+  if (ucount == 0)
+    event->key.keyval = GDK_VoidSymbol;
+  else if (xevent->message == WM_CHAR || xevent->message == WM_SYSCHAR)
+    if (xevent->wParam < ' ')
+      {
+       event->key.keyval = xevent->wParam + '@';
+       /* This is needed in case of Alt+nnn or Alt+0nnn (on the numpad)
+        * where nnn<32
+        */
+       event->key.state |= GDK_CONTROL_MASK;
+      }
+    else
+      event->key.keyval = gdk_unicode_to_keyval (wbuf[0]);
+
+  build_key_event_state (event);
+
+  /* Build UTF-8 string */
+  ucleft = ucount;
+  len = 0;
+  wcp = wbuf;
+  while (ucleft-- > 0)
+    {
+      wchar_t c = *wcp++;
+
+      if (c < 0x80)
+       len += 1;
+      else if (c < 0x800)
+       len += 2;
+      else
+       len += 3;
+    }
+
+  event->key.string = g_malloc (len + 1);
+  event->key.length = len;
+  
+  ucleft = ucount;
+  wcp = wbuf;
+  bp = event->key.string;
+  while (ucleft-- > 0)
+    {
+      int first;
+      int i;
+      wchar_t c = *wcp++;
+
+      if (c < 0x80)
+       {
+         first = 0;
+         len = 1;
+       }
+      else if (c < 0x800)
+       {
+         first = 0xc0;
+         len = 2;
+       }
+      else
+       {
+         first = 0xe0;
+         len = 3;
+       }
+
+#if 1      
+      /* Woo-hoo! */
+      switch (len)
+       {
+       case 3: bp[2] = (c & 0x3f) | 0x80; c >>= 6; /* Fall through */
+       case 2: bp[1] = (c & 0x3f) | 0x80; c >>= 6; /* Fall through */
+       case 1: bp[0] = c | first;
+       }
+#else
+      for (i = len - 1; i > 0; --i)
+       {
+         bp[i] = (c & 0x3f) | 0x80;
+         c >>= 6;
+       }
+      bp[0] = c | first;
+#endif
+
+      bp += len;
+    }
+  *bp = 0;
+}
+
+static void
+build_keyrelease_event (GdkWindowWin32Data *windata,
+                       GdkEvent           *event,
+                       MSG                *xevent)
+{
+  guchar buf;
+  wchar_t wbuf;
+
+  event->key.type = GDK_KEY_RELEASE;
+  event->key.time = xevent->time;
+  event->key.state = 0;
+
+  if (xevent->message == WM_CHAR || xevent->message == WM_SYSCHAR)
+    if (xevent->wParam < ' ')
+      event->key.keyval = xevent->wParam + '@';
+    else
+      {
+       buf = xevent->wParam;
+       MultiByteToWideChar (windata->charset_info.ciACP,
+                            0, &buf, 1, &wbuf, 1);
+
+       event->key.keyval = gdk_unicode_to_keyval (wbuf);
+      }
+  else
+    event->key.keyval = GDK_VoidSymbol;
+  build_key_event_state (event);
+  event->key.string = NULL;
+  event->key.length = 0;
 }
 
-gint
-gdk_input_add (gint             source,
-              GdkInputCondition condition,
-              GdkInputFunction  function,
-              gpointer          data)
+static void
+print_event_state (gint state)
 {
-  return gdk_input_add_full (source, condition, function, data, NULL);
+  if (state & GDK_SHIFT_MASK)
+    g_print ("SHIFT ");
+  if (state & GDK_LOCK_MASK)
+    g_print ("LOCK ");
+  if (state & GDK_CONTROL_MASK)
+    g_print ("CONTROL ");
+  if (state & GDK_MOD1_MASK)
+    g_print ("MOD1 ");
+  if (state & GDK_BUTTON1_MASK)
+    g_print ("BUTTON1 ");
+  if (state & GDK_BUTTON2_MASK)
+    g_print ("BUTTON2 ");
+  if (state & GDK_BUTTON3_MASK)
+    g_print ("BUTTON3 ");
 }
 
-void
-gdk_input_remove (gint tag)
+static void
+print_event (GdkEvent *event)
 {
-  g_source_remove (tag);
-}
+  gchar *escaped, *kvname;
 
-static gint
-gdk_event_apply_filters (MSG      *xevent,
-                        GdkEvent *event,
-                        GList    *filters)
-{
-  GdkEventFilter *filter;
-  GList *tmp_list;
-  GdkFilterReturn result;
-  
-  tmp_list = filters;
-  
-  while (tmp_list)
+  switch (event->any.type)
     {
-      filter = (GdkEventFilter *) tmp_list->data;
-      
-      result = (*filter->function) (xevent, event, filter->data);
-      if (result !=  GDK_FILTER_CONTINUE)
-       return result;
-      
-      tmp_list = tmp_list->next;
+    case GDK_NOTHING: g_print ("GDK_NOTHING "); break;
+    case GDK_DELETE: g_print ("GDK_DELETE "); break;
+    case GDK_DESTROY: g_print ("GDK_DESTROY "); break;
+    case GDK_EXPOSE: g_print ("GDK_EXPOSE "); break;
+    case GDK_MOTION_NOTIFY: g_print ("GDK_MOTION_NOTIFY "); break;
+    case GDK_BUTTON_PRESS: g_print ("GDK_BUTTON_PRESS "); break;
+    case GDK_2BUTTON_PRESS: g_print ("GDK_2BUTTON_PRESS "); break;
+    case GDK_3BUTTON_PRESS: g_print ("GDK_3BUTTON_PRESS "); break;
+    case GDK_BUTTON_RELEASE: g_print ("GDK_BUTTON_RELEASE "); break;
+    case GDK_KEY_PRESS: g_print ("GDK_KEY_PRESS "); break;
+    case GDK_KEY_RELEASE: g_print ("GDK_KEY_RELEASE "); break;
+    case GDK_ENTER_NOTIFY: g_print ("GDK_ENTER_NOTIFY "); break;
+    case GDK_LEAVE_NOTIFY: g_print ("GDK_LEAVE_NOTIFY "); break;
+    case GDK_FOCUS_CHANGE: g_print ("GDK_FOCUS_CHANGE "); break;
+    case GDK_CONFIGURE: g_print ("GDK_CONFIGURE "); break;
+    case GDK_MAP: g_print ("GDK_MAP "); break;
+    case GDK_UNMAP: g_print ("GDK_UNMAP "); break;
+    case GDK_PROPERTY_NOTIFY: g_print ("GDK_PROPERTY_NOTIFY "); break;
+    case GDK_SELECTION_CLEAR: g_print ("GDK_SELECTION_CLEAR "); break;
+    case GDK_SELECTION_REQUEST: g_print ("GDK_SELECTION_REQUEST "); break;
+    case GDK_SELECTION_NOTIFY: g_print ("GDK_SELECTION_NOTIFY "); break;
+    case GDK_PROXIMITY_IN: g_print ("GDK_PROXIMITY_IN "); break;
+    case GDK_PROXIMITY_OUT: g_print ("GDK_PROXIMITY_OUT "); break;
+    case GDK_DRAG_ENTER: g_print ("GDK_DRAG_ENTER "); break;
+    case GDK_DRAG_LEAVE: g_print ("GDK_DRAG_LEAVE "); break;
+    case GDK_DRAG_MOTION: g_print ("GDK_DRAG_MOTION "); break;
+    case GDK_DRAG_STATUS: g_print ("GDK_DRAG_STATUS "); break;
+    case GDK_DROP_START: g_print ("GDK_DROP_START "); break;
+    case GDK_DROP_FINISHED: g_print ("GDK_DROP_FINISHED "); break;
+    case GDK_CLIENT_EVENT: g_print ("GDK_CLIENT_EVENT "); break;
+    case GDK_VISIBILITY_NOTIFY: g_print ("GDK_VISIBILITY_NOTIFY "); break;
+    case GDK_NO_EXPOSE: g_print ("GDK_NO_EXPOSE "); break;
+    case GDK_SCROLL: g_print ("GDK_SCROLL "); break;
     }
-  
-  return GDK_FILTER_CONTINUE;
-}
-
-void 
-gdk_add_client_message_filter (GdkAtom       message_type,
-                              GdkFilterFunc func,
-                              gpointer      data)
-{
-  GdkClientFilter *filter = g_new (GdkClientFilter, 1);
+  g_print ("%#x ", GDK_DRAWABLE_XID (event->any.window));
 
-  filter->type = message_type;
-  filter->function = func;
-  filter->data = data;
-  
-  client_filters = g_list_prepend (client_filters, filter);
+  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 ("%s %d:\"%s\" ",
+              (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;
+    }  
+  g_print ("\n");
 }
 
 static void
@@ -1050,17 +1091,20 @@ synthesize_crossing_events (GdkWindow *window,
                            MSG       *xevent)
 {
   GdkEvent *event;
-  GdkWindowPrivate *window_private = (GdkWindowPrivate *) window;
-  GdkWindowPrivate *curWnd_private = (GdkWindowPrivate *) curWnd;
   
-  if (curWnd && (curWnd_private->event_mask & GDK_LEAVE_NOTIFY_MASK))
+  /* If we are not using TrackMouseEvent, generate a leave notify
+   * event if necessary
+   */
+  if (p_TrackMouseEvent == NULL
+      && curWnd
+      && (GDK_WINDOW_WIN32DATA (curWnd)->event_mask & GDK_LEAVE_NOTIFY_MASK))
     {
       GDK_NOTE (EVENTS, g_print ("synthesizing LEAVE_NOTIFY event\n"));
 
       event = gdk_event_new ();
       event->crossing.type = GDK_LEAVE_NOTIFY;
       event->crossing.window = curWnd;
-      gdk_window_ref (event->crossing.window);
+      gdk_drawable_ref (event->crossing.window);
       event->crossing.subwindow = NULL;
       event->crossing.time = xevent->time;
       event->crossing.x = curX;
@@ -1068,22 +1112,28 @@ synthesize_crossing_events (GdkWindow *window,
       event->crossing.x_root = curXroot;
       event->crossing.y_root = curYroot;
       event->crossing.mode = GDK_CROSSING_NORMAL;
-      event->crossing.detail = GDK_NOTIFY_UNKNOWN;
+      if (IsChild (GDK_DRAWABLE_XID (curWnd), GDK_DRAWABLE_XID (window)))
+       event->crossing.detail = GDK_NOTIFY_INFERIOR;
+      else if (IsChild (GDK_DRAWABLE_XID (window), GDK_DRAWABLE_XID (curWnd)))
+       event->crossing.detail = GDK_NOTIFY_ANCESTOR;
+      else
+       event->crossing.detail = GDK_NOTIFY_NONLINEAR;
 
       event->crossing.focus = TRUE; /* ??? */
       event->crossing.state = 0; /* ??? */
 
       gdk_event_queue_append (event);
+      GDK_NOTE (EVENTS, print_event (event));
     }
 
-  if (window_private && (window_private->event_mask & GDK_ENTER_NOTIFY_MASK))
+  if (GDK_WINDOW_WIN32DATA (window)->event_mask & GDK_ENTER_NOTIFY_MASK)
     {
       GDK_NOTE (EVENTS, g_print ("synthesizing ENTER_NOTIFY event\n"));
       
       event = gdk_event_new ();
       event->crossing.type = GDK_ENTER_NOTIFY;
       event->crossing.window = window;
-      gdk_window_ref (event->crossing.window);
+      gdk_drawable_ref (event->crossing.window);
       event->crossing.subwindow = NULL;
       event->crossing.time = xevent->time;
       event->crossing.x = LOWORD (xevent->lParam);
@@ -1091,48 +1141,247 @@ synthesize_crossing_events (GdkWindow *window,
       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;
+      if (curWnd
+         && IsChild (GDK_DRAWABLE_XID (curWnd), GDK_DRAWABLE_XID (window)))
+       event->crossing.detail = GDK_NOTIFY_ANCESTOR;
+      else if (curWnd
+              && IsChild (GDK_DRAWABLE_XID (window), GDK_DRAWABLE_XID (curWnd)))
+       event->crossing.detail = GDK_NOTIFY_INFERIOR;
+      else
+       event->crossing.detail = GDK_NOTIFY_NONLINEAR;
       
       event->crossing.focus = TRUE; /* ??? */
       event->crossing.state = 0; /* ??? */
       
       gdk_event_queue_append (event);
 
-      if (window_private->extension_events != 0
+      GDK_NOTE (EVENTS, print_event (event));
+
+      if (((GdkWindowPrivate *) window)->extension_events != 0
          && gdk_input_vtable.enter_event)
        gdk_input_vtable.enter_event (&event->crossing, window);
+
     }
   
   if (curWnd)
-    gdk_window_unref (curWnd);
+    gdk_drawable_unref (curWnd);
   curWnd = window;
-  gdk_window_ref (curWnd);
+  gdk_drawable_ref (curWnd);
+#ifdef USE_TRACKMOUSEEVENT
+  if (p_TrackMouseEvent != NULL)
+    {
+      TRACKMOUSEEVENT tme;
+
+      tme.cbSize = sizeof (TRACKMOUSEEVENT);
+      tme.dwFlags = TME_LEAVE;
+      tme.hwndTrack = GDK_DRAWABLE_XID (curWnd);
+      tme.dwHoverTime = HOVER_DEFAULT;
+      
+      (*p_TrackMouseEvent) (&tme);
+    }
+#endif
 }
 
-static gint
+static void
+translate_mouse_coords (GdkWindow *window1,
+                       GdkWindow *window2,
+                       MSG       *xevent)
+{
+  POINT pt;
+
+  pt.x = LOWORD (xevent->lParam);
+  pt.y = HIWORD (xevent->lParam);
+  ClientToScreen (GDK_DRAWABLE_XID (window1), &pt);
+  ScreenToClient (GDK_DRAWABLE_XID (window2), &pt);
+  xevent->lParam = MAKELPARAM (pt.x, pt.y);
+  GDK_NOTE (EVENTS, g_print ("...new coords are (%d,%d)\n", pt.x, pt.y));
+}
+
+static gboolean
+propagate (GdkWindow  **window,
+          MSG         *xevent,
+          GdkWindow   *grab_window,
+          gboolean     grab_owner_events,
+          gint         grab_mask,
+          gboolean   (*doesnt_want_it) (gint mask,
+                                        MSG *xevent))
+{
+  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, xevent))
+       {
+         GDK_NOTE (EVENTS, g_print ("...grabber doesn't want it\n"));
+         return FALSE;
+       }
+      else
+       {
+         GDK_NOTE (EVENTS, g_print ("...sending to grabber %#x\n",
+                                    GDK_DRAWABLE_XID (grab_window)));
+         gdk_drawable_unref (*window);
+         *window = grab_window;
+         gdk_drawable_ref (*window);
+         return TRUE;
+       }
+    }
+  while (TRUE)
+    {
+     if ((*doesnt_want_it) (GDK_WINDOW_WIN32DATA (*window)->event_mask, xevent))
+       {
+         /* Owner doesn't want it, propagate to parent. */
+         if (((GdkWindowPrivate *) *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, xevent))
+                   {
+                     /* 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 %#x\n",
+                                                GDK_DRAWABLE_XID (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 = ((GdkWindowPrivate *) *window)->parent;
+             gdk_drawable_ref (*window);
+             GDK_NOTE (EVENTS, g_print ("...propagating to %#x\n",
+                                        GDK_DRAWABLE_XID (*window)));
+             /* The only branch where we actually continue the loop */
+           }
+       }
+      else
+       return TRUE;
+    }
+}
+
+static gboolean
+doesnt_want_key (gint mask,
+                MSG *xevent)
+{
+  return (((xevent->message == WM_KEYUP || xevent->message == WM_SYSKEYUP)
+          && !(mask & GDK_KEY_RELEASE_MASK))
+         ||
+         ((xevent->message == WM_KEYDOWN || xevent->message == WM_SYSKEYDOWN)
+          && !(mask & GDK_KEY_PRESS_MASK)));
+}
+
+static gboolean
+doesnt_want_char (gint mask,
+                 MSG *xevent)
+{
+  return !(mask & (GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK));
+}
+
+static gboolean
+doesnt_want_button_press (gint mask,
+                         MSG *xevent)
+{
+  return !(mask & GDK_BUTTON_PRESS_MASK);
+}
+
+static gboolean
+doesnt_want_button_release (gint mask,
+                           MSG *xevent)
+{
+  return !(mask & GDK_BUTTON_RELEASE_MASK);
+}
+
+static gboolean
+doesnt_want_button_motion (gint mask,
+                          MSG *xevent)
+{
+  return !((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)));
+}
+
+static gboolean
+doesnt_want_scroll (gint mask,
+                   MSG *xevent)
+{
+#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 gboolean
 gdk_event_translate (GdkEvent *event,
                     MSG      *xevent,
                     gboolean *ret_val_flagp,
                     gint     *ret_valp)
 {
-  GdkWindow *window;
-  GdkWindowPrivate *window_private;
-
-  GdkColormapPrivate *colormap_private;
-  HWND owner;
+  DWORD pidActWin;
+  DWORD pidThis;
   DWORD dwStyle;
   PAINTSTRUCT paintstruct;
   HDC hdc;
+  HDC bgdc;
+  HGDIOBJ oldbitmap;
   HBRUSH hbr;
+  COLORREF bg;
   RECT rect;
   POINT pt;
-  GdkWindowPrivate *curWnd_private;
+  MINMAXINFO *lpmmi;
+  HWND hwnd;
+  HCURSOR xcursor;
+  GdkWindow *window, *orig_window, *newwindow;
+  GdkColormapPrivateWin32 *colormap_private;
   GdkEventMask mask;
+  GdkPixmap *pixmap;
+  GdkDrawablePrivate *pixmap_private;
   int button;
-  int i, j;
+  int i, j, n, k;
   gchar buf[256];
-  gint charcount;
-  gint return_val;
+  gchar *msgname;
+  gboolean return_val;
   gboolean flag;
   
   return_val = FALSE;
@@ -1140,26 +1389,14 @@ gdk_event_translate (GdkEvent *event,
   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;
+  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));
-
-      g_io_channel_win32_pipe_readable (xevent->wParam, xevent->lParam);
-      return FALSE;
-    }
+  event->any.window = window;
+  event->any.send_event = FALSE;
 
   if (window != NULL)
-    gdk_window_ref (window);
+    gdk_drawable_ref (window);
   else
     {
       /* Handle WM_QUIT here ? */
@@ -1177,45 +1414,36 @@ 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.
           */
+         GDK_NOTE(MISC, g_print("gdk_event_translate: %#x %s posted.\n",
+                                xevent->hwnd, 
+                                xevent->message == WM_MOVE ?
+                                "WM_MOVE" : "WM_SIZE"));
+       
          PostMessage (xevent->hwnd, xevent->message,
                       xevent->wParam, xevent->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)
-       {
-         /* Nothing */
-       }
       return FALSE;
     }
   
-  event->any.window = window;
-
-  if (window_private && window_private->destroyed)
-    {
-    }
-  else
+  if (!GDK_DRAWABLE_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
+       (xevent, event, ((GdkWindowPrivate *) window)->filters);
       
       if (result != GDK_FILTER_CONTINUE)
        {
-         return (result == GDK_FILTER_TRANSLATE) ? TRUE : FALSE;
+         return_val =  (result == GDK_FILTER_TRANSLATE) ? TRUE : FALSE;
+         goto done;
        }
     }
 
   if (xevent->message == gdk_selection_notify_msg)
     {
-      GDK_NOTE (SELECTION, g_print ("gdk_selection_notify_msg: %#x\n",
-                                   xevent->hwnd));
+      GDK_NOTE (EVENTS, g_print ("gdk_selection_notify_msg: %#x\n",
+                                xevent->hwnd));
 
       event->selection.type = GDK_SELECTION_NOTIFY;
       event->selection.window = window;
@@ -1224,14 +1452,14 @@ gdk_event_translate (GdkEvent *event,
       event->selection.property = gdk_selection_property;
       event->selection.time = xevent->time;
 
-      return_val = window_private && !window_private->destroyed;
+      return_val = !GDK_DRAWABLE_DESTROYED (window);
 
       /* 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));
+      GDK_NOTE (EVENTS, g_print ("gdk_selection_request_msg: %#x\n",
+                                xevent->hwnd));
 
       event->selection.type = GDK_SELECTION_REQUEST;
       event->selection.window = window;
@@ -1241,21 +1469,21 @@ gdk_event_translate (GdkEvent *event,
       event->selection.requestor = (guint32) xevent->hwnd;
       event->selection.time = xevent->time;
 
-      return_val = window_private && !window_private->destroyed;
+      return_val = !GDK_DRAWABLE_DESTROYED (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));
+      GDK_NOTE (EVENTS, g_print ("gdk_selection_clear_msg: %#x\n",
+                                xevent->hwnd));
 
       event->selection.type = GDK_SELECTION_CLEAR;
       event->selection.window = window;
       event->selection.selection = xevent->wParam;
       event->selection.time = xevent->time;
 
-      return_val = window_private && !window_private->destroyed;
+      return_val = !GDK_DRAWABLE_DESTROYED (window);
 
       /* Once again, we will pass through switch below without match */
     }
@@ -1271,6 +1499,7 @@ gdk_event_translate (GdkEvent *event,
          if (filter->type == xevent->message)
            {
              GDK_NOTE (EVENTS, g_print ("client filter matched\n"));
+             event->any.window = window;
              result = (*filter->function) (xevent, event, filter->data);
              switch (result)
                {
@@ -1292,7 +1521,7 @@ gdk_event_translate (GdkEvent *event,
                  event->client.data.l[1] = xevent->lParam;
                  break;
                }
-             goto bypass_switch; /* Ouch */
+             goto done;
            }
          tmp_list = tmp_list->next;
        }
@@ -1300,17 +1529,27 @@ gdk_event_translate (GdkEvent *event,
 
   switch (xevent->message)
     {
+    case WM_INPUTLANGCHANGE:
+      GDK_NOTE (EVENTS,
+               g_print ("WM_INPUTLANGCHANGE: %#x  charset %d locale %x\n",
+                        xevent->hwnd, xevent->wParam, xevent->lParam));
+      GDK_WINDOW_WIN32DATA (window)->input_locale = (HKL) xevent->lParam;
+      TranslateCharsetInfo ((DWORD FAR *) xevent->wParam,
+                           &GDK_WINDOW_WIN32DATA (window)->charset_info,
+                           TCI_SRCCHARSET);
+      break;
+
     case WM_SYSKEYUP:
     case WM_SYSKEYDOWN:
       GDK_NOTE (EVENTS,
-               g_print ("WM_SYSKEY%s: %#x  key: %s  %#x %#.08x\n",
+               g_print ("WM_SYSKEY%s: %#x  %s %#x %s\n",
                         (xevent->message == WM_SYSKEYUP ? "UP" : "DOWN"),
                         xevent->hwnd,
                         (GetKeyNameText (xevent->lParam, buf,
                                          sizeof (buf)) > 0 ?
                          buf : ""),
                         xevent->wParam,
-                        xevent->lParam));
+                        decode_key_lparam (xevent->lParam)));
 
       /* Let the system handle Alt-Tab and Alt-Enter */
       if (xevent->wParam == VK_TAB
@@ -1331,62 +1570,20 @@ gdk_event_translate (GdkEvent *event,
     case WM_KEYUP:
     case WM_KEYDOWN:
       GDK_NOTE (EVENTS, 
-               g_print ("WM_KEY%s: %#x  key: %s  %#x %#.08x\n",
+               g_print ("WM_KEY%s: %#x  %s %#x %s\n",
                         (xevent->message == WM_KEYUP ? "UP" : "DOWN"),
                         xevent->hwnd,
                         (GetKeyNameText (xevent->lParam, buf,
                                          sizeof (buf)) > 0 ?
                          buf : ""),
                         xevent->wParam,
-                        xevent->lParam));
+                        decode_key_lparam (xevent->lParam)));
 
       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 ("not wanted, not grabbed, "
-                                "sending to %#x\n", window_private->xwindow));
-             goto keyup_or_down;
-           }
-       }
-             
+
+      event->key.window = window;
       switch (xevent->wParam)
        {
        case VK_LBUTTON:
@@ -1400,21 +1597,37 @@ 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 (xevent->message == WM_KEYDOWN
+             && (HIWORD (xevent->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 (xevent->message == WM_KEYDOWN
+             && (HIWORD (xevent->lParam) & KF_REPEAT))
+           ignore_WM_CHAR = FALSE;
+         else if (HIWORD (xevent->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 (xevent->message == WM_KEYDOWN
+             && (HIWORD (xevent->lParam) & KF_REPEAT))
+           ignore_WM_CHAR = FALSE;
+         else if (HIWORD (xevent->lParam) & KF_EXTENDED)
            {
              /* AltGr key comes in as Control+Right Alt */
              if (GetKeyState (VK_CONTROL) < 0)
@@ -1425,7 +1638,11 @@ gdk_event_translate (GdkEvent *event,
              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;
@@ -1479,22 +1696,22 @@ gdk_event_translate (GdkEvent *event,
        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;
          break;
-#endif
        case VK_DIVIDE:
          event->key.keyval = GDK_KP_Divide; break;
        case VK_F1:
@@ -1529,27 +1746,59 @@ 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 + (xevent->wParam - '0');
+         else
+           ignore_WM_CHAR = FALSE;
+         break;
+       case VK_OEM_PLUS:       /* On my Win98, the '+' key comes in
+                                * as VK_OEM_PLUS
+                                */
+         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
+            */
+           event->key.keyval = '+';
+         else
+           ignore_WM_CHAR = FALSE;
+         break;
        default:
          if (xevent->message == WM_SYSKEYDOWN || xevent->message == WM_SYSKEYUP)
-           {
-             event->key.keyval = xevent->wParam;
-           }
+           event->key.keyval = xevent->wParam;
          else
-           {
-             ignore_WM_CHAR = FALSE;
-             event->key.keyval = GDK_VoidSymbol;
-           }
+           ignore_WM_CHAR = FALSE;
          break;
        }
 
       if (!ignore_WM_CHAR)
        break;
 
+      if (!propagate (&window, xevent,
+                     k_grab_window, k_grab_owner_events, GDK_ALL_EVENTS_MASK,
+                     doesnt_want_key))
+         break;
+
       is_AltGr_key = FALSE;
       event->key.type = ((xevent->message == WM_KEYDOWN
-                         | xevent->message == WM_SYSKEYDOWN) ?
+                         || xevent->message == WM_SYSKEYDOWN) ?
                         GDK_KEY_PRESS : GDK_KEY_RELEASE);
-      event->key.window = window;
       event->key.time = xevent->time;
       event->key.state = 0;
       if (GetKeyState (VK_SHIFT) < 0)
@@ -1560,17 +1809,33 @@ gdk_event_translate (GdkEvent *event,
        event->key.state |= GDK_CONTROL_MASK;
       if (xevent->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.string = NULL;
+      event->key.length = 0;
+      return_val = !GDK_DRAWABLE_DESTROYED (window);
+      break;
+
+    case WM_IME_COMPOSITION:
+      if (!use_IME_COMPOSITION)
+       break;
+      GDK_NOTE (EVENTS, g_print ("WM_IME_COMPOSITION: %#x  %#x\n",
+                                xevent->hwnd, xevent->lParam));
+      if (xevent->lParam & GCS_RESULTSTR)
+       goto wm_char;
       break;
 
+    case WM_IME_CHAR:
+      GDK_NOTE (EVENTS,
+               g_print ("WM_IME_CHAR: %#x  bytes: %#.04x\n",
+                        xevent->hwnd, xevent->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,
+               g_print ("WM_%sCHAR: %#x  %#x %#s %s\n",
+                        (xevent->message == WM_CHAR ? "" : "SYS"),
+                        xevent->hwnd, xevent->wParam,
+                        decode_key_lparam (xevent->lParam),
                         (ignore_WM_CHAR ? "ignored" : "")));
 
       if (ignore_WM_CHAR)
@@ -1580,141 +1845,47 @@ gdk_event_translate (GdkEvent *event,
        }
 
     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, xevent,
+                     k_grab_window, k_grab_owner_events, GDK_ALL_EVENTS_MASK,
+                     doesnt_want_char))
+         break;
+      event->key.window = window;
+      return_val = !GDK_DRAWABLE_DESTROYED (window);
+      if (return_val && (event->key.window == k_grab_window
+                        || (GDK_WINDOW_WIN32DATA (window)->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
+             || (GDK_WINDOW_WIN32DATA (window)->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 ("not wanted, not grabbed, sending 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;
-
+             GdkEvent *event2 = gdk_event_new ();
+             build_keypress_event (GDK_WINDOW_WIN32DATA (window), event2, xevent);
+             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 (GDK_WINDOW_WIN32DATA (window), event, xevent);
        }
-      else if (return_val && (window_private->event_mask & GDK_KEY_PRESS_MASK))
+      else if (return_val
+              && (GDK_WINDOW_WIN32DATA (window)->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 (GDK_WINDOW_WIN32DATA (window), event, xevent);
        }
       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,175 +1897,63 @@ gdk_event_translate (GdkEvent *event,
     case WM_RBUTTONDOWN:
       button = 3;
 
-      /* Print debugging info.
-       */
     buttondown0:
       GDK_NOTE (EVENTS, 
-               g_print ("WM_%cBUTTONDOWN: %#x  x,y: %d %d  button: %d\n",
+               g_print ("WM_%cBUTTONDOWN: %#x  (%d,%d)\n",
                         " LMR"[button],
                         xevent->hwnd,
-                        LOWORD (xevent->lParam), HIWORD (xevent->lParam),
-                        button));
+                        LOWORD (xevent->lParam), HIWORD (xevent->lParam)));
 
-      if (window_private
-         && (window_private->extension_events != 0)
+      if (((GdkWindowPrivate *) window)->extension_events != 0
          && gdk_input_ignore_core)
        {
-         GDK_NOTE (EVENTS, g_print ("... ignored\n"));
+         GDK_NOTE (EVENTS, g_print ("...ignored\n"));
          break;
        }
 
-    buttondown:
+      if (window != curWnd)
+       synthesize_crossing_events (window, xevent);
+
       event->button.type = GDK_BUTTON_PRESS;
+      if (!propagate (&window, xevent,
+                     p_grab_window, p_grab_owner_events, p_grab_mask,
+                     doesnt_want_button_press))
+         break;
       event->button.window = window;
-      if (window_private)
-       mask = window_private->event_mask;
-      else
-       mask = 0;               /* ??? */
-
-      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);
-             goto buttondown; /* What did Dijkstra say? */
-           }
-       }
-
       /* Emulate X11's automatic active grab */
       if (!p_grab_window)
        {
          /* No explicit active grab, let's start one automatically */
-         GDK_NOTE (EVENTS, g_print ("automatic grab started\n"));
-         gdk_pointer_grab (window, TRUE, window_private->event_mask,
+         gint owner_events =
+           GDK_WINDOW_WIN32DATA (window)->event_mask
+           & (GDK_BUTTON_PRESS_MASK|GDK_BUTTON_RELEASE_MASK);
+         
+         GDK_NOTE (EVENTS, g_print ("...automatic grab started\n"));
+         gdk_pointer_grab (window,
+                           owner_events,
+                           GDK_WINDOW_WIN32DATA (window)->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;
+      if (window != orig_window)
+       translate_mouse_coords (orig_window, window, xevent);
+      event->button.x = curX = (gint16) LOWORD (xevent->lParam);
+      event->button.y = curY = (gint16) HIWORD (xevent->lParam);
+      event->button.x_root = xevent->pt.x;
+      event->button.y_root = 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.state = build_pointer_event_state (xevent);
       event->button.button = button;
       event->button.source = GDK_SOURCE_MOUSE;
       event->button.deviceid = 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_DRAWABLE_DESTROYED (window);
       break;
 
     case WM_LBUTTONUP:
@@ -1906,124 +1965,47 @@ gdk_event_translate (GdkEvent *event,
     case WM_RBUTTONUP:
       button = 3;
 
-      /* Print debugging info.
-       */
     buttonup0:
       GDK_NOTE (EVENTS, 
-               g_print ("WM_%cBUTTONUP: %#x  x,y: %d %d  button: %d\n",
+               g_print ("WM_%cBUTTONUP: %#x  (%d,%d)\n",
                         " LMR"[button],
                         xevent->hwnd,
-                        LOWORD (xevent->lParam), HIWORD (xevent->lParam),
-                        button));
+                        LOWORD (xevent->lParam), HIWORD (xevent->lParam)));
 
-      if (window_private
-         && (window_private->extension_events != 0)
+      if (((GdkWindowPrivate *) window)->extension_events != 0
          && gdk_input_ignore_core)
        {
-         GDK_NOTE (EVENTS, g_print ("... ignored\n"));
+         GDK_NOTE (EVENTS, g_print ("...ignored\n"));
          break;
        }
 
-    buttonup:
-      event->button.type = GDK_BUTTON_RELEASE;
-      event->button.window = window;
-      if (window_private)
-       mask = window_private->event_mask;
-      else
-       mask = 0;
-
-      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_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))
-       {
-         /* 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);
-             goto buttonup;
-           }
-       }
-
       if (window != curWnd)
        synthesize_crossing_events (window, xevent);
 
+      event->button.type = GDK_BUTTON_RELEASE;
+      if (!propagate (&window, xevent,
+                     p_grab_window, p_grab_owner_events, p_grab_mask,
+                     doesnt_want_button_release))
+         goto maybe_ungrab;
+      event->button.window = window;
       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;
+      if (window != orig_window)
+       translate_mouse_coords (orig_window, window, xevent);
+      event->button.x = (gint16) LOWORD (xevent->lParam);
+      event->button.y = (gint16) HIWORD (xevent->lParam);
+      event->button.x_root = xevent->pt.x;
+      event->button.y_root = 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.state = build_pointer_event_state (xevent);
       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));
-       }
+
+      return_val = !GDK_DRAWABLE_DESTROYED (window);
+
+    maybe_ungrab:
       if (p_grab_window != NULL
          && p_grab_automatic
          && (event->button.state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)) == 0)
@@ -2031,140 +2013,47 @@ gdk_event_translate (GdkEvent *event,
       break;
 
     case WM_MOUSEMOVE:
-      /* Print debugging info.
-       */
       GDK_NOTE (EVENTS,
-               g_print ("WM_MOUSEMOVE: %#x  %#x +%d+%d\n",
+               g_print ("WM_MOUSEMOVE: %#x  %#x (%d,%d)\n",
                         xevent->hwnd, xevent->wParam,
                         LOWORD (xevent->lParam), HIWORD (xevent->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.
+      /* 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 == curWnd
+         && LOWORD (xevent->lParam) == curX
+         && HIWORD (xevent->lParam) == curY)
        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
+
+      /* HB: only process mouse move messages if we own the active window. */
+      GetWindowThreadProcessId(GetActiveWindow(), &pidActWin);
+      GetWindowThreadProcessId(xevent->hwnd, &pidThis);
+      if (pidActWin != pidThis)
+       break;
+
       if (window != curWnd)
        synthesize_crossing_events (window, xevent);
 
-      if (window_private
-         && (window_private->extension_events != 0)
+      if (((GdkWindowPrivate *) window)->extension_events != 0
          && gdk_input_ignore_core)
        {
-         GDK_NOTE (EVENTS, g_print ("... ignored\n"));
+         GDK_NOTE (EVENTS, g_print ("...ignored\n"));
          break;
        }
 
-    mousemotion:
       event->motion.type = GDK_MOTION_NOTIFY;
+      if (!propagate (&window, xevent,
+                     p_grab_window, p_grab_owner_events, p_grab_mask,
+                     doesnt_want_button_motion))
+         break;
       event->motion.window = window;
-      if (window_private)
-       mask = window_private->event_mask;
-      else
-       mask = 0;
-
-      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))))
-       {
-         /* 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;
-           }
-       }
-
       event->motion.time = xevent->time;
-      event->motion.x = curX = LOWORD (xevent->lParam);
-      event->motion.y = curY = HIWORD (xevent->lParam);
+      if (window != orig_window)
+       translate_mouse_coords (orig_window, window, xevent);
+      event->motion.x = curX = (gint16) LOWORD (xevent->lParam);
+      event->motion.y = curY = (gint16) HIWORD (xevent->lParam);
       event->motion.x_root = xevent->pt.x;
       event->motion.y_root = xevent->pt.y;
       curXroot = event->motion.x_root;
@@ -2172,56 +2061,24 @@ gdk_event_translate (GdkEvent *event,
       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.state = build_pointer_event_state (xevent);
+      event->motion.is_hint = FALSE;
       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)
-       {
-         /* 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));
-       }
+      return_val = !GDK_DRAWABLE_DESTROYED (window);
       break;
 
     case WM_NCMOUSEMOVE:
-      /* Print debugging info.  */
       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))
+      if (p_TrackMouseEvent == NULL
+         && curWnd != NULL
+         && (GDK_WINDOW_WIN32DATA (curWnd)->event_mask & GDK_LEAVE_NOTIFY_MASK))
        {
-         GDK_NOTE (EVENTS, g_print ("synthesizing LEAVE_NOTIFY event\n"));
+         GDK_NOTE (EVENTS, g_print ("...synthesizing LEAVE_NOTIFY event\n"));
 
          event->crossing.type = GDK_LEAVE_NOTIFY;
          event->crossing.window = curWnd;
@@ -2232,49 +2089,137 @@ gdk_event_translate (GdkEvent *event,
          event->crossing.x_root = curXroot;
          event->crossing.y_root = curYroot;
          event->crossing.mode = GDK_CROSSING_NORMAL;
-         event->crossing.detail = GDK_NOTIFY_UNKNOWN;
+         event->crossing.detail = GDK_NOTIFY_NONLINEAR;
 
          event->crossing.focus = TRUE; /* ??? */
          event->crossing.state = 0; /* ??? */
-         gdk_window_unref (curWnd);
+         return_val = TRUE;
+       }
+
+      if (curWnd)
+       {
+         gdk_drawable_unref (curWnd);
          curWnd = NULL;
+       }
 
-         return_val = TRUE;
+      break;
+
+    case WM_MOUSEWHEEL:
+      GDK_NOTE (EVENTS, g_print ("WM_MOUSEWHEEL: %#x\n", xevent->hwnd));
+
+      if (((GdkWindowPrivate *) window)->extension_events != 0
+         && gdk_input_ignore_core)
+       {
+         GDK_NOTE (EVENTS, g_print ("...ignored\n"));
+         break;
+       }
+
+      event->scroll.type = GDK_SCROLL;
+
+      /* WM_MOUSEWHEEL seems to be delivered to top-level windows
+       * only, for some reason. 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 (xevent->lParam);
+      pt.y = HIWORD (xevent->lParam);
+      if ((hwnd = WindowFromPoint (pt)) == NULL)
+       break;
+      xevent->hwnd = hwnd;
+      if ((newwindow = gdk_window_lookup (xevent->hwnd)) == NULL)
+       break;
+      if (newwindow != window)
+       {
+         gdk_drawable_unref (window);
+         window = newwindow;
+         gdk_drawable_ref (window);
        }
+      ScreenToClient (xevent->hwnd, &pt);
+      if (!propagate (&window, xevent,
+                     p_grab_window, p_grab_owner_events, p_grab_mask,
+                     doesnt_want_scroll))
+       break;
+      event->button.window = window;
+      event->scroll.direction = (((short) HIWORD (xevent->wParam)) > 0) ?
+       GDK_SCROLL_UP : GDK_SCROLL_DOWN;
+      event->scroll.window = window;
+      event->scroll.time = xevent->time;
+      event->scroll.x = (gint16) pt.x;
+      event->scroll.y = (gint16) pt.y;
+      event->scroll.x_root = (gint16) LOWORD (xevent->lParam);
+      event->scroll.y_root = (gint16) LOWORD (xevent->lParam);
+      event->scroll.pressure = 0.5;
+      event->scroll.xtilt = 0;
+      event->scroll.ytilt = 0;
+      event->scroll.state = build_pointer_event_state (xevent);
+      event->scroll.source = GDK_SOURCE_MOUSE;
+      event->scroll.deviceid = GDK_CORE_POINTER;
+      return_val = !GDK_DRAWABLE_DESTROYED (window);
+      
       break;
 
-    case WM_SETFOCUS:
-    case WM_KILLFOCUS:
-      if (window_private
-         && !(window_private->event_mask & GDK_FOCUS_CHANGE_MASK))
+#ifdef USE_TRACKMOUSEEVENT
+    case WM_MOUSELEAVE:
+      GDK_NOTE (EVENTS, g_print ("WM_MOUSELEAVE: %#x\n", xevent->hwnd));
+
+      if (!(GDK_WINDOW_WIN32DATA (window)->event_mask & GDK_LEAVE_NOTIFY_MASK))
        break;
 
+      event->crossing.type = GDK_LEAVE_NOTIFY;
+      event->crossing.window = 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;
+      if (curWnd
+         && IsChild (GDK_DRAWABLE_XID (curWnd), GDK_DRAWABLE_XID (window)))
+       event->crossing.detail = GDK_NOTIFY_INFERIOR;
+      else if (curWnd
+              && IsChild (GDK_DRAWABLE_XID (window), GDK_DRAWABLE_XID (curWnd)))
+       event->crossing.detail = GDK_NOTIFY_ANCESTOR;
+      else
+       event->crossing.detail = GDK_NOTIFY_NONLINEAR;
+
+      event->crossing.focus = TRUE; /* ??? */
+      event->crossing.state = 0; /* ??? */
+
+      if (curWnd)
+       {
+         gdk_drawable_unref (curWnd);
+         curWnd = NULL;
+       }
+
+      return_val = !GDK_DRAWABLE_DESTROYED (window);
+      break;
+#endif
+       
+    case WM_SETFOCUS:
+    case WM_KILLFOCUS:
       GDK_NOTE (EVENTS, g_print ("WM_%sFOCUS: %#x\n",
-                                (xevent->message == WM_SETFOCUS ? "SET" : "KILL"),
+                                (xevent->message == WM_SETFOCUS ?
+                                 "SET" : "KILL"),
                                 xevent->hwnd));
       
+      if (!(GDK_WINDOW_WIN32DATA (window)->event_mask & GDK_FOCUS_CHANGE_MASK))
+       break;
+
       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;
+      return_val = !GDK_DRAWABLE_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));
       
-      if (!window_private || window_private->destroyed)
+      if (GDK_DRAWABLE_DESTROYED (window))
        break;
-      colormap_private = (GdkColormapPrivate *) window_private->colormap;
+
+      colormap_private = (GdkColormapPrivateWin32 *) ((GdkWindowPrivate *) window)->drawable.colormap;
       hdc = (HDC) xevent->wParam;
       if (colormap_private
          && colormap_private->xcolormap->rc_palette)
@@ -2283,9 +2228,9 @@ gdk_event_translate (GdkEvent *event,
 
          if (SelectPalette (hdc,  colormap_private->xcolormap->palette,
                             FALSE) == NULL)
-           g_warning ("WM_ERASEBKGND: SelectPalette failed");
+           WIN32_GDI_FAILED ("SelectPalette");
          if ((k = RealizePalette (hdc)) == GDI_ERROR)
-           g_warning ("WM_ERASEBKGND: RealizePalette failed");
+           WIN32_GDI_FAILED ("RealizePalette");
 #if 0
          g_print ("WM_ERASEBKGND: selected %#x, realized %d colors\n",
                   colormap_private->xcolormap->palette, k);
@@ -2294,57 +2239,57 @@ gdk_event_translate (GdkEvent *event,
       *ret_val_flagp = TRUE;
       *ret_valp = 1;
 
-      if (window_private->bg_type == GDK_WIN32_BG_TRANSPARENT)
+      if (GDK_WINDOW_WIN32DATA (window)->bg_type == GDK_WIN32_BG_TRANSPARENT)
        break;
 
-      if (window_private->bg_type == GDK_WIN32_BG_PARENT_RELATIVE)
+      if (GDK_WINDOW_WIN32DATA (window)->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;
+         while (window
+                && GDK_WINDOW_WIN32DATA (window)->bg_type == GDK_WIN32_BG_PARENT_RELATIVE)
+           {
+             gdk_drawable_unref (window);
+             window = ((GdkWindowPrivate *) window)->parent;
+             gdk_drawable_ref (window);
+           }
        }
 
-      if (window_private->bg_type == GDK_WIN32_BG_PIXEL)
+      if (GDK_WINDOW_WIN32DATA (window)->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)));
+         bg = gdk_colormap_color (colormap_private,
+                                  GDK_WINDOW_WIN32DATA (window)->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
+         GDK_NOTE (EVENTS,
+                   g_print ("...%dx%d@+%d+%d BG_PIXEL %.06x\n",
+                            rect.right - rect.left,
+                            rect.bottom - rect.top,
+                            rect.left, rect.top,
+                            bg));
          hbr = CreateSolidBrush (bg);
 #if 0
-         g_print ("... CreateSolidBrush (%.08x) = %.08x\n", bg, hbr);
+         g_print ("...CreateSolidBrush (%.08x) = %.08x\n", bg, hbr);
 #endif
          if (!FillRect (hdc, &rect, hbr))
-           g_warning ("WM_ERASEBKGND: FillRect failed");
+           WIN32_GDI_FAILED ("FillRect");
          DeleteObject (hbr);
        }
-      else if (window_private->bg_type == GDK_WIN32_BG_PIXMAP)
+      else if (GDK_WINDOW_WIN32DATA (window)->bg_type == GDK_WIN32_BG_PIXMAP)
        {
-         GdkPixmapPrivate *pixmap_private;
-         HDC bgdc;
-         HGDIOBJ oldbitmap;
-
-         pixmap_private = (GdkPixmapPrivate *) window_private->bg_pixmap;
+         pixmap = GDK_WINDOW_WIN32DATA (window)->bg_pixmap;
+         pixmap_private = (GdkDrawablePrivate*) pixmap;
          GetClipBox (hdc, &rect);
 
          if (pixmap_private->width <= 8
              && pixmap_private->height <= 8)
            {
              GDK_NOTE (EVENTS, g_print ("...small pixmap, using brush\n"));
-             hbr = CreatePatternBrush (pixmap_private->xwindow);
+             hbr = CreatePatternBrush (GDK_DRAWABLE_XID (pixmap));
              if (!FillRect (hdc, &rect, hbr))
-               g_warning ("WM_ERASEBKGND: FillRect failed");
+               WIN32_GDI_FAILED ("FillRect");
              DeleteObject (hbr);
            }
          else
@@ -2353,19 +2298,19 @@ gdk_event_translate (GdkEvent *event,
                        g_print ("...blitting pixmap %#x (%dx%d) "
                                 "all over the place,\n"
                                 "...clip box = %dx%d@+%d+%d\n",
-                                pixmap_private->xwindow,
+                                GDK_DRAWABLE_XID (pixmap),
                                 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");
+                 WIN32_GDI_FAILED ("CreateCompatibleDC");
                  break;
                }
-             if (!(oldbitmap = SelectObject (bgdc, pixmap_private->xwindow)))
+             if (!(oldbitmap = SelectObject (bgdc, GDK_DRAWABLE_XID (pixmap))))
                {
-                 g_warning ("WM_ERASEBKGND: SelectObject failed");
+                 WIN32_GDI_FAILED ("SelectObject");
                  DeleteDC (bgdc);
                  break;
                }
@@ -2382,7 +2327,7 @@ gdk_event_translate (GdkEvent *event,
                                       pixmap_private->width, pixmap_private->height,
                                       bgdc, 0, 0, SRCCOPY))
                            {
-                             g_warning ("WM_ERASEBKGND: BitBlt failed");
+                             WIN32_GDI_FAILED ("BitBlt");
                              goto loopexit;
                            }
                        }
@@ -2397,27 +2342,26 @@ gdk_event_translate (GdkEvent *event,
        }
       else
        {
-         GDK_NOTE (EVENTS, g_print ("... BLACK_BRUSH (?)\n"));
-#ifdef MULTIPLE_WINDOW_CLASSES
-         hbr = (HBRUSH) GetClassLong (window_private->xwindow,
-                                      GCL_HBRBACKGROUND);
-#else
+         GDK_NOTE (EVENTS, g_print ("...BLACK_BRUSH (?)\n"));
          hbr = GetStockObject (BLACK_BRUSH);
-#endif
          GetClipBox (hdc, &rect);
          if (!FillRect (hdc, &rect, hbr))
-           g_warning ("WM_ERASEBKGND: FillRect failed");
+           WIN32_GDI_FAILED ("FillRect");
        }
       break;
 
     case WM_PAINT:
-      GDK_NOTE (EVENTS, g_print ("WM_PAINT: %#x\n", xevent->hwnd));
+      if (!GetUpdateRect(xevent->hwnd, NULL, FALSE))
+        {
+          GDK_NOTE (EVENTS, g_print ("WM_PAINT: %#x no update rect\n",
+                                    xevent->hwnd));
+          break;
+        }
+
       hdc = BeginPaint (xevent->hwnd, &paintstruct);
 
-      /* Print debugging info.
-       */
       GDK_NOTE (EVENTS,
-               g_print ("...WM_PAINT: %#x  %dx%d@+%d+%d %s dc %#x\n",
+               g_print ("WM_PAINT: %#x  %dx%d@+%d+%d %s dc %#x\n",
                         xevent->hwnd,
                         paintstruct.rcPaint.right - paintstruct.rcPaint.left,
                         paintstruct.rcPaint.bottom - paintstruct.rcPaint.top,
@@ -2427,88 +2371,84 @@ gdk_event_translate (GdkEvent *event,
 
       EndPaint (xevent->hwnd, &paintstruct);
 
-      if (window_private
-         && !(window_private->event_mask & GDK_EXPOSURE_MASK))
+      if (!(GDK_WINDOW_WIN32DATA (window)->event_mask & GDK_EXPOSURE_MASK))
        break;
 
+      if ((paintstruct.rcPaint.right == paintstruct.rcPaint.left)
+          || (paintstruct.rcPaint.bottom == paintstruct.rcPaint.top))
+        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;
+      event->expose.count = 0;
 
-      return_val = window_private && !window_private->destroyed;
+      return_val = !GDK_DRAWABLE_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;
+           }
+       }
       break;
 
-#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)));
 
-      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;
-      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;
-
-      if (window_private
-         && !(window_private->event_mask & GDK_STRUCTURE_MASK))
-       break;
 
-      event->any.type = GDK_MAP;
-      event->any.window = window;
+      if (p_grab_window != NULL && p_grab_cursor != NULL)
+       xcursor = p_grab_cursor;
+      else if (!GDK_DRAWABLE_DESTROYED (window))
+       xcursor = GDK_WINDOW_WIN32DATA (window)->xcursor;
+      else
+       xcursor = NULL;
 
-      return_val = window_private && !window_private->destroyed;
+      if (xcursor != NULL)
+       {
+         GDK_NOTE (EVENTS, g_print ("...SetCursor(%#x)\n", xcursor));
+         SetCursor (xcursor);
+         *ret_val_flagp = TRUE;
+         *ret_valp = TRUE;
+       }
       break;
-#endif
 
-#if 1
     case WM_SHOWWINDOW:
-      /* Print debugging info.
-       */
       GDK_NOTE (EVENTS, g_print ("WM_SHOWWINDOW: %#x  %d\n",
                                 xevent->hwnd,
                                 xevent->wParam));
 
-      if (window_private
-         && !(window_private->event_mask & GDK_STRUCTURE_MASK))
+      if (!(GDK_WINDOW_WIN32DATA (window)->event_mask & GDK_STRUCTURE_MASK))
        break;
 
       event->any.type = (xevent->wParam ? GDK_MAP : GDK_UNMAP);
       event->any.window = window;
 
       if (event->any.type == GDK_UNMAP
-         && p_grab_window == window_private)
+         && p_grab_window == window)
        gdk_pointer_ungrab (xevent->time);
 
       if (event->any.type == GDK_UNMAP
-         && k_grab_window == window_private)
+         && k_grab_window == window)
        gdk_keyboard_ungrab (xevent->time);
 
-      return_val = window_private && !window_private->destroyed;
+      return_val = !GDK_DRAWABLE_DESTROYED (window);
       break;
-#endif
+
     case WM_SIZE:
-      /* Print debugging info.
-       */
       GDK_NOTE (EVENTS,
                g_print ("WM_SIZE: %#x  %s %dx%d\n",
                         xevent->hwnd,
@@ -2519,30 +2459,26 @@ gdk_event_translate (GdkEvent *event,
                             (xevent->wParam == SIZE_RESTORED ? "RESTORED" : "?"))))),
                         LOWORD (xevent->lParam), HIWORD (xevent->lParam)));
 
-      if (window_private
-         && !(window_private->event_mask & GDK_STRUCTURE_MASK))
+      if (!(GDK_WINDOW_WIN32DATA (window)->event_mask & GDK_STRUCTURE_MASK))
        break;
-      if (window_private != NULL
-         && xevent->wParam == SIZE_MINIMIZED)
+
+      if (xevent->wParam == SIZE_MINIMIZED)
        {
-#if 1
          event->any.type = GDK_UNMAP;
          event->any.window = window;
 
-         if (p_grab_window == window_private)
+         if (p_grab_window == window)
            gdk_pointer_ungrab (xevent->time);
 
-         if (k_grab_window == window_private)
+         if (k_grab_window == window)
            gdk_keyboard_ungrab (xevent->time);
 
-         return_val = !window_private->destroyed;
-#endif
+         return_val = !GDK_DRAWABLE_DESTROYED (window);
        }
-      else if (window_private != NULL
-              && (xevent->wParam == SIZE_RESTORED
-                  || xevent->wParam == SIZE_MAXIMIZED)
+      else if ((xevent->wParam == SIZE_RESTORED
+               || xevent->wParam == SIZE_MAXIMIZED)
 #if 1
-              && window_private->window_type != GDK_WINDOW_CHILD
+              && GDK_DRAWABLE_TYPE (window) != GDK_WINDOW_CHILD
 #endif
                                                                 )
        {
@@ -2558,100 +2494,51 @@ gdk_event_translate (GdkEvent *event,
          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;
+         ((GdkWindowPrivate *) window)->x = event->configure.x;
+         ((GdkWindowPrivate *) window)->y = event->configure.y;
+         ((GdkWindowPrivate *) window)->drawable.width = event->configure.width;
+         ((GdkWindowPrivate *) window)->drawable.height = event->configure.height;
+         if (((GdkWindowPrivate *) window)->resize_count > 1)
+           ((GdkWindowPrivate *) window)->resize_count -= 1;
          
-         return_val = !window_private->destroyed;
+         return_val = !GDK_DRAWABLE_DESTROYED (window);
          if (return_val
-             && window_private->extension_events != 0
+             && ((GdkWindowPrivate *) window)->extension_events != 0
              && gdk_input_vtable.configure_event)
            gdk_input_vtable.configure_event (&event->configure, window);
        }
       break;
 
-    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;
-
-         if (window_private->hint_flags & GDK_HINT_MIN_SIZE)
-           {
-             gint w = lprc->right - lprc->left;
-             gint h = lprc->bottom - lprc->top;
-
-             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;
+    case WM_GETMINMAXINFO:
+      GDK_NOTE (EVENTS, g_print ("WM_GETMINMAXINFO: %#x\n", xevent->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;
-               }
-           }
+      lpmmi = (MINMAXINFO*) xevent->lParam;
+      if (GDK_WINDOW_WIN32DATA (window)->hint_flags & GDK_HINT_MIN_SIZE)
+       {
+         lpmmi->ptMinTrackSize.x = GDK_WINDOW_WIN32DATA (window)->hint_min_width;
+         lpmmi->ptMinTrackSize.y = GDK_WINDOW_WIN32DATA (window)->hint_min_height;
+       }
+      if (GDK_WINDOW_WIN32DATA (window)->hint_flags & GDK_HINT_MAX_SIZE)
+       {
+         lpmmi->ptMaxTrackSize.x = GDK_WINDOW_WIN32DATA (window)->hint_max_width;
+         lpmmi->ptMaxTrackSize.y = GDK_WINDOW_WIN32DATA (window)->hint_max_height;
+           
+         lpmmi->ptMaxSize.x = GDK_WINDOW_WIN32DATA (window)->hint_max_width;
+         lpmmi->ptMaxSize.y = GDK_WINDOW_WIN32DATA (window)->hint_max_height;
        }
       break;
 
     case WM_MOVE:
-      GDK_NOTE (EVENTS, g_print ("WM_MOVE: %#x  +%d+%d\n",
+      GDK_NOTE (EVENTS, g_print ("WM_MOVE: %#x  (%d,%d)\n",
                                 xevent->hwnd,
                                 LOWORD (xevent->lParam), HIWORD (xevent->lParam)));
 
-      if (window_private
-         && !(window_private->event_mask & GDK_STRUCTURE_MASK))
+      if (!(GDK_WINDOW_WIN32DATA (window)->event_mask & GDK_STRUCTURE_MASK))
        break;
-      if (window_private != NULL
-         && window_private->window_type != GDK_WINDOW_CHILD)
+
+      if (GDK_DRAWABLE_TYPE (window) != GDK_WINDOW_CHILD
+         && !IsIconic(xevent->hwnd)
+          && IsWindowVisible(xevent->hwnd))
        {
          event->configure.type = GDK_CONFIGURE;
          event->configure.window = window;
@@ -2660,21 +2547,22 @@ gdk_event_translate (GdkEvent *event,
          GetClientRect (xevent->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;
+         ((GdkWindowPrivate *) window)->x = event->configure.x;
+         ((GdkWindowPrivate *) window)->y = event->configure.y;
+         ((GdkWindowPrivate *) window)->drawable.width = event->configure.width;
+         ((GdkWindowPrivate *) window)->drawable.height = event->configure.height;
          
-         return_val = !window_private->destroyed;
+         return_val = !GDK_DRAWABLE_DESTROYED (window);
        }
       break;
 
     case WM_CLOSE:
       GDK_NOTE (EVENTS, g_print ("WM_CLOSE: %#x\n", xevent->hwnd));
+
       event->any.type = GDK_DELETE;
       event->any.window = window;
       
-      return_val = window_private && !window_private->destroyed;
+      return_val = !GDK_DRAWABLE_DESTROYED (window);
       break;
 
 #if 0
@@ -2691,7 +2579,6 @@ 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" :
@@ -2717,7 +2604,7 @@ gdk_event_translate (GdkEvent *event,
       event->selection.property = gdk_selection_property;
       event->selection.requestor = (guint32) xevent->hwnd;
       event->selection.time = xevent->time;
-      return_val = window_private && !window_private->destroyed;
+      return_val = !GDK_DRAWABLE_DESTROYED (window);
 #else
       /* Test code, to see if SetClipboardData works when called from
        * the window procedure.
@@ -2728,7 +2615,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;
@@ -2739,57 +2626,76 @@ gdk_event_translate (GdkEvent *event,
 
     case WM_DESTROY:
       GDK_NOTE (EVENTS, g_print ("WM_DESTROY: %#x\n", xevent->hwnd));
+
       event->any.type = GDK_DESTROY;
       event->any.window = window;
       if (window != NULL && window == curWnd)
        {
-         gdk_window_unref (curWnd);
+         gdk_drawable_unref (curWnd);
          curWnd = NULL;
        }
 
-      if (p_grab_window == window_private)
+      if (p_grab_window == window)
        gdk_pointer_ungrab (xevent->time);
 
-      if (k_grab_window == window_private)
+      if (k_grab_window == window)
        gdk_keyboard_ungrab (xevent->time);
 
-      return_val = window_private && !window_private->destroyed;
+      return_val = window != NULL && !GDK_DRAWABLE_DESTROYED (window);
+
+      if (window != NULL)
+       gdk_window_destroy_notify (window);
+
       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",
+      GDK_NOTE (EVENTS, g_print ("WT_PACKET: %#x %d %#x\n",
+                                xevent->hwnd,
                                 xevent->wParam, xevent->lParam));
       goto wintab;
       
     case WT_CSRCHANGE:
-      GDK_NOTE (EVENTS, g_print ("WT_CSRCHANGE: %d %#x\n",
+      GDK_NOTE (EVENTS, g_print ("WT_CSRCHANGE: %#x %d %#x\n",
+                                xevent->hwnd,
                                 xevent->wParam, xevent->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: %#x %#x %d %d\n",
+                                xevent->hwnd, xevent->wParam,
+                                LOWORD (xevent->lParam),
+                                HIWORD (xevent->lParam)));
+      /* Fall through */
     wintab:
+      event->any.window = window;
       return_val = gdk_input_vtable.other_event(event, xevent);
       break;
+#endif
+
+    default:
+      GDK_NOTE (EVENTS, g_print ("%s: %#x %#x %#x\n",
+                                gdk_win32_message_name (xevent->message),
+                                xevent->hwnd,
+                                xevent->wParam, xevent->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
     {
@@ -2799,54 +2705,48 @@ bypass_switch:
     }
 
   if (window)
-    gdk_window_unref (window);
+    gdk_drawable_unref (window);
   
   return return_val;
 }
 
-static void
+void
 gdk_events_queue (void)
 {
   GList *node;
   GdkEvent *event;
   MSG msg;
+  LRESULT lres;
 
-  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"));
-      TranslateMessage (&msg);
+      GDK_NOTE (EVENTS, g_print ("PeekMessage: %#x %s\n",
+                                msg.hwnd, gdk_win32_message_name (msg.message)));
 
-      event = gdk_event_new ();
-      
-      event->any.type = GDK_NOTHING;
-      event->any.window = NULL;
-      event->any.send_event = FALSE;
+      if (paimmmpo == NULL
+         || (paimmmpo->lpVtbl->OnTranslateMessage) (paimmmpo, &msg) != S_OK)
+       TranslateMessage (&msg);
 
-      ((GdkEventPrivate *)event)->flags |= GDK_EVENT_PENDING;
+      if (msg.message == g_pipe_readable_msg)
+       {
+         GDK_NOTE (EVENTS, g_print ("g_pipe_readable_msg: %d %d\n",
+                                    msg.wParam, msg.lParam));
 
-      gdk_event_queue_append (event);
-      node = queued_tail;
+         g_io_channel_win32_pipe_readable (msg.wParam, msg.lParam);
 
-      if (gdk_event_translate (event, &msg, NULL, NULL))
-         ((GdkEventPrivate *)event)->flags &= ~GDK_EVENT_PENDING;
-      else
-       {
-         DefWindowProc (msg.hwnd, msg.message, msg.wParam, msg.lParam);
-         gdk_event_queue_remove_link (node);
-         g_list_free_1 (node);
-         gdk_event_free (event);
+         continue;
        }
+      
+      DispatchMessage (&msg);
     }
 }
 
 static gboolean  
 gdk_event_prepare (gpointer  source_data, 
                   GTimeVal *current_time,
-                  gint     *timeout)
+                  gint     *timeout,
+                  gpointer  user_data)
 {
   MSG msg;
   gboolean retval;
@@ -2855,8 +2755,6 @@ gdk_event_prepare (gpointer  source_data,
 
   *timeout = -1;
 
-  GDK_NOTE (EVENTS, g_print ("gdk_event_prepare\n"));
-
   retval = (gdk_event_queue_find_first () != NULL)
              || PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE);
 
@@ -2867,13 +2765,12 @@ gdk_event_prepare (gpointer  source_data,
 
 static gboolean  
 gdk_event_check (gpointer  source_data,
-                GTimeVal *current_time)
+                GTimeVal *current_time,
+                gpointer  user_data)
 {
   MSG msg;
   gboolean retval;
   
-  GDK_NOTE (EVENTS, g_print ("gdk_event_check\n"));
-
   GDK_THREADS_ENTER ();
 
   if (event_poll_fd.revents & G_IO_IN)
@@ -2887,24 +2784,6 @@ 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,
@@ -2912,8 +2791,6 @@ gdk_event_dispatch (gpointer  source_data,
 {
   GdkEvent *event;
  
-  GDK_NOTE (EVENTS, g_print ("gdk_event_dispatch\n"));
-
   GDK_THREADS_ENTER ();
 
   gdk_events_queue();
@@ -2921,8 +2798,8 @@ gdk_event_dispatch (gpointer  source_data,
 
   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);
     }
@@ -2932,20 +2809,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)
@@ -2960,3 +2823,246 @@ gdk_event_send_clientmessage_toall (GdkEvent *event)
   /* XXX */
 }
 
+void
+gdk_flush (void)
+{
+  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 */