]> Pileus Git - ~andy/gtk/blobdiff - gdk/win32/gdkwindow-win32.c
Bypass calls to the grab/ungrab functions in gdkinput-win32.c, as they
[~andy/gtk] / gdk / win32 / gdkwindow-win32.c
index 449418cd5a7ed1c1c054bdad19b397a6d03f184d..da6b50d835542b6abcdc77c41176e5094e1f46b8 100644 (file)
@@ -1,6 +1,6 @@
 /* GDK - The GIMP Drawing Kit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- * Copyright (C) 1998-1999 Tor Lillqvist
+ * Copyright (C) 1998-2002 Tor Lillqvist
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -31,7 +31,6 @@
 #include "gdkevents.h"
 #include "gdkpixmap.h"
 #include "gdkwindow.h"
-#include "gdkinternals.h"
 #include "gdkprivate-win32.h"
 #include "gdkinput-win32.h"
 
@@ -53,7 +52,7 @@ static void gdk_window_impl_win32_finalize   (GObject                 *object);
 static gpointer parent_class = NULL;
 
 GType
-gdk_window_impl_win32_get_type (void)
+_gdk_window_impl_win32_get_type (void)
 {
   static GType object_type = 0;
 
@@ -83,7 +82,7 @@ gdk_window_impl_win32_get_type (void)
 GType
 _gdk_window_impl_get_type (void)
 {
-  return gdk_window_impl_win32_get_type ();
+  return _gdk_window_impl_win32_get_type ();
 }
 
 static void
@@ -92,13 +91,9 @@ gdk_window_impl_win32_init (GdkWindowImplWin32 *impl)
   impl->width = 1;
   impl->height = 1;
 
-  impl->event_mask = 0;
   impl->hcursor = NULL;
   impl->hint_flags = 0;
   impl->extension_events_selected = FALSE;
-  impl->input_locale = GetKeyboardLayout (0);
-  TranslateCharsetInfo ((DWORD FAR *) GetACP (), &impl->charset_info,
-                       TCI_SRCCODEPAGE);
 }
 
 static void
@@ -141,6 +136,8 @@ gdk_window_impl_win32_finalize (GObject *object)
 
   if (window_impl->hcursor != NULL)
     {
+      if (GetCursor () == window_impl->hcursor)
+       SetCursor (NULL);
       if (!DestroyCursor (window_impl->hcursor))
         WIN32_GDI_FAILED("DestroyCursor");
       window_impl->hcursor = NULL;
@@ -153,12 +150,10 @@ static GdkColormap*
 gdk_window_impl_win32_get_colormap (GdkDrawable *drawable)
 {
   GdkDrawableImplWin32 *drawable_impl;
-  GdkWindowImplWin32 *window_impl;
   
   g_return_val_if_fail (GDK_IS_WINDOW_IMPL_WIN32 (drawable), NULL);
 
   drawable_impl = GDK_DRAWABLE_IMPL_WIN32 (drawable);
-  window_impl = GDK_WINDOW_IMPL_WIN32 (drawable);
 
   if (!((GdkWindowObject *) drawable_impl->wrapper)->input_only && 
       drawable_impl->colormap == NULL)
@@ -178,15 +173,18 @@ gdk_window_impl_win32_set_colormap (GdkDrawable *drawable,
   GdkDrawableImplWin32 *draw_impl;
   
   g_return_if_fail (GDK_IS_WINDOW_IMPL_WIN32 (drawable));
-  g_return_if_fail (gdk_colormap_get_visual (cmap) != gdk_drawable_get_visual (drawable));
 
   impl = GDK_WINDOW_IMPL_WIN32 (drawable);
   draw_impl = GDK_DRAWABLE_IMPL_WIN32 (drawable);
 
-  GDK_DRAWABLE_GET_CLASS (draw_impl)->set_colormap (drawable, cmap);
+  /* chain up */
+  GDK_DRAWABLE_CLASS (parent_class)->set_colormap (drawable, cmap);
   
-  /* XXX */
-  g_print("gdk_window_impl_win32_set_colormap: XXX\n");
+  if (cmap)
+    {
+      /* XXX */
+      g_print("gdk_window_impl_win32_set_colormap: XXX\n");
+    }
 }
 
 static void
@@ -228,32 +226,34 @@ _gdk_windowing_window_init (void)
   guint width;
   guint height;
 
-  g_assert (gdk_parent_root == NULL);
+  g_assert (_gdk_parent_root == NULL);
   
   SystemParametersInfo(SPI_GETWORKAREA, 0, &rect, 0);
   width  = rect.right - rect.left;
   height = rect.bottom - rect.top;
 
-  gdk_parent_root = g_object_new (GDK_TYPE_WINDOW, NULL);
-  private = (GdkWindowObject *)gdk_parent_root;
+  _gdk_parent_root = g_object_new (GDK_TYPE_WINDOW, NULL);
+  private = (GdkWindowObject *)_gdk_parent_root;
   impl = GDK_WINDOW_IMPL_WIN32 (private->impl);
   draw_impl = GDK_DRAWABLE_IMPL_WIN32 (private->impl);
   
   draw_impl->handle = gdk_root_window;
   draw_impl->wrapper = GDK_DRAWABLE (private);
+  draw_impl->colormap = gdk_colormap_get_system ();
+  gdk_colormap_ref (draw_impl->colormap);
   
   private->window_type = GDK_WINDOW_ROOT;
   private->depth = gdk_visual_get_system ()->depth;
   impl->width = width;
   impl->height = height;
 
-  gdk_win32_handle_table_insert (&gdk_root_window, gdk_parent_root);
+  gdk_win32_handle_table_insert (&gdk_root_window, _gdk_parent_root);
 }
 
 /* The Win API function AdjustWindowRect may return negative values
  * resulting in obscured title bars. This helper function is coreccting it.
  */
-BOOL
+static BOOL
 SafeAdjustWindowRectEx (RECT* lpRect,
                        DWORD dwStyle, 
                        BOOL  bMenu, 
@@ -284,7 +284,7 @@ SafeAdjustWindowRectEx (RECT* lpRect,
  *   is ever needed (e.g Dialog specific), every such window should
  *   get its own class
  */
-ATOM
+static ATOM
 RegisterGdkClass (GdkWindowType wtype)
 {
   static ATOM klassTOPLEVEL = 0;
@@ -295,11 +295,11 @@ RegisterGdkClass (GdkWindowType wtype)
   static WNDCLASSEX wcl; 
   ATOM klass = 0;
 
-  wcl.cbSize = sizeof(WNDCLASSEX);     
+  wcl.cbSize = sizeof (WNDCLASSEX);
   wcl.style = 0; /* DON'T set CS_<H,V>REDRAW. It causes total redraw
                   * on WM_SIZE and WM_MOVE. Flicker, Performance!
                   */
-  wcl.lpfnWndProc = gdk_window_procedure;
+  wcl.lpfnWndProc = _gdk_win32_window_procedure;
   wcl.cbClsExtra = 0;
   wcl.cbWndExtra = 0;
   wcl.hInstance = gdk_app_hmodule;
@@ -314,15 +314,12 @@ RegisterGdkClass (GdkWindowType wtype)
          hAppIcon = ExtractIcon (gdk_app_hmodule, sLoc, 0);
          if (0 == hAppIcon)
            {
-             char *gdklibname = g_strdup_printf ("gdk-%s.dll", GDK_VERSION);
-
-             hAppIcon = ExtractIcon (gdk_app_hmodule, gdklibname, 0);
-             g_free (gdklibname);
+             if (0 != GetModuleFileName (gdk_dll_hinstance, sLoc, _MAX_PATH))
+               hAppIcon = ExtractIcon (gdk_dll_hinstance, sLoc, 0);
            }
-         
-         if (0 == hAppIcon) 
-           hAppIcon = LoadIcon (NULL, IDI_APPLICATION);
        }
+      if (0 == hAppIcon) 
+       hAppIcon = LoadIcon (NULL, IDI_APPLICATION);
     }
 
   wcl.lpszMenuName = NULL;
@@ -337,22 +334,22 @@ RegisterGdkClass (GdkWindowType wtype)
 #define ONCE_PER_CLASS() \
   wcl.hIcon = CopyIcon (hAppIcon); \
   wcl.hIconSm = CopyIcon (hAppIcon); \
-  wcl.hbrBackground = NULL; /* CreateSolidBrush (RGB (0,0,0)); */ \
+  wcl.hbrBackground = NULL; \
   wcl.hCursor = LoadCursor (NULL, IDC_ARROW); 
   
   switch (wtype)
-  {
-  case GDK_WINDOW_TOPLEVEL:
-    if (0 == klassTOPLEVEL)
-      {
-       wcl.lpszClassName = "gdkWindowToplevel";
-       
-       ONCE_PER_CLASS();
-       klassTOPLEVEL = RegisterClassEx (&wcl);
-      }
-    klass = klassTOPLEVEL;
-    break;
-
+    {
+    case GDK_WINDOW_TOPLEVEL:
+      if (0 == klassTOPLEVEL)
+       {
+         wcl.lpszClassName = "gdkWindowToplevel";
+         
+         ONCE_PER_CLASS();
+         klassTOPLEVEL = RegisterClassEx (&wcl);
+       }
+      klass = klassTOPLEVEL;
+      break;
+      
     case GDK_WINDOW_CHILD:
       if (0 == klassCHILD)
        {
@@ -364,34 +361,34 @@ RegisterGdkClass (GdkWindowType wtype)
        }
       klass = klassCHILD;
       break;
-
-  case GDK_WINDOW_DIALOG:
-    if (0 == klassDIALOG)
-      {
-       wcl.lpszClassName = "gdkWindowDialog";
-        wcl.style |= CS_SAVEBITS;
-       ONCE_PER_CLASS();
-       klassDIALOG = RegisterClassEx (&wcl);
-      }
-    klass = klassDIALOG;
-    break;
-
-  case GDK_WINDOW_TEMP:
-    if (0 == klassTEMP)
-      {
-       wcl.lpszClassName = "gdkWindowTemp";
-        wcl.style |= CS_SAVEBITS;
-       ONCE_PER_CLASS();
-       klassTEMP = RegisterClassEx (&wcl);
-      }
-    klass = klassTEMP;
-    break;
-
-  default:
-    g_assert_not_reached ();
-    break;
-  }
-
+      
+    case GDK_WINDOW_DIALOG:
+      if (0 == klassDIALOG)
+       {
+         wcl.lpszClassName = "gdkWindowDialog";
+         wcl.style |= CS_SAVEBITS;
+         ONCE_PER_CLASS();
+         klassDIALOG = RegisterClassEx (&wcl);
+       }
+      klass = klassDIALOG;
+      break;
+      
+    case GDK_WINDOW_TEMP:
+      if (0 == klassTEMP)
+       {
+         wcl.lpszClassName = "gdkWindowTemp";
+         wcl.style |= CS_SAVEBITS;
+         ONCE_PER_CLASS();
+         klassTEMP = RegisterClassEx (&wcl);
+       }
+      klass = klassTEMP;
+      break;
+      
+    default:
+      g_assert_not_reached ();
+      break;
+    }
+  
   if (klass == 0)
     {
       WIN32_API_FAILED ("RegisterClassEx");
@@ -405,20 +402,15 @@ gdk_window_new (GdkWindow     *parent,
                GdkWindowAttr *attributes,
                gint           attributes_mask)
 {
+  HANDLE hparent;
+  ATOM klass = 0;
+  DWORD dwStyle, dwExStyle;
+  RECT rect;
   GdkWindow *window;
   GdkWindowObject *private;
-  GdkWindowObject *parent_private;
   GdkWindowImplWin32 *impl;
   GdkDrawableImplWin32 *draw_impl;
-
   GdkVisual *visual;
-
-  HANDLE hparent;
-  ATOM klass = 0;
-  DWORD dwStyle, dwExStyle;
-  RECT rect;
-  Visual *xvisual;
-
   int width, height;
   int x, y;
   char *title;
@@ -427,7 +419,7 @@ gdk_window_new (GdkWindow     *parent,
   g_return_val_if_fail (attributes != NULL, NULL);
 
   if (!parent)
-    parent = gdk_parent_root;
+    parent = _gdk_parent_root;
 
   g_return_val_if_fail (GDK_IS_WINDOW (parent), NULL);
   
@@ -439,7 +431,6 @@ gdk_window_new (GdkWindow     *parent,
                        (attributes->window_type == GDK_WINDOW_TEMP ? "TEMP" :
                         "???"))))));
 
-  parent_private = (GdkWindowObject*) parent;
   if (GDK_WINDOW_DESTROYED (parent))
     return NULL;
   
@@ -451,6 +442,12 @@ gdk_window_new (GdkWindow     *parent,
   draw_impl = GDK_DRAWABLE_IMPL_WIN32 (private->impl);
   draw_impl->wrapper = GDK_DRAWABLE (window);
 
+  /* Windows with a foreign parent are treated as if they are children
+   * of the root window, except for actual creation.
+   */
+  if (GDK_WINDOW_TYPE (parent) == GDK_WINDOW_FOREIGN)
+    parent = _gdk_parent_root;
+  
   private->parent = (GdkWindowObject *)parent;
 
   if (attributes_mask & GDK_WA_X)
@@ -480,7 +477,6 @@ gdk_window_new (GdkWindow     *parent,
     visual = attributes->visual;
   else
     visual = gdk_visual_get_system ();
-  xvisual = ((GdkVisualPrivate*) visual)->xvisual;
 
   if (attributes_mask & GDK_WA_TITLE)
     title = attributes->title;
@@ -489,9 +485,9 @@ gdk_window_new (GdkWindow     *parent,
   if (!title || !*title)
     title = "GDK client window";
 
-  impl->event_mask = GDK_STRUCTURE_MASK | attributes->event_mask;
+  private->event_mask = GDK_STRUCTURE_MASK | attributes->event_mask;
       
-  if (parent_private && parent_private->guffaw_gravity)
+  if (private->parent && private->parent->guffaw_gravity)
     {
       /* XXX ??? */
     }
@@ -510,19 +506,7 @@ gdk_window_new (GdkWindow     *parent,
         }
       else
        {
-         if ((((GdkVisualPrivate*)gdk_visual_get_system ())->xvisual) == xvisual)
-            {
-              draw_impl->colormap = gdk_colormap_get_system ();
-              gdk_colormap_ref (draw_impl->colormap);
-             GDK_NOTE (MISC, g_print ("...using system colormap %p\n",
-                                      draw_impl->colormap));
-            }
-         else
-            {
-              draw_impl->colormap = gdk_colormap_new (visual, FALSE);
-             GDK_NOTE (MISC, g_print ("...using new colormap %p\n",
-                                      draw_impl->colormap));
-            }
+         draw_impl->colormap = gdk_colormap_get_system ();
        }
     }
   else
@@ -530,12 +514,13 @@ gdk_window_new (GdkWindow     *parent,
       dwExStyle = WS_EX_TRANSPARENT;
       private->depth = 0;
       private->input_only = TRUE;
-      draw_impl->colormap = NULL;
-      GDK_NOTE (MISC, g_print ("...GDK_INPUT_ONLY, NULL colormap\n"));
+      draw_impl->colormap = gdk_colormap_get_system ();
+      gdk_colormap_ref (draw_impl->colormap);
+      GDK_NOTE (MISC, g_print ("...GDK_INPUT_ONLY, system colormap\n"));
     }
 
-  if (parent_private)
-    parent_private->children = g_list_prepend (parent_private->children, window);
+  if (private->parent)
+    private->parent->children = g_list_prepend (private->parent->children, window);
 
   switch (private->window_type)
     {
@@ -557,7 +542,9 @@ gdk_window_new (GdkWindow     *parent,
       break;
 
     case GDK_WINDOW_TEMP:
-      dwStyle = WS_POPUP | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
+      dwStyle = WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
+      /* a temp window is not necessarily a top level window */
+      dwStyle |= (_gdk_parent_root == parent ? WS_POPUP : WS_CHILDWINDOW);
       dwExStyle |= WS_EX_TOOLWINDOW;
       break;
 
@@ -607,8 +594,8 @@ gdk_window_new (GdkWindow     *parent,
                                      MAKEINTRESOURCE(klass),
                                      mbtitle,
                                      dwStyle,
-                                     x, y, 
-                                     width, height,
+                                     impl->position_info.x, impl->position_info.y, 
+                                     impl->position_info.width, impl->position_info.height,
                                      hparent,
                                      NULL,
                                      gdk_app_hmodule,
@@ -620,17 +607,17 @@ gdk_window_new (GdkWindow     *parent,
                    MAKEINTRESOURCE(klass),
                    mbtitle,
                    dwStyle,
-                   x, y, 
-                   width, height,
+                   impl->position_info.x, impl->position_info.y, 
+                   impl->position_info.width, impl->position_info.height,
                    hparent,
                    NULL,
                    gdk_app_hmodule,
                    window);
   if (GDK_WINDOW_HWND (window) != hwndNew)
     {
-      g_warning("gdk_window_new: gdk_event_translate::WM_CREATE (%#x, %#x) HWND mismatch.",
-               (guint) GDK_WINDOW_HWND (window),
-               (guint) hwndNew);
+      g_warning("gdk_window_new: gdk_event_translate::WM_CREATE (%p, %p) HWND mismatch.",
+               GDK_WINDOW_HWND (window),
+               hwndNew);
 
       /* HB: IHMO due to a race condition the handle was increased by
        * one, which causes much trouble. Because I can't find the 
@@ -653,14 +640,11 @@ gdk_window_new (GdkWindow     *parent,
 #endif
 
   GDK_NOTE (MISC,
-           g_print ("... \"%s\" %dx%d@+%d+%d %#x = %#x\n"
-                    "... locale %#x codepage %d\n",
+           g_print ("... \"%s\" %dx%d@+%d+%d %p = %p\n",
                     mbtitle,
                     width, height, (x == CW_USEDEFAULT ? -9999 : x), y, 
-                    (guint) hparent,
-                    (guint) GDK_WINDOW_HWND (window),
-                    (guint) impl->input_locale,
-                    (guint) impl->charset_info.ciACP));
+                    hparent,
+                    GDK_WINDOW_HWND (window)));
 
   g_free (mbtitle);
 
@@ -688,7 +672,6 @@ gdk_window_foreign_new (GdkNativeWindow anid)
 {
   GdkWindow *window;
   GdkWindowObject *private;
-  GdkWindowObject *parent_private;
   GdkWindowImplWin32 *impl;
   GdkDrawableImplWin32 *draw_impl;
 
@@ -704,11 +687,10 @@ gdk_window_foreign_new (GdkNativeWindow anid)
   parent = GetParent ((HWND)anid);
   
   private->parent = gdk_win32_handle_table_lookup ((GdkNativeWindow) parent);
+  if (!private->parent || GDK_WINDOW_TYPE (private->parent) == GDK_WINDOW_FOREIGN)
+    private->parent = (GdkWindowObject *)_gdk_parent_root;
   
-  parent_private = (GdkWindowObject *)private->parent;
-  
-  if (parent_private)
-    parent_private->children = g_list_prepend (parent_private->children, window);
+  private->parent->children = g_list_prepend (private->parent->children, window);
 
   draw_impl->handle = (HWND) anid;
   GetClientRect ((HWND) anid, &rect);
@@ -723,6 +705,7 @@ gdk_window_foreign_new (GdkNativeWindow anid)
   impl->height = rect.bottom - rect.top;
   private->window_type = GDK_WINDOW_FOREIGN;
   private->destroyed = FALSE;
+  private->event_mask = GDK_ALL_EVENTS_MASK; /* XXX */
   if (IsWindowVisible ((HWND) anid))
     private->state &= (~GDK_WINDOW_STATE_WITHDRAWN);
   else
@@ -735,6 +718,12 @@ gdk_window_foreign_new (GdkNativeWindow anid)
   return window;
 }
 
+GdkWindow*
+gdk_window_lookup (GdkNativeWindow hwnd)
+{
+  return (GdkWindow*) gdk_win32_handle_table_lookup (hwnd); 
+}
+
 void
 _gdk_windowing_window_destroy (GdkWindow *window,
                               gboolean   recursing,
@@ -744,8 +733,8 @@ _gdk_windowing_window_destroy (GdkWindow *window,
 
   g_return_if_fail (GDK_IS_WINDOW (window));
   
-  GDK_NOTE (MISC, g_print ("_gdk_windowing_window_destroy %#x\n",
-                          (guint) GDK_WINDOW_HWND (window)));
+  GDK_NOTE (MISC, g_print ("_gdk_windowing_window_destroy %p\n",
+                          GDK_WINDOW_HWND (window)));
 
   if (private->extension_events != 0)
     gdk_input_window_destroy (window);
@@ -770,7 +759,10 @@ _gdk_windowing_window_destroy (GdkWindow *window,
        }
     }
   else if (!recursing && !foreign_destroy)
-    DestroyWindow (GDK_WINDOW_HWND (window));
+    {
+      private->destroyed = TRUE;
+      DestroyWindow (GDK_WINDOW_HWND (window));
+    }
 }
 
 /* This function is called when the window really gone.
@@ -782,15 +774,15 @@ gdk_window_destroy_notify (GdkWindow *window)
   g_return_if_fail (GDK_IS_WINDOW (window));
 
   GDK_NOTE (EVENTS,
-           g_print ("gdk_window_destroy_notify: %#x  %s\n",
-                    (guint) GDK_WINDOW_HWND (window),
+           g_print ("gdk_window_destroy_notify: %p  %s\n",
+                    GDK_WINDOW_HWND (window),
                     (GDK_WINDOW_DESTROYED (window) ? "(destroyed)" : "")));
 
   if (!GDK_WINDOW_DESTROYED (window))
     {
       if (GDK_WINDOW_TYPE(window) != GDK_WINDOW_FOREIGN)
-       g_warning ("window %#x unexpectedly destroyed",
-                  (guint) GDK_WINDOW_HWND (window));
+       g_warning ("window %p unexpectedly destroyed",
+                  GDK_WINDOW_HWND (window));
 
       _gdk_window_destroy (window, TRUE);
     }
@@ -799,18 +791,18 @@ gdk_window_destroy_notify (GdkWindow *window)
   gdk_drawable_unref (window);
 }
 
-void
-gdk_window_show (GdkWindow *window)
+static void
+show_window_internal (GdkWindow *window,
+                      gboolean   raise)
 {
   GdkWindowObject *private;
   
-  g_return_if_fail (GDK_IS_WINDOW (window));
-  
-  private = (GdkWindowObject*) window;
+  private = GDK_WINDOW_OBJECT (window);
+
   if (!private->destroyed)
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_show: %#x\n",
-                              (guint) GDK_WINDOW_HWND (window)));
+      GDK_NOTE (MISC, g_print ("gdk_window_show: %p\n",
+                              GDK_WINDOW_HWND (window)));
 
       private->state &= (~GDK_WINDOW_STATE_WITHDRAWN);
       if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TEMP)
@@ -834,11 +826,20 @@ gdk_window_show (GdkWindow *window)
             {
              GdkWindow *parent = GDK_WINDOW (private->parent);
 
-             ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWNORMAL);
-             ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE);
-              if (parent == gdk_parent_root)
+             /* Todo: GDK_WINDOW_STATE_STICKY */
+             if (private->state & GDK_WINDOW_STATE_ICONIFIED)
+               ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWMINIMIZED);
+             else if (private->state & GDK_WINDOW_STATE_MAXIMIZED)
+               ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWMAXIMIZED);
+             else
+               {
+                 ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWNORMAL);
+                 ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE);
+               }
+              if (parent == _gdk_parent_root)
                 SetForegroundWindow (GDK_WINDOW_HWND (window));
-             BringWindowToTop (GDK_WINDOW_HWND (window));
+             if (raise)
+               BringWindowToTop (GDK_WINDOW_HWND (window));
 #if 0
              ShowOwnedPopups (GDK_WINDOW_HWND (window), TRUE);
 #endif
@@ -847,6 +848,22 @@ gdk_window_show (GdkWindow *window)
     }
 }
 
+void
+gdk_window_show_unraised (GdkWindow *window)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  
+  show_window_internal (window, FALSE);
+}
+
+void
+gdk_window_show (GdkWindow *window)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  show_window_internal (window, TRUE);
+}
+
 void
 gdk_window_hide (GdkWindow *window)
 {
@@ -857,10 +874,13 @@ gdk_window_hide (GdkWindow *window)
   private = (GdkWindowObject*) window;
   if (!private->destroyed)
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_hide: %#x\n",
-                              (guint) GDK_WINDOW_HWND (window)));
+      GDK_NOTE (MISC, g_print ("gdk_window_hide: %p\n",
+                              GDK_WINDOW_HWND (window)));
 
       private->state |= GDK_WINDOW_STATE_WITHDRAWN;
+
+      _gdk_window_clear_update_area (window);
+
       if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TOPLEVEL)
        ShowOwnedPopups (GDK_WINDOW_HWND (window), FALSE);
 
@@ -886,8 +906,8 @@ gdk_window_withdraw (GdkWindow *window)
   private = (GdkWindowObject*) window;
   if (!private->destroyed)
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_withdraw: %#x\n",
-                              (guint) GDK_WINDOW_HWND (window)));
+      GDK_NOTE (MISC, g_print ("gdk_window_withdraw: %p\n",
+                              GDK_WINDOW_HWND (window)));
 
       gdk_window_hide (window);        /* ??? */
     }
@@ -906,7 +926,19 @@ gdk_window_move (GdkWindow *window,
 
   impl = GDK_WINDOW_IMPL_WIN32 (private->impl);
   
-  gdk_window_move_resize (window, x, y, impl->width, impl->height);
+  if (!GDK_WINDOW_DESTROYED (window))
+    {
+      if (GDK_WINDOW_TYPE (private) == GDK_WINDOW_CHILD)
+       _gdk_window_move_resize_child (window, x, y,
+                                      impl->width, impl->height);
+      else
+       {
+         if (!SetWindowPos (GDK_WINDOW_HWND (window), NULL,
+                            x, y, impl->width, impl->height,
+                            SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER))
+           WIN32_API_FAILED ("SetWindowPos");
+       }
+    }
 }
 
 void
@@ -928,13 +960,12 @@ gdk_window_resize (GdkWindow *window,
 
   impl = GDK_WINDOW_IMPL_WIN32 (private->impl);
   
-  if (!private->destroyed)
+  if (!GDK_WINDOW_DESTROYED (window))
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_resize: %#x %dx%d\n",
-                              (guint) GDK_WINDOW_HWND (window),
-                              width, height));
-      
-      if (GDK_WINDOW_TYPE (private) != GDK_WINDOW_CHILD)
+      if (GDK_WINDOW_TYPE (private) == GDK_WINDOW_CHILD)
+       _gdk_window_move_resize_child (window, private->x, private->y,
+                                      width, height);
+      else
        {
          POINT pt;
          RECT rect;
@@ -958,22 +989,12 @@ gdk_window_resize (GdkWindow *window,
          y = rect.top;
          width = rect.right - rect.left;
          height = rect.bottom - rect.top;
+         if (!SetWindowPos (GDK_WINDOW_HWND (window), NULL,
+                            x, y, width, height,
+                            SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER))
+           WIN32_API_FAILED ("SetWindowPos");
        }
-      else
-       {
-         x = private->x;
-         y = private->y;
-         impl->width = width;
-         impl->height = height;
-       }
-
       private->resize_count += 1;
-
-      GDK_NOTE (MISC, g_print ("...MoveWindow(%#x,%dx%d@+%d+%d)\n",
-                              (guint) GDK_WINDOW_HWND (window),
-                              width, height, x, y));
-      if (!MoveWindow (GDK_WINDOW_HWND (window), x, y, width, height, TRUE))
-       WIN32_API_FAILED ("MoveWindow");
     }
 }
 
@@ -1003,8 +1024,8 @@ gdk_window_move_resize (GdkWindow *window,
       DWORD dwStyle;
       DWORD dwExStyle;
 
-      GDK_NOTE (MISC, g_print ("gdk_window_move_resize: %#x %dx%d@+%d+%d\n",
-                              (guint) GDK_WINDOW_HWND (window),
+      GDK_NOTE (MISC, g_print ("gdk_window_move_resize: %p %dx%d@+%d+%d\n",
+                              GDK_WINDOW_HWND (window),
                               width, height, x, y));
       
       if (GDK_WINDOW_TYPE (private) == GDK_WINDOW_CHILD)
@@ -1021,15 +1042,15 @@ gdk_window_move_resize (GdkWindow *window,
          if (!AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle))
            WIN32_API_FAILED ("AdjustWindowRectEx");
 
-         GDK_NOTE (MISC, g_print ("...MoveWindow(%#x,%ldx%ld@+%ld+%ld)\n",
-                                  (guint) GDK_WINDOW_HWND (window),
+         GDK_NOTE (MISC, g_print ("...SetWindowPos(%p,%ldx%ld@+%ld+%ld)\n",
+                                  GDK_WINDOW_HWND (window),
                                   rect.right - rect.left, rect.bottom - rect.top,
                                   rect.left, rect.top));
-         if (!MoveWindow (GDK_WINDOW_HWND (window),
-                          rect.left, rect.top,
-                          rect.right - rect.left, rect.bottom - rect.top,
-                          TRUE))
-           WIN32_API_FAILED ("MoveWindow");
+         if (!SetWindowPos (GDK_WINDOW_HWND (window), NULL,
+                            rect.left, rect.top,
+                            rect.right - rect.left, rect.bottom - rect.top,
+                            SWP_NOACTIVATE | SWP_NOZORDER))
+           WIN32_API_FAILED ("SetWindowPos");
        }
     }
 }
@@ -1046,9 +1067,12 @@ gdk_window_reparent (GdkWindow *window,
   GdkWindowImplWin32 *impl;
 
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  g_return_if_fail (new_parent == NULL || GDK_IS_WINDOW (new_parent));
+  g_return_if_fail (GDK_WINDOW_TYPE (window) != GDK_WINDOW_ROOT);
 
   if (!new_parent)
-    new_parent = gdk_parent_root;
+    new_parent = _gdk_parent_root;
 
   window_private = (GdkWindowObject*) window;
   old_parent_private = (GdkWindowObject *) window_private->parent;
@@ -1057,9 +1081,9 @@ gdk_window_reparent (GdkWindow *window,
 
   if (!GDK_WINDOW_DESTROYED (window) && !GDK_WINDOW_DESTROYED (new_parent))
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_reparent: %#x %#x\n",
-                              (guint) GDK_WINDOW_HWND (window),
-                              (guint) GDK_WINDOW_HWND (new_parent)));
+      GDK_NOTE (MISC, g_print ("gdk_window_reparent: %p %p\n",
+                              GDK_WINDOW_HWND (window),
+                              GDK_WINDOW_HWND (new_parent)));
       if (!SetParent (GDK_WINDOW_HWND (window),
                      GDK_WINDOW_HWND (new_parent)))
        WIN32_API_FAILED ("SetParent");
@@ -1068,6 +1092,12 @@ gdk_window_reparent (GdkWindow *window,
                       x, y, impl->width, impl->height, TRUE))
        WIN32_API_FAILED ("MoveWindow");
     }
+
+  /* From here on, we treat parents of type GDK_WINDOW_FOREIGN like
+   * the root window
+   */
+  if (GDK_WINDOW_TYPE (new_parent) == GDK_WINDOW_FOREIGN)
+    new_parent = _gdk_parent_root;
   
   window_private->parent = (GdkWindowObject *)new_parent;
 
@@ -1081,6 +1111,7 @@ gdk_window_reparent (GdkWindow *window,
     gdk_window_set_static_win_gravity (window, parent_private->guffaw_gravity);
   
   parent_private->children = g_list_prepend (parent_private->children, window);
+  _gdk_window_init_position (GDK_WINDOW (window_private));
 }
 
 void
@@ -1106,13 +1137,14 @@ _gdk_windowing_window_clear_area (GdkWindow *window,
       if (height == 0)
        height = impl->height - y;
       GDK_NOTE (MISC, g_print ("_gdk_windowing_window_clear_area: "
-                              "%#x %dx%d@+%d+%d\n",
-                              (guint) GDK_WINDOW_HWND (window),
+                              "%p %dx%d@+%d+%d\n",
+                              GDK_WINDOW_HWND (window),
                               width, height, x, y));
       hdc = GetDC (GDK_WINDOW_HWND (window));
       IntersectClipRect (hdc, x, y, x + width + 1, y + height + 1);
       SendMessage (GDK_WINDOW_HWND (window), WM_ERASEBKGND, (WPARAM) hdc, 0);
-      ReleaseDC (GDK_WINDOW_HWND (window), hdc);
+      if (!ReleaseDC (GDK_WINDOW_HWND (window), hdc))
+       WIN32_GDI_FAILED ("ReleaseDC");
     }
 }
 
@@ -1131,8 +1163,8 @@ _gdk_windowing_window_clear_area_e (GdkWindow *window,
       RECT rect;
 
       GDK_NOTE (MISC, g_print ("_gdk_windowing_window_clear_area_e: "
-                              "%#x %dx%d@+%d+%d\n",
-                              (guint) GDK_WINDOW_HWND (window),
+                              "%p %dx%d@+%d+%d\n",
+                              GDK_WINDOW_HWND (window),
                               width, height, x, y));
 
       rect.left = x;
@@ -1153,8 +1185,8 @@ gdk_window_raise (GdkWindow *window)
   
   if (!GDK_WINDOW_DESTROYED (window))
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_raise: %#x\n",
-                              (guint) GDK_WINDOW_HWND (window)));
+      GDK_NOTE (MISC, g_print ("gdk_window_raise: %p\n",
+                              GDK_WINDOW_HWND (window)));
 
       if (!BringWindowToTop (GDK_WINDOW_HWND (window)))
        WIN32_API_FAILED ("BringWindowToTop");
@@ -1169,8 +1201,8 @@ gdk_window_lower (GdkWindow *window)
   
   if (!GDK_WINDOW_DESTROYED (window))
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_lower: %#x\n",
-                              (guint) GDK_WINDOW_HWND (window)));
+      GDK_NOTE (MISC, g_print ("gdk_window_lower: %p\n",
+                              GDK_WINDOW_HWND (window)));
 
       if (!SetWindowPos (GDK_WINDOW_HWND (window), HWND_BOTTOM, 0, 0, 0, 0,
                         SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE))
@@ -1203,8 +1235,8 @@ gdk_window_set_hints (GdkWindow *window,
   
   impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
 
-  GDK_NOTE (MISC, g_print ("gdk_window_set_hints: %#x %dx%d..%dx%d @+%d+%d\n",
-                          (guint) GDK_WINDOW_HWND (window),
+  GDK_NOTE (MISC, g_print ("gdk_window_set_hints: %p %dx%d..%dx%d @+%d+%d\n",
+                          GDK_WINDOW_HWND (window),
                           min_width, min_height, max_width, max_height,
                           x, y));
 
@@ -1213,6 +1245,14 @@ gdk_window_set_hints (GdkWindow *window,
 
   if (flags)
     {
+      GdkGeometry geom;
+      gint        geom_mask = 0;
+
+      geom.min_width  = min_width;
+      geom.min_height = min_height;
+      geom.max_width  = max_width;
+      geom.max_height = max_height;
+
       if (flags & GDK_HINT_POS)
        {
          if (!GetWindowPlacement (GDK_WINDOW_HWND (window), &size_hints))
@@ -1260,47 +1300,12 @@ gdk_window_set_hints (GdkWindow *window,
        }
 
       if (flags & GDK_HINT_MIN_SIZE)
-       {
-         rect.left = 0;
-         rect.top = 0;
-         rect.right = min_width;
-         rect.bottom = min_height;
-         dwStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
-         dwExStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE);
-         SafeAdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
-         impl->hint_min_width = rect.right - rect.left;
-         impl->hint_min_height = rect.bottom - rect.top;
-
-         /* Also chek if he current size of the window is in bounds. */
-         GetClientRect (GDK_WINDOW_HWND (window), &rect);
-         if (rect.right < min_width && rect.bottom < min_height)
-           gdk_window_resize (window, min_width, min_height);
-         else if (rect.right < min_width)
-           gdk_window_resize (window, min_width, rect.bottom);
-         else if (rect.bottom < min_height)
-           gdk_window_resize (window, rect.right, min_height);
-       }
+        geom_mask |= GDK_HINT_MIN_SIZE;
 
       if (flags & GDK_HINT_MAX_SIZE)
-       {
-         rect.left = 0;
-         rect.top = 0;
-         rect.right = max_width;
-         rect.bottom = max_height;
-         dwStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
-         dwExStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE);
-         AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
-         impl->hint_max_width = rect.right - rect.left;
-         impl->hint_max_height = rect.bottom - rect.top;
-         /* Again, check if the window is too large currently. */
-         GetClientRect (GDK_WINDOW_HWND (window), &rect);
-         if (rect.right > max_width && rect.bottom > max_height)
-           gdk_window_resize (window, max_width, max_height);
-         else if (rect.right > max_width)
-           gdk_window_resize (window, max_width, rect.bottom);
-         else if (rect.bottom > max_height)
-           gdk_window_resize (window, rect.right, max_height);
-       }
+        geom_mask |= GDK_HINT_MAX_SIZE;
+
+      gdk_window_set_geometry_hints (window, &geom, geom_mask);
     }
 }
 
@@ -1314,6 +1319,7 @@ gdk_window_set_geometry_hints (GdkWindow      *window,
   RECT rect;
   DWORD dwStyle;
   DWORD dwExStyle;
+  gint new_width = 0, new_height = 0;
   
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
@@ -1327,7 +1333,7 @@ gdk_window_set_geometry_hints (GdkWindow      *window,
   impl->hint_flags = geom_mask;
 
   if (geom_mask & GDK_HINT_POS)
-    ; /* XXX */
+    ; /* even the X11 mplementation doesn't care */
 
   if (geom_mask & GDK_HINT_MIN_SIZE)
     {
@@ -1343,13 +1349,20 @@ gdk_window_set_geometry_hints (GdkWindow      *window,
 
       /* Also check if he current size of the window is in bounds */
       GetClientRect (GDK_WINDOW_HWND (window), &rect);
+
       if (rect.right < geometry->min_width
          && rect.bottom < geometry->min_height)
-       gdk_window_resize (window, geometry->min_width, geometry->min_height);
+       {
+         new_width = geometry->min_width; new_height = geometry->min_height;
+       }
       else if (rect.right < geometry->min_width)
-       gdk_window_resize (window, geometry->min_width, rect.bottom);
+       {
+         new_width = geometry->min_width; new_height = rect.bottom;
+       }
       else if (rect.bottom < geometry->min_height)
-       gdk_window_resize (window, rect.right, geometry->min_height);
+       {
+         new_width = rect.right; new_height = geometry->min_height;
+       }
     }
   
   if (geom_mask & GDK_HINT_MAX_SIZE)
@@ -1372,12 +1385,22 @@ gdk_window_set_geometry_hints (GdkWindow      *window,
       GetClientRect (GDK_WINDOW_HWND (window), &rect);
       if (rect.right > geometry->max_width
          && rect.bottom > geometry->max_height)
-       gdk_window_resize (window, geometry->max_width, geometry->max_height);
+       {
+         new_width = geometry->max_width; new_height = geometry->max_height;
+       }
       else if (rect.right > geometry->max_width)
-       gdk_window_resize (window, geometry->max_width, rect.bottom);
+       {
+         new_width = geometry->max_width; new_height = rect.bottom;
+       }
       else if (rect.bottom > geometry->max_height)
-       gdk_window_resize (window, rect.right, geometry->max_height);
+       {
+         new_width = rect.right; new_height = geometry->max_height;
+       }
     }
+
+  /* finally apply new size constraints */
+  if (new_width != 0 && new_height != 0)
+    gdk_window_resize (window, new_width, new_height);
   
   /* I don't know what to do when called with zero base_width and height. */
   if (geom_mask & GDK_HINT_BASE_SIZE
@@ -1433,8 +1456,8 @@ gdk_window_set_title (GdkWindow   *window,
   if (!title[0])
     title = ".";
   
-  GDK_NOTE (MISC, g_print ("gdk_window_set_title: %#x %s\n",
-                          (guint) GDK_WINDOW_HWND (window), title));
+  GDK_NOTE (MISC, g_print ("gdk_window_set_title: %p %s\n",
+                          GDK_WINDOW_HWND (window), title));
   
   if (!GDK_WINDOW_DESTROYED (window))
     {
@@ -1456,8 +1479,8 @@ gdk_window_set_role (GdkWindow   *window,
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   
-  GDK_NOTE (MISC, g_print ("gdk_window_set_role: %#x %s\n",
-                          (guint) GDK_WINDOW_HWND (window),
+  GDK_NOTE (MISC, g_print ("gdk_window_set_role: %p %s\n",
+                          GDK_WINDOW_HWND (window),
                           (role ? role : "NULL")));
   /* XXX */
 }
@@ -1466,13 +1489,44 @@ void
 gdk_window_set_transient_for (GdkWindow *window, 
                              GdkWindow *parent)
 {
+  HWND window_id, parent_id;
+  LONG style;
+
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   
-  GDK_NOTE (MISC, g_print ("gdk_window_set_transient_for: %#x %#x\n",
-                          (guint) GDK_WINDOW_HWND (window),
-                          (guint) GDK_WINDOW_HWND (parent)));
-  /* XXX */
+  GDK_NOTE (MISC, g_print ("gdk_window_set_transient_for: %p %p\n",
+                          GDK_WINDOW_HWND (window),
+                          GDK_WINDOW_HWND (parent)));
+
+  if (GDK_WINDOW_DESTROYED (window) || GDK_WINDOW_DESTROYED (parent))
+    return;
+
+  window_id = GDK_WINDOW_HWND (window);
+  parent_id = GDK_WINDOW_HWND (parent);
+
+  if ((style = GetWindowLong (window_id, GWL_STYLE)) == 0)
+    WIN32_API_FAILED ("GetWindowLong");
+
+  style |= WS_POPUP;
+#if 0 /* not sure if we want to do this */
+  style &= ~(WS_SYSMENU | WS_MAXIMIZEBOX | WS_MINIMIZEBOX);
+#endif
+
+  if (!SetWindowLong (window_id, GWL_STYLE, style))
+    WIN32_API_FAILED ("SetWindowLong");
+#if 0 /* not sure if we want to do this, clipping to parent size! */
+  if (!SetParent (window_id, parent_id))
+       WIN32_API_FAILED ("SetParent");
+#else /* make the modal window topmost instead */
+  if (!SetWindowPos (window_id, HWND_TOPMOST, 0, 0, 0, 0,
+                     SWP_NOMOVE | SWP_NOSIZE))
+    WIN32_API_FAILED ("SetWindowPos");
+#endif
+
+  if (!RedrawWindow (window_id, NULL, NULL, 
+                     RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW))
+    WIN32_API_FAILED ("RedrawWindow");
 }
 
 void
@@ -1484,8 +1538,8 @@ gdk_window_set_background (GdkWindow *window,
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   
-  GDK_NOTE (MISC, g_print ("gdk_window_set_background: %#x %s\n",
-                          (guint) GDK_WINDOW_HWND (window), 
+  GDK_NOTE (MISC, g_print ("gdk_window_set_background: %p %s\n",
+                          GDK_WINDOW_HWND (window), 
                           gdk_win32_color_to_string (color)));
 
   private->bg_color = *color;
@@ -1518,6 +1572,7 @@ gdk_window_set_back_pixmap (GdkWindow *window,
   if (parent_relative)
     {
       private->bg_pixmap = GDK_PARENT_RELATIVE_BG;
+      GDK_NOTE (MISC, g_print (G_STRLOC ": setting background pixmap to parent_relative\n"));
     }
   else
     {
@@ -1541,7 +1596,6 @@ gdk_window_set_cursor (GdkWindow *window,
   GdkCursorPrivate *cursor_private;
   HCURSOR hcursor;
   HCURSOR hprevcursor;
-  POINT pt;
   
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
@@ -1549,43 +1603,58 @@ gdk_window_set_cursor (GdkWindow *window,
   impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
   cursor_private = (GdkCursorPrivate*) cursor;
   
-  if (!GDK_WINDOW_DESTROYED (window))
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  if (!cursor)
+    hcursor = NULL;
+  else
+    hcursor = cursor_private->hcursor;
+  
+  GDK_NOTE (MISC, g_print ("gdk_window_set_cursor: %p %p\n",
+                          GDK_WINDOW_HWND (window),
+                          hcursor));
+
+  /* First get the old cursor, if any (we wait to free the old one
+   * since it may be the current cursor set in the Win32 API right
+   * now).
+   */
+  hprevcursor = impl->hcursor;
+
+  if (hcursor == NULL)
+    impl->hcursor = NULL;
+  else
     {
-      if (!cursor)
-       hcursor = NULL;
-      else
-       hcursor = cursor_private->hcursor;
-
-      GDK_NOTE (MISC, g_print ("gdk_window_set_cursor: %#x %#x\n",
-                              (guint) GDK_WINDOW_HWND (window),
-                              (guint) hcursor));
-      hprevcursor = impl->hcursor;
-      if (hcursor == NULL)
-       impl->hcursor = NULL;
-      else
-       {
-         /* We must copy the cursor as it is OK to destroy the GdkCursor
-          * while still in use for some window. See for instance
-          * gimp_change_win_cursor() which calls
-          * gdk_window_set_cursor (win, cursor), and immediately
-          * afterwards gdk_cursor_destroy (cursor).
-          */
-         impl->hcursor = CopyCursor (hcursor);
-         GDK_NOTE (MISC, g_print ("...CopyCursor (%#x) = %#x\n",
-                                  (guint) hcursor, (guint) impl->hcursor));
+      /* We must copy the cursor as it is OK to destroy the GdkCursor
+       * while still in use for some window. See for instance
+       * gimp_change_win_cursor() which calls gdk_window_set_cursor
+       * (win, cursor), and immediately afterwards gdk_cursor_destroy
+       * (cursor).
+       */
+      if ((impl->hcursor = CopyCursor (hcursor)) == NULL)
+       WIN32_API_FAILED ("CopyCursor");
+      GDK_NOTE (MISC, g_print ("...CopyCursor (%p) = %p\n",
+                              hcursor, impl->hcursor));
+    }
 
-         if (hprevcursor != NULL && GetCursor () == hprevcursor)
-           SetCursor (impl->hcursor);
+   /* Set new cursor in all cases if we're over our window */
+  if (gdk_window_get_pointer(window, NULL, NULL, NULL) == window)
+    SetCursor (impl->hcursor);
 
-         if (hprevcursor != NULL)
-           {
-             GDK_NOTE (MISC, g_print ("...DestroyCursor (%#x)\n",
-                                      (guint) hprevcursor));
-         
-             if (!DestroyCursor (hprevcursor))
-               WIN32_API_FAILED ("DestroyCursor");
-           }
-       }
+  /* Destroy the previous cursor: Need to make sure it's no longer in
+   * use before we destroy it, in case we're not over our window but
+   * the cursor is still set to our old one.
+   */
+  if (hprevcursor != NULL)
+    {
+      if (GetCursor() == hprevcursor)
+       SetCursor (NULL);
+
+      GDK_NOTE (MISC, g_print ("...DestroyCursor (%p)\n",
+                              hprevcursor));
+      
+      if (!DestroyCursor (hprevcursor))
+       WIN32_API_FAILED ("DestroyCursor");
     }
 }
 
@@ -1600,7 +1669,7 @@ gdk_window_get_geometry (GdkWindow *window,
   g_return_if_fail (window == NULL || GDK_IS_WINDOW (window));
   
   if (!window)
-    window = gdk_parent_root;
+    window = _gdk_parent_root;
   
   if (!GDK_WINDOW_DESTROYED (window))
     {
@@ -1652,8 +1721,8 @@ gdk_window_get_origin (GdkWindow *window,
   if (y)
     *y = ty;
 
-  GDK_NOTE (MISC, g_print ("gdk_window_get_origin: %#x: +%d+%d\n",
-                          (guint) GDK_WINDOW_HWND (window),
+  GDK_NOTE (MISC, g_print ("gdk_window_get_origin: %p: +%d+%d\n",
+                          GDK_WINDOW_HWND (window),
                           tx, ty));
   return return_val;
 }
@@ -1671,38 +1740,17 @@ gdk_window_get_root_origin (GdkWindow *window,
                            gint      *x,
                            gint      *y)
 {
-  GdkWindowObject *rover;
-  POINT pt;
+  GdkRectangle rect;
 
-  g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
 
-  rover = (GdkWindowObject*) window;
-  if (x)
-    *x = 0;
-  if (y)
-    *y = 0;
-
-  if (GDK_WINDOW_DESTROYED (window))
-    return;
-      
-  while (rover->parent && ((GdkWindowObject*) rover->parent)->parent)
-    rover = (GdkWindowObject *) rover->parent;
-  if (rover->destroyed)
-    return;
+  gdk_window_get_frame_extents (window, &rect);
 
-  pt.x = 0;
-  pt.y = 0;
-  ClientToScreen (GDK_WINDOW_HWND (rover), &pt);
   if (x)
-    *x = pt.x;
-  if (y)
-    *y = pt.y;
+    *x = rect.x;
 
-  GDK_NOTE (MISC, g_print ("gdk_window_get_root_origin: %#x: (%#x) +%ld+%ld\n",
-                          (guint) GDK_WINDOW_HWND (window),
-                          (guint) GDK_WINDOW_HWND (rover),
-                          pt.x, pt.y));
+  if (y)
+    *y = rect.y;
 }
 
 void
@@ -1713,6 +1761,11 @@ gdk_window_get_frame_extents (GdkWindow    *window,
   HWND hwnd;
   RECT r;
 
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  g_return_if_fail (rect != NULL);
+
+  private = GDK_WINDOW_OBJECT (window);
+
   rect->x = 0;
   rect->y = 0;
   rect->width = 1;
@@ -1721,7 +1774,11 @@ gdk_window_get_frame_extents (GdkWindow    *window,
   if (GDK_WINDOW_DESTROYED (window))
     return;
 
+  while (private->parent && ((GdkWindowObject*) private->parent)->parent)
+    private = (GdkWindowObject*) private->parent;
+
   hwnd = GDK_WINDOW_HWND (window);
+
   /* find the frame window */
   while (HWND_DESKTOP != GetParent (hwnd))
     {
@@ -1729,7 +1786,7 @@ gdk_window_get_frame_extents (GdkWindow    *window,
       g_return_if_fail (NULL != hwnd);
     }
 
-  if (GetWindowRect (hwnd, &r))
+  if (!GetWindowRect (hwnd, &r))
     WIN32_API_FAILED ("GetWindowRect");
 
   rect->x = r.left;
@@ -1739,23 +1796,23 @@ gdk_window_get_frame_extents (GdkWindow    *window,
 }
 
 GdkWindow*
-gdk_window_get_pointer (GdkWindow       *window,
-                       gint            *x,
-                       gint            *y,
-                       GdkModifierType *mask)
+_gdk_windowing_window_get_pointer (GdkWindow       *window,
+                                  gint            *x,
+                                  gint            *y,
+                                  GdkModifierType *mask)
 {
   GdkWindow *return_val;
-  POINT pointc, point;
+  POINT screen_point, point;
   HWND hwnd, hwndc;
 
   g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), NULL);
   
   if (!window)
-    window = gdk_parent_root;
+    window = _gdk_parent_root;
 
   return_val = NULL;
-  GetCursorPos (&pointc);
-  point = pointc;
+  GetCursorPos (&screen_point);
+  point = screen_point;
   ScreenToClient (GDK_WINDOW_HWND (window), &point);
 
   if (x)
@@ -1764,17 +1821,28 @@ gdk_window_get_pointer (GdkWindow       *window,
     *y = point.y;
 
   hwnd = WindowFromPoint (point);
-  point = pointc;
-  ScreenToClient (hwnd, &point);
-  
-  do {
-    hwndc = ChildWindowFromPoint (hwnd, point);
-    ClientToScreen (hwnd, &point);
-    ScreenToClient (hwndc, &point);
-  } while (hwndc != hwnd && (hwnd = hwndc, 1));        /* Ouch! */
-
-  return_val = gdk_win32_handle_table_lookup ((GdkNativeWindow) hwnd);
-
+  if (hwnd != NULL)
+    {
+      gboolean done = FALSE;
+      
+      while (!done)
+       {
+         point = screen_point;
+         ScreenToClient (hwnd, &point);
+         hwndc = ChildWindowFromPoint (hwnd, point);
+         if (hwndc == NULL)
+           done = TRUE;
+         else if (hwndc == hwnd)
+           done = TRUE;
+         else
+           hwnd = hwndc;
+       }
+      
+      return_val = gdk_window_lookup ((GdkNativeWindow) hwnd);
+    }
+  else
+    return_val = NULL;
+      
   if (mask)
     {
       BYTE kbd[256];
@@ -1801,8 +1869,9 @@ gdk_window_get_pointer (GdkWindow       *window,
 }
 
 GdkWindow*
-gdk_window_at_pointer (gint *win_x,
-                      gint *win_y)
+_gdk_windowing_window_at_pointer (GdkScreen *screen,
+                                 gint      *win_x,
+                                 gint      *win_y)
 {
   GdkWindow *window;
   POINT point, pointc;
@@ -1815,7 +1884,7 @@ gdk_window_at_pointer (gint *win_x,
 
   if (hwnd == NULL)
     {
-      window = gdk_parent_root;
+      window = _gdk_parent_root;
       if (win_x)
        *win_x = pointc.x;
       if (win_y)
@@ -1842,9 +1911,9 @@ gdk_window_at_pointer (gint *win_x,
        *win_y = point.y - rect.top;
     }
 
-  GDK_NOTE (MISC, g_print ("gdk_window_at_pointer: +%ld+%ld %#x%s\n",
+  GDK_NOTE (MISC, g_print ("gdk_window_at_pointer: +%ld+%ld %p%s\n",
                           point.x, point.y,
-                          (guint) hwnd,
+                          hwnd,
                           (window == NULL ? " NULL" : "")));
 
   return window;
@@ -1859,7 +1928,7 @@ gdk_window_get_events (GdkWindow *window)
   if (GDK_WINDOW_DESTROYED (window))
     return 0;
 
-  return GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->event_mask;
+  return GDK_WINDOW_OBJECT (window)->event_mask;
 }
 
 void          
@@ -1872,7 +1941,11 @@ gdk_window_set_events (GdkWindow   *window,
   if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->event_mask = event_mask;
+  /* gdk_window_new() always sets the GDK_STRUCTURE_MASK, so better
+   * set it here, too. Not that I know or remember why it is
+   * necessary, will have to test some day.
+   */
+  GDK_WINDOW_OBJECT (window)->event_mask = GDK_STRUCTURE_MASK | event_mask;
 }
 
 void
@@ -1885,8 +1958,8 @@ gdk_window_shape_combine_mask (GdkWindow *window,
 
   if (!mask)
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_shape_combine_mask: %#x none\n",
-                              (guint) GDK_WINDOW_HWND (window)));
+      GDK_NOTE (MISC, g_print ("gdk_window_shape_combine_mask: %p none\n",
+                              GDK_WINDOW_HWND (window)));
       SetWindowRgn (GDK_WINDOW_HWND (window), NULL, TRUE);
     }
   else
@@ -1897,11 +1970,11 @@ gdk_window_shape_combine_mask (GdkWindow *window,
       RECT rect;
 
       /* Convert mask bitmap to region */
-      hrgn = BitmapToRegion (GDK_WINDOW_HWND (mask));
+      hrgn = _gdk_win32_bitmap_to_region (mask);
 
-      GDK_NOTE (MISC, g_print ("gdk_window_shape_combine_mask: %#x %#x\n",
-                              (guint) GDK_WINDOW_HWND (window),
-                              (guint) GDK_WINDOW_HWND (mask)));
+      GDK_NOTE (MISC, g_print ("gdk_window_shape_combine_mask: %p %p\n",
+                              GDK_WINDOW_HWND (window),
+                              GDK_WINDOW_HWND (mask)));
 
       /* SetWindowRgn wants window (not client) coordinates */ 
       dwStyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
@@ -1915,9 +1988,9 @@ gdk_window_shape_combine_mask (GdkWindow *window,
       /* If this is a top-level window, add the title bar to the region */
       if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TOPLEVEL)
        {
-         CombineRgn (hrgn, hrgn,
-                     CreateRectRgn (0, 0, rect.right - rect.left, -rect.top),
-                     RGN_OR);
+         HRGN tmp = CreateRectRgn (0, 0, rect.right - rect.left, -rect.top);
+         CombineRgn (hrgn, hrgn, tmp, RGN_OR);
+         DeleteObject (tmp);
        }
       
       SetWindowRgn (GDK_WINDOW_HWND (window), hrgn, TRUE);
@@ -1934,6 +2007,22 @@ gdk_window_set_override_redirect (GdkWindow *window,
   g_warning ("gdk_window_set_override_redirect not implemented");
 }
 
+void          
+gdk_window_set_icon_list (GdkWindow *window,
+                         GList     *pixbufs)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  /* We could convert it to a hIcon and DrawIcon () it when getting
+   * a WM_PAINT with IsIconic, but is it worth it ? Same probably
+   * goes for gdk_window_set_icon (). Patches accepted :-)  --hb
+   * Or do we only need to deliver the Icon on WM_GETICON ?
+   */
+}
+
 void          
 gdk_window_set_icon (GdkWindow *window, 
                     GdkWindow *icon_window,
@@ -2213,8 +2302,7 @@ gdk_window_set_static_win_gravity (GdkWindow *window, gboolean on)
 {
   g_return_if_fail (window != NULL);
 
-  GDK_NOTE (MISC,
-           g_print ("gdk_window_set_static_win_gravity: Not implemented\n"));
+  GDK_NOTE (MISC, g_print ("gdk_window_set_static_win_gravity: Not implemented\n"));
 }
 
 /*************************************************************
@@ -2323,7 +2411,7 @@ gdk_window_stick (GdkWindow *window)
       /* "stick" means stick to all desktops _and_ do not scroll with the
        * viewport. i.e. glue to the monitor glass in all cases.
        */
-      g_warning ("gdk_window_stick (0x%X) ???", GDK_WINDOW_HWND (window));
+      g_warning ("gdk_window_stick (%p) ???", GDK_WINDOW_HWND (window));
     }
   else
     {
@@ -2344,7 +2432,7 @@ gdk_window_unstick (GdkWindow *window)
 
   if (GDK_WINDOW_IS_MAPPED (window))
     {
-      g_warning ("gdk_window_unstick (0x%X) ???", GDK_WINDOW_HWND (window));
+      g_warning ("gdk_window_unstick (%p) ???", GDK_WINDOW_HWND (window));
     }
   else
     {
@@ -2352,7 +2440,6 @@ gdk_window_unstick (GdkWindow *window)
       gdk_synthesize_window_state (window,
                                    GDK_WINDOW_STATE_STICKY,
                                    0);
-
     }
 }
 
@@ -2397,7 +2484,10 @@ gdk_window_focus (GdkWindow *window,
   if (GDK_WINDOW_DESTROYED (window))
     return;
   
+  GDK_NOTE (MISC, g_print ("gdk_window_focus: %p\n", GDK_WINDOW_HWND (window)));
+
   ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWNORMAL);
+  SetFocus (GDK_WINDOW_HWND (window));
 }
 
 void
@@ -2426,8 +2516,6 @@ void
 gdk_window_set_type_hint (GdkWindow        *window,
                          GdkWindowTypeHint hint)
 {
-  GdkAtom atom;
-  
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   
@@ -2437,27 +2525,22 @@ gdk_window_set_type_hint (GdkWindow        *window,
   switch (hint)
     {
     case GDK_WINDOW_TYPE_HINT_DIALOG:
-      atom = gdk_atom_intern ("_NET_WM_WINDOW_TYPE_DIALOG", FALSE);
       break;
     case GDK_WINDOW_TYPE_HINT_MENU:
-      atom = gdk_atom_intern ("_NET_WM_WINDOW_TYPE_MENU", FALSE);
       break;
     case GDK_WINDOW_TYPE_HINT_TOOLBAR:
-      atom = gdk_atom_intern ("_NET_WM_WINDOW_TYPE_TOOLBAR", FALSE);
       break;
     default:
       g_warning ("Unknown hint %d passed to gdk_window_set_type_hint", hint);
       /* Fall thru */
     case GDK_WINDOW_TYPE_HINT_NORMAL:
-      atom = gdk_atom_intern ("_NET_WM_WINDOW_TYPE_NORMAL", FALSE);
       break;
     }
   /*
    * XXX ???
    */
-  GDK_NOTE (MISC,
-            g_print ("gdk_window_set_type_hint (0x%0X)\n",
-                     GDK_WINDOW_HWND (window)));
+  GDK_NOTE (MISC, g_print ("gdk_window_set_type_hint (%p)\n",
+                          GDK_WINDOW_HWND (window)));
 }
 
 void
@@ -2466,8 +2549,6 @@ gdk_window_shape_combine_region (GdkWindow *window,
                                  gint       offset_x,
                                  gint       offset_y)
 {
-  gint xoffset, yoffset;
-  
   g_return_if_fail (GDK_IS_WINDOW (window));
 
   if (GDK_WINDOW_DESTROYED (window))
@@ -2505,4 +2586,4 @@ gdk_window_begin_move_drag (GdkWindow *window,
     return;
 
   /* XXX: isn't all this default on win32 ... */  
-}
\ No newline at end of file
+}