]> Pileus Git - ~andy/gtk/blobdiff - gdk/win32/gdkwindow-win32.c
List the three theme gtkrc files separately, zip doesn't do anything if
[~andy/gtk] / gdk / win32 / gdkwindow-win32.c
index dbc918e1d3c95c4fbc0b835ccef58dbbf4462592..5fe64b7e9f728fb73089e79486f537297a1ad564 100644 (file)
 /* 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-2004 Tor Lillqvist
+ * Copyright (C) 2001-2004 Hans Breuer
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
 
 /*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include "config.h"
-
+#include <config.h>
 #include <stdlib.h>
-#include <stdio.h>
 
+#include "gdk.h" /* gdk_rectangle_intersect */
 #include "gdkevents.h"
 #include "gdkpixmap.h"
 #include "gdkwindow.h"
-#include "gdkinternals.h"
-#include "gdkprivate.h"
+#include "gdkdisplay.h"
 #include "gdkprivate-win32.h"
-#include "gdkinputprivate.h"
-#include "gdkwin32.h"
+#include "gdkinput-win32.h"
+
+#if defined __MINGW32__ || (WINVER < 0x0500)
+typedef struct { 
+  DWORD        bV5Size; 
+  LONG         bV5Width; 
+  LONG         bV5Height; 
+  WORD         bV5Planes; 
+  WORD         bV5BitCount; 
+  DWORD        bV5Compression; 
+  DWORD        bV5SizeImage; 
+  LONG         bV5XPelsPerMeter; 
+  LONG         bV5YPelsPerMeter; 
+  DWORD        bV5ClrUsed; 
+  DWORD        bV5ClrImportant; 
+  DWORD        bV5RedMask; 
+  DWORD        bV5GreenMask; 
+  DWORD        bV5BlueMask; 
+  DWORD        bV5AlphaMask; 
+  DWORD        bV5CSType; 
+  CIEXYZTRIPLE bV5Endpoints; 
+  DWORD        bV5GammaRed; 
+  DWORD        bV5GammaGreen; 
+  DWORD        bV5GammaBlue; 
+  DWORD        bV5Intent; 
+  DWORD        bV5ProfileData; 
+  DWORD        bV5ProfileSize; 
+  DWORD        bV5Reserved; 
+} BITMAPV5HEADER;
 
-static gboolean gdk_window_gravity_works (void);
-static void     gdk_window_set_static_win_gravity (GdkWindow *window, 
-                                                  gboolean   on);
+#endif
 
-/* The Win API function AdjustWindowRect may return negative values
- * resulting in obscured title bars. This helper function is coreccting it.
- */
-BOOL
-SafeAdjustWindowRectEx (RECT* lpRect, 
-                       DWORD dwStyle, 
-                       BOOL bMenu, 
-                       DWORD dwExStyle)
+#if 0
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <stdio.h>
+#endif
+
+static GdkColormap* gdk_window_impl_win32_get_colormap (GdkDrawable *drawable);
+static void         gdk_window_impl_win32_set_colormap (GdkDrawable *drawable,
+                                                       GdkColormap *cmap);
+static void         gdk_window_impl_win32_get_size     (GdkDrawable *drawable,
+                                                       gint *width,
+                                                       gint *height);
+static GdkRegion*   gdk_window_impl_win32_get_visible_region (GdkDrawable *drawable);
+static void gdk_window_impl_win32_init       (GdkWindowImplWin32      *window);
+static void gdk_window_impl_win32_class_init (GdkWindowImplWin32Class *klass);
+static void gdk_window_impl_win32_finalize   (GObject                 *object);
+
+static gpointer parent_class = NULL;
+
+GType
+_gdk_window_impl_win32_get_type (void)
+{
+  static GType object_type = 0;
+
+  if (!object_type)
+    {
+      static const GTypeInfo object_info =
+      {
+        sizeof (GdkWindowImplWin32Class),
+        (GBaseInitFunc) NULL,
+        (GBaseFinalizeFunc) NULL,
+        (GClassInitFunc) gdk_window_impl_win32_class_init,
+        NULL,           /* class_finalize */
+        NULL,           /* class_data */
+        sizeof (GdkWindowImplWin32),
+        0,              /* n_preallocs */
+        (GInstanceInitFunc) gdk_window_impl_win32_init,
+      };
+      
+      object_type = g_type_register_static (GDK_TYPE_DRAWABLE_IMPL_WIN32,
+                                            "GdkWindowImplWin32",
+                                            &object_info, 0);
+    }
+  
+  return object_type;
+}
+
+GType
+_gdk_window_impl_get_type (void)
+{
+  return _gdk_window_impl_win32_get_type ();
+}
+
+static void
+gdk_window_impl_win32_init (GdkWindowImplWin32 *impl)
+{
+  impl->width = 1;
+  impl->height = 1;
+
+  impl->hcursor = NULL;
+  impl->hicon_big = NULL;
+  impl->hicon_small = NULL;
+  impl->hint_flags = 0;
+  impl->extension_events_selected = FALSE;
+}
+
+static void
+gdk_window_impl_win32_class_init (GdkWindowImplWin32Class *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GdkDrawableClass *drawable_class = GDK_DRAWABLE_CLASS (klass);
+  
+  parent_class = g_type_class_peek_parent (klass);
+
+  object_class->finalize = gdk_window_impl_win32_finalize;
+
+  drawable_class->set_colormap = gdk_window_impl_win32_set_colormap;
+  drawable_class->get_colormap = gdk_window_impl_win32_get_colormap;
+  drawable_class->get_size = gdk_window_impl_win32_get_size;
+
+  /* Visible and clip regions are the same */
+  drawable_class->get_clip_region = gdk_window_impl_win32_get_visible_region;
+  drawable_class->get_visible_region = gdk_window_impl_win32_get_visible_region;
+}
+
+static void
+gdk_window_impl_win32_finalize (GObject *object)
 {
-  if (!AdjustWindowRectEx(lpRect, dwStyle, bMenu, dwExStyle))
+  GdkWindowObject *wrapper;
+  GdkDrawableImplWin32 *draw_impl;
+  GdkWindowImplWin32 *window_impl;
+  
+  g_return_if_fail (GDK_IS_WINDOW_IMPL_WIN32 (object));
+
+  draw_impl = GDK_DRAWABLE_IMPL_WIN32 (object);
+  window_impl = GDK_WINDOW_IMPL_WIN32 (object);
+  
+  wrapper = (GdkWindowObject*) draw_impl->wrapper;
+
+  if (!GDK_WINDOW_DESTROYED (wrapper))
     {
-      WIN32_API_FAILED ("AdjustWindowRectEx");
-      return FALSE;
+      gdk_win32_handle_table_remove (draw_impl->handle);
     }
-  if (lpRect->left < 0)
+
+  if (window_impl->hcursor != NULL)
     {
-      lpRect->right -= lpRect->left;
-      lpRect->left = 0;
+      if (GetCursor () == window_impl->hcursor)
+       SetCursor (NULL);
+      GDI_CALL (DestroyCursor, (window_impl->hcursor));
+      window_impl->hcursor = NULL;
     }
-  if (lpRect->top < 0)
+  if (window_impl->hicon_big != NULL)
     {
-      lpRect->bottom -= lpRect->top;
-      lpRect->top = 0;
+      GDI_CALL (DestroyIcon, (window_impl->hicon_big));
+      window_impl->hicon_big = NULL;
     }
-  return TRUE;
+  if (window_impl->hicon_small != NULL)
+    {
+      GDI_CALL (DestroyIcon, (window_impl->hicon_small));
+      window_impl->hicon_small = NULL;
+    }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
-GdkDrawableClass _gdk_windowing_window_class;
+void
+_gdk_win32_adjust_client_rect (GdkWindow *window,
+                              RECT      *rect)
+{
+  LONG style, exstyle;
+
+  style = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
+  exstyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE);
+  API_CALL (AdjustWindowRectEx, (rect, style, FALSE, exstyle));
+}
 
-static void
-gdk_win32_window_destroy (GdkDrawable *drawable)
+void
+_gdk_win32_get_adjusted_client_rect (GdkWindow *window,
+                                    RECT      *rect)
+{
+  GetClientRect (GDK_WINDOW_HWND (window), rect);
+  _gdk_win32_adjust_client_rect (window, rect);
+}
+
+static GdkColormap*
+gdk_window_impl_win32_get_colormap (GdkDrawable *drawable)
 {
-  if (!GDK_DRAWABLE_DESTROYED (drawable))
+  GdkDrawableImplWin32 *drawable_impl;
+  
+  g_return_val_if_fail (GDK_IS_WINDOW_IMPL_WIN32 (drawable), NULL);
+
+  drawable_impl = GDK_DRAWABLE_IMPL_WIN32 (drawable);
+
+  if (!((GdkWindowObject *) drawable_impl->wrapper)->input_only && 
+      drawable_impl->colormap == NULL)
     {
-      if (GDK_DRAWABLE_TYPE (drawable) != GDK_WINDOW_FOREIGN)
-       {
-         g_warning ("losing last reference to undestroyed window");
-         _gdk_window_destroy (drawable, FALSE);
-       }
-      else
-       /* We use TRUE here, to keep us from actually calling
-        * DestroyWindow() on the window
-        */
-       _gdk_window_destroy (drawable, TRUE);
-      
-      gdk_xid_table_remove (GDK_DRAWABLE_XID (drawable));
+      drawable_impl->colormap = 
+        gdk_screen_get_system_colormap (gdk_drawable_get_screen (drawable));
+      g_object_ref (drawable_impl->colormap);
     }
-
-  g_free (GDK_DRAWABLE_WIN32DATA (drawable));
+  
+  return drawable_impl->colormap;
 }
 
-static GdkWindow *
-gdk_win32_window_alloc (void)
+static void
+gdk_window_impl_win32_set_colormap (GdkDrawable *drawable,
+                                   GdkColormap *cmap)
 {
-  GdkWindow *window;
-  GdkWindowPrivate *private;
+  GdkWindowImplWin32 *impl;
+  GdkDrawableImplWin32 *draw_impl;
   
-  static gboolean initialized = FALSE;
+  g_return_if_fail (GDK_IS_WINDOW_IMPL_WIN32 (drawable));
+
+  impl = GDK_WINDOW_IMPL_WIN32 (drawable);
+  draw_impl = GDK_DRAWABLE_IMPL_WIN32 (drawable);
 
-  if (!initialized)
+  /* chain up */
+  GDK_DRAWABLE_CLASS (parent_class)->set_colormap (drawable, cmap);
+  
+  if (cmap)
     {
-      initialized = TRUE;
-      
-      _gdk_windowing_window_class = _gdk_win32_drawable_class;
-      _gdk_win32_drawable_class.destroy = gdk_win32_window_destroy;
+      /* XXX */
+      g_print("gdk_window_impl_win32_set_colormap: XXX\n");
     }
+}
 
-  window = _gdk_window_alloc ();
-  private = (GdkWindowPrivate *) window;
+static void
+gdk_window_impl_win32_get_size (GdkDrawable *drawable,
+                               gint        *width,
+                               gint        *height)
+{
+  g_return_if_fail (GDK_IS_WINDOW_IMPL_WIN32 (drawable));
 
-  private->drawable.klass = &_gdk_windowing_window_class;
-  private->drawable.klass_data = g_new (GdkWindowWin32Data, 1);
+  if (width)
+    *width = GDK_WINDOW_IMPL_WIN32 (drawable)->width;
+  if (height)
+    *height = GDK_WINDOW_IMPL_WIN32 (drawable)->height;
+}
 
-  GDK_WINDOW_WIN32DATA (window)->event_mask = 0;
-  GDK_WINDOW_WIN32DATA (window)->bg_type = GDK_WIN32_BG_NORMAL;
-  GDK_WINDOW_WIN32DATA (window)->xcursor = NULL;
-  GDK_WINDOW_WIN32DATA (window)->hint_flags = 0;
-  GDK_WINDOW_WIN32DATA (window)->extension_events_selected = FALSE;
-  
-  GDK_WINDOW_WIN32DATA (window)->input_locale = GetKeyboardLayout (0);
-  TranslateCharsetInfo ((DWORD FAR *) GetACP (),
-                       &GDK_WINDOW_WIN32DATA (window)->charset_info,
-                       TCI_SRCCODEPAGE);
+static GdkRegion*
+gdk_window_impl_win32_get_visible_region (GdkDrawable *drawable)
+{
+  GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (drawable);
+  GdkRectangle result_rect;
+  HDC hdc;
 
-  return window;
+  result_rect.x = 0;
+  result_rect.y = 0;
+  result_rect.width = impl->width;
+  result_rect.height = impl->height;
+
+  gdk_rectangle_intersect (&result_rect, &impl->position_info.clip_rect, &result_rect);
+
+  /* take this win32 specific part into account (smaller when obscured) */
+  hdc = GetDC (GDK_DRAWABLE_IMPL_WIN32_HANDLE (impl));
+  if (hdc)
+    {
+      RECT r;
+      if (SIMPLEREGION == GetClipBox (hdc, &r))
+        {
+          GdkRectangle gr;
+
+          gr.x = r.left;
+          gr.y = r.top;
+          gr.width = r.right - r.left;
+          gr.height = r.bottom - r.top;
+
+          gdk_rectangle_intersect (&result_rect, &gr, &result_rect);
+        }
+      ReleaseDC (GDK_DRAWABLE_IMPL_WIN32_HANDLE (drawable), hdc);
+    }
+
+  return gdk_region_rectangle (&result_rect);
 }
 
 void
-gdk_window_init (void)
+_gdk_root_window_size_init (void)
 {
-  GdkWindowPrivate *private;
-  RECT r;
-  guint width;
-  guint height;
+  GdkWindowImplWin32 *impl;
+  GdkRectangle rect;
+  int i;
 
-  SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0);
-  width  = r.right - r.left;
-  height = r.bottom - r.top;
+  impl = GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) _gdk_parent_root)->impl);
+  rect = _gdk_monitors[0];
+  for (i = 1; i < _gdk_num_monitors; i++)
+    gdk_rectangle_union (&rect, _gdk_monitors+i, &rect);
 
-  gdk_parent_root = gdk_win32_window_alloc ();
-  private = (GdkWindowPrivate *) gdk_parent_root;
+  impl->width = rect.width;
+  impl->height = rect.height;
+}
+
+void
+_gdk_windowing_window_init (void)
+{
+  GdkWindowObject *private;
+  GdkDrawableImplWin32 *draw_impl;
+
+  g_assert (_gdk_parent_root == NULL);
+  
+  _gdk_parent_root = g_object_new (GDK_TYPE_WINDOW, NULL);
+  private = (GdkWindowObject *)_gdk_parent_root;
+  draw_impl = GDK_DRAWABLE_IMPL_WIN32 (private->impl);
   
-  GDK_DRAWABLE_WIN32DATA (gdk_parent_root)->xid = gdk_root_window;
-  private->drawable.window_type = GDK_WINDOW_ROOT;
-  private->drawable.width = width;
-  private->drawable.height = height;
+  draw_impl->handle = _gdk_root_window;
+  draw_impl->wrapper = GDK_DRAWABLE (private);
+  draw_impl->colormap = gdk_colormap_get_system ();
+  g_object_ref (draw_impl->colormap);
+  
+  private->window_type = GDK_WINDOW_ROOT;
+  private->depth = gdk_visual_get_system ()->depth;
+
+  _gdk_root_window_size_init ();
+  _gdk_window_init_position (GDK_WINDOW (private));
 
-  gdk_xid_table_insert (&gdk_root_window, gdk_parent_root);
+  gdk_win32_handle_table_insert (&_gdk_root_window, _gdk_parent_root);
+
+  GDK_NOTE (MISC, g_print ("_gdk_parent_root=%p\n", GDK_WINDOW_HWND (_gdk_parent_root)));
+}
+
+static const gchar *
+get_default_title (void)
+{
+  const char *title;
+  title = g_get_application_name ();
+  if (!title)
+    title = g_get_prgname ();
+
+  return title;
 }
 
 /* RegisterGdkClass
@@ -160,8 +364,8 @@ gdk_window_init (void)
  *   is ever needed (e.g Dialog specific), every such window should
  *   get its own class
  */
-ATOM
-RegisterGdkClass (GdkDrawableType wtype)
+static ATOM
+RegisterGdkClass (GdkWindowType wtype)
 {
   static ATOM klassTOPLEVEL = 0;
   static ATOM klassDIALOG   = 0;
@@ -171,98 +375,100 @@ RegisterGdkClass (GdkDrawableType 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_WindowProc;
+  wcl.lpfnWndProc = _gdk_win32_window_procedure;
   wcl.cbClsExtra = 0;
   wcl.cbWndExtra = 0;
-  wcl.hInstance = gdk_ProgInstance;
+  wcl.hInstance = _gdk_app_hmodule;
   wcl.hIcon = 0;
   /* initialize once! */
   if (0 == hAppIcon)
     {
-      gchar sLoc [_MAX_PATH+1];
-      HINSTANCE hInst = GetModuleHandle(NULL);
+      gchar sLoc [MAX_PATH+1];
 
-      if (0 != GetModuleFileName(hInst, sLoc, _MAX_PATH))
+      if (0 != GetModuleFileName (_gdk_app_hmodule, sLoc, MAX_PATH))
        {
-         hAppIcon = ExtractIcon(hInst, sLoc, 0);
+         hAppIcon = ExtractIcon (_gdk_app_hmodule, sLoc, 0);
          if (0 == hAppIcon)
            {
-             char *gdklibname = g_strdup_printf ("gdk-%s.dll", GDK_VERSION);
-
-             hAppIcon = ExtractIcon(hInst, 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;
   wcl.hIconSm = 0;
 
   /* initialize once per class */
+  /*
+   * HB: Setting the background brush leads to flicker, because we
+   * don't get asked how to clear the background. This is not what
+   * we want, at least not for input_only windows ...
+   */
 #define ONCE_PER_CLASS() \
   wcl.hIcon = CopyIcon (hAppIcon); \
   wcl.hIconSm = CopyIcon (hAppIcon); \
-  wcl.hbrBackground = 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);
-      }
+       {
+         wcl.lpszClassName = "gdkWindowToplevel";
+         
+         ONCE_PER_CLASS();
+         klassTOPLEVEL = RegisterClassEx (&wcl);
+       }
       klass = klassTOPLEVEL;
       break;
+      
     case GDK_WINDOW_CHILD:
       if (0 == klassCHILD)
-      {
-       wcl.lpszClassName = "gdkWindowChild";
-
-        wcl.style |= CS_PARENTDC; /* MSDN: ... enhances system performance. */
-       ONCE_PER_CLASS();
-       klassCHILD = RegisterClassEx(&wcl);
-      }
+       {
+         wcl.lpszClassName = "gdkWindowChild";
+         
+         wcl.style |= CS_PARENTDC; /* MSDN: ... enhances system performance. */
+         ONCE_PER_CLASS();
+         klassCHILD = RegisterClassEx (&wcl);
+       }
       klass = klassCHILD;
       break;
+      
     case GDK_WINDOW_DIALOG:
       if (0 == klassDIALOG)
-      {
-       wcl.lpszClassName = "gdkWindowDialog";
-        wcl.style |= CS_SAVEBITS;
-       ONCE_PER_CLASS();
-       klassDIALOG = RegisterClassEx(&wcl);
-      }
+       {
+         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);
-      }
+       {
+         wcl.lpszClassName = "gdkWindowTemp";
+         wcl.style |= CS_SAVEBITS;
+         ONCE_PER_CLASS();
+         klassTEMP = RegisterClassEx (&wcl);
+       }
       klass = klassTEMP;
       break;
-    case GDK_WINDOW_ROOT:
-      g_error ("cannot make windows of type GDK_WINDOW_ROOT");
-      break;
-    case GDK_DRAWABLE_PIXMAP:
-      g_error ("cannot make windows of type GDK_DRAWABLE_PIXMAP (use gdk_pixmap_new)");
+      
+    default:
+      g_assert_not_reached ();
       break;
-  }
-
+    }
+  
   if (klass == 0)
     {
       WIN32_API_FAILED ("RegisterClassEx");
@@ -271,216 +477,273 @@ RegisterGdkClass (GdkDrawableType wtype)
   return klass;
 }
 
-GdkWindow*
-gdk_window_new (GdkWindow     *parent,
-               GdkWindowAttr *attributes,
-               gint           attributes_mask)
+static GdkWindow*
+gdk_window_new_internal (GdkWindow     *parent,
+                        GdkWindowAttr *attributes,
+                        gint           attributes_mask,
+                        gboolean       from_set_skip_taskbar_hint)
 {
-  GdkWindow *window;
-  GdkWindowPrivate *private;
-  GdkWindowPrivate *parent_private;
-  GdkVisual *visual;
-  HANDLE xparent;
-  Visual *xvisual;
+  HANDLE hparent;
   ATOM klass = 0;
-  DWORD dwStyle, dwExStyle;
+  DWORD dwStyle = 0, dwExStyle;
   RECT rect;
-  int width, height;
-  int x, y;
-  char *title;
-  gint titlelen;
-  wchar_t *wctitle;
-  gint wlen;
+  GdkWindow *window;
+  GdkWindowObject *private;
+  GdkWindowImplWin32 *impl;
+  GdkDrawableImplWin32 *draw_impl;
+  GdkScreen *screen;
+  GdkVisual *visual;
+  const gchar *title;
   char *mbtitle;
+  gint window_width, window_height;
+  gint offset_x = 0, offset_y = 0;
 
   g_return_val_if_fail (attributes != NULL, NULL);
 
   if (!parent)
-    parent = gdk_parent_root;
+    {
+      screen = gdk_screen_get_default ();
+      parent = gdk_screen_get_root_window (screen);
+    }
+  else
+    screen = gdk_drawable_get_screen (parent);
 
-  parent_private = (GdkWindowPrivate*) parent;
-  if (GDK_DRAWABLE_DESTROYED (parent))
+  g_return_val_if_fail (GDK_IS_WINDOW (parent), NULL);
+  
+  GDK_NOTE (MISC,
+           g_print ("gdk_window_new: %s\n",
+                    (attributes->window_type == GDK_WINDOW_TOPLEVEL ? "TOPLEVEL" :
+                     (attributes->window_type == GDK_WINDOW_CHILD ? "CHILD" :
+                      (attributes->window_type == GDK_WINDOW_DIALOG ? "DIALOG" :
+                       (attributes->window_type == GDK_WINDOW_TEMP ? "TEMP" :
+                        "???"))))));
+
+  if (GDK_WINDOW_DESTROYED (parent))
     return NULL;
+  
+  hparent = GDK_WINDOW_HWND (parent);
 
-  xparent = GDK_DRAWABLE_XID (parent);
-
-  window = gdk_win32_window_alloc ();
-  private = (GdkWindowPrivate *)window;
-
-  private->parent = parent;
+  window = g_object_new (GDK_TYPE_WINDOW, NULL);
+  private = (GdkWindowObject *)window;
+  impl = GDK_WINDOW_IMPL_WIN32 (private->impl);
+  draw_impl = GDK_DRAWABLE_IMPL_WIN32 (private->impl);
+  draw_impl->wrapper = GDK_DRAWABLE (window);
 
-  private->x = (attributes_mask & GDK_WA_X) ? attributes->x : 0;
-  private->y = (attributes_mask & GDK_WA_Y) ? attributes->y : 0;
+  /* 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;
 
-  private->drawable.width = (attributes->width > 1) ? (attributes->width) : (1);
-  private->drawable.height = (attributes->height > 1) ? (attributes->height) : (1);
-  private->drawable.window_type = attributes->window_type;
-  GDK_WINDOW_WIN32DATA (window)->extension_events_selected = FALSE;
+  private->accept_focus = TRUE;
+  private->focus_on_map = TRUE;
 
+  if (attributes_mask & GDK_WA_X)
+    private->x = attributes->x;
+  else
+    private->x = 0;
+  
+  if (attributes_mask & GDK_WA_Y)
+    private->y = attributes->y;
+  else if (attributes_mask & GDK_WA_X)
+    private->y = 100;          /* ??? We must put it somewhere... */
+  else
+    private->y = 0;
+  
   if (attributes_mask & GDK_WA_VISUAL)
     visual = attributes->visual;
   else
     visual = gdk_visual_get_system ();
-  xvisual = ((GdkVisualPrivate*) visual)->xvisual;
-
-  if (attributes_mask & GDK_WA_TITLE)
-    title = attributes->title;
-  else
-    title = g_get_prgname ();
-  if (!title)
-    title = "GDK client window";
 
-  GDK_WINDOW_WIN32DATA (window)->event_mask = GDK_STRUCTURE_MASK | attributes->event_mask;
-      
-  if (parent_private && parent_private->guffaw_gravity)
+  impl->width = (attributes->width > 1) ? (attributes->width) : (1);
+  impl->height = (attributes->height > 1) ? (attributes->height) : (1);
+  impl->extension_events_selected = FALSE;
+  if (attributes->wclass == GDK_INPUT_ONLY)
     {
-      /* XXX ??? */
+      /* Backwards compatiblity - we've always ignored
+       * attributes->window_type for input-only windows
+       * before
+       */
+      if (GDK_WINDOW_TYPE (parent) == GDK_WINDOW_ROOT)
+       private->window_type = GDK_WINDOW_TEMP;
+      else
+       private->window_type = GDK_WINDOW_CHILD;
     }
+  else
+    private->window_type = attributes->window_type;
 
   if (attributes->wclass == GDK_INPUT_OUTPUT)
     {
       dwExStyle = 0;
+
+      private->input_only = FALSE;
+      private->depth = visual->depth;
+      
       if (attributes_mask & GDK_WA_COLORMAP)
-       private->drawable.colormap = attributes->colormap;
+       {
+         draw_impl->colormap = attributes->colormap;
+          g_object_ref (attributes->colormap);
+        }
       else
-       private->drawable.colormap = gdk_colormap_get_system ();
+       {
+         draw_impl->colormap = gdk_screen_get_system_colormap (screen);
+         g_object_ref (draw_impl->colormap);
+       }
     }
   else
     {
       dwExStyle = WS_EX_TRANSPARENT;
-      private->drawable.colormap = NULL;
-      GDK_WINDOW_WIN32DATA (window)->bg_type = GDK_WIN32_BG_TRANSPARENT;
-      GDK_WINDOW_WIN32DATA (window)->bg_pixmap = NULL;
+      private->depth = 0;
+      private->input_only = TRUE;
+      draw_impl->colormap = gdk_screen_get_system_colormap (screen);
+      g_object_ref (draw_impl->colormap);
+      GDK_NOTE (MISC, g_print ("...GDK_INPUT_ONLY, system colormap"));
     }
 
-  if (attributes_mask & GDK_WA_X)
-    x = attributes->x;
-  else
-    x = CW_USEDEFAULT;
-
-  if (attributes_mask & GDK_WA_Y)
-    y = attributes->y;
-  else if (attributes_mask & GDK_WA_X)
-    y = 100;                   /* ??? We must put it somewhere... */
-  else
-    y = 500;                   /* x is CW_USEDEFAULT, y doesn't matter then */
-
-  if (parent_private)
-    parent_private->children = g_list_prepend (parent_private->children, window);
-
-  switch (private->drawable.window_type)
+  switch (private->window_type)
     {
     case GDK_WINDOW_TOPLEVEL:
       dwStyle = WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN;
-      xparent = gdk_root_window;
+      hparent = _gdk_root_window;
+      offset_x = _gdk_offset_x;
+      offset_y = _gdk_offset_y;
       break;
+
     case GDK_WINDOW_CHILD:
       dwStyle = WS_CHILDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
       break;
+
     case GDK_WINDOW_DIALOG:
       dwStyle = WS_OVERLAPPED | WS_MINIMIZEBOX | WS_SYSMENU | WS_CAPTION | WS_THICKFRAME | WS_CLIPCHILDREN;
 #if 0
       dwExStyle |= WS_EX_TOPMOST; /* //HB: want this? */
 #endif
-      xparent = gdk_root_window;
+      hparent = _gdk_root_window;
+      offset_x = _gdk_offset_x;
+      offset_y = _gdk_offset_y;
       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;
+      offset_x = _gdk_offset_x;
+      offset_y = _gdk_offset_y;
       break;
+
     case GDK_WINDOW_ROOT:
       g_error ("cannot make windows of type GDK_WINDOW_ROOT");
       break;
-    case GDK_DRAWABLE_PIXMAP:
-      g_error ("cannot make windows of type GDK_DRAWABLE_PIXMAP (use gdk_pixmap_new)");
-      break;
+
+    default:
+      g_assert_not_reached ();
     }
 
-  klass = RegisterGdkClass (private->drawable.window_type);
+  _gdk_window_init_position (GDK_WINDOW (private));
 
-  if (private->drawable.window_type != GDK_WINDOW_CHILD)
+  if (private->window_type != GDK_WINDOW_CHILD)
     {
-      if (x == CW_USEDEFAULT)
-       {
-         rect.left = 100;
-         rect.top = 100;
-       }
-      else
-       {
-         rect.left = x;
-         rect.top = y;
-       }
+      rect.left = rect.top = 0;
+      rect.right = impl->position_info.width;
+      rect.bottom = impl->position_info.height;
 
-      rect.right = rect.left + private->drawable.width;
-      rect.bottom = rect.top + private->drawable.height;
-
-      SafeAdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
+      AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
 
-      if (x != CW_USEDEFAULT)
-       {
-         x = rect.left;
-         y = rect.top;
-       }
-      width = rect.right - rect.left;
-      height = rect.bottom - rect.top;
+      window_width = rect.right - rect.left;
+      window_height = rect.bottom - rect.top;
     }
   else
     {
-      width = private->drawable.width;
-      height = private->drawable.height;
+      window_width = impl->position_info.width;
+      window_height = impl->position_info.height;
+    }
+
+  if (impl->position_info.big)
+    private->guffaw_gravity = TRUE;
+
+  if (attributes_mask & GDK_WA_TITLE)
+    title = attributes->title;
+  else
+    title = get_default_title ();
+  if (!title || !*title)
+    title = "GDK client window";
+
+  private->event_mask = GDK_STRUCTURE_MASK | attributes->event_mask;
+      
+  if (private->parent && private->parent->guffaw_gravity)
+    {
+      /* XXX ??? */
     }
 
-  titlelen = strlen (title);
-  wctitle = g_new (wchar_t, titlelen + 1);
-  mbtitle = g_new (char, 3*titlelen + 1);
-  wlen = gdk_nmbstowchar_ts (wctitle, title, titlelen, titlelen);
-  wctitle[wlen] = 0;
-  WideCharToMultiByte (GetACP (), 0, wctitle, -1,
-                      mbtitle, 3*titlelen, NULL, NULL);
+  if (private->parent)
+    private->parent->children = g_list_prepend (private->parent->children, window);
+
+  klass = RegisterGdkClass (private->window_type);
+
+  mbtitle = g_locale_from_utf8 (title, -1, NULL, NULL, NULL);
   
-  GDK_DRAWABLE_WIN32DATA (window)->xid =
+  {
+  HWND hwndNew =
     CreateWindowEx (dwExStyle,
                    MAKEINTRESOURCE(klass),
                    mbtitle,
                    dwStyle,
-                   x, y, 
-                   width, height,
-                   xparent,
+                   ((attributes_mask & GDK_WA_X) ?
+                    impl->position_info.x - offset_x: CW_USEDEFAULT),
+                   impl->position_info.y - offset_y, 
+                   window_width, window_height,
+                   hparent,
                    NULL,
-                   gdk_ProgInstance,
-                   NULL);
+                   _gdk_app_hmodule,
+                   window);
+  if (GDK_WINDOW_HWND (window) != 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 
+       * real bug, try to workaround it ...
+       * To reproduce: compile with MSVC 5, DEBUG=1
+       */
+# if 0
+      gdk_win32_handle_table_remove (GDK_WINDOW_HWND (window));
+      GDK_WINDOW_HWND (window) = hwndNew;
+      gdk_win32_handle_table_insert (&GDK_WINDOW_HWND (window), window);
+# else
+      /* the old behaviour, but with warning */
+      draw_impl->handle = hwndNew;
+# endif
 
-  GDK_NOTE (MISC,
-           g_print ("gdk_window_new: %s %s %dx%d@+%d+%d %#x = %#x\n"
-                    "...locale %#x codepage %d\n",
-                    (private->drawable.window_type == GDK_WINDOW_TOPLEVEL ? "TOPLEVEL" :
-                     (private->drawable.window_type == GDK_WINDOW_CHILD ? "CHILD" :
-                      (private->drawable.window_type == GDK_WINDOW_DIALOG ? "DIALOG" :
-                       (private->drawable.window_type == GDK_WINDOW_TEMP ? "TEMP" :
-                        "???")))),
-                    mbtitle,
-                    width, height, (x == CW_USEDEFAULT ? -9999 : x), y, 
-                    xparent,
-                    GDK_DRAWABLE_XID (window),
-                    GDK_WINDOW_WIN32DATA (window)->input_locale,
-                    GDK_WINDOW_WIN32DATA (window)->charset_info.ciACP));
+    }
+  }
+  g_object_ref (window);
+  gdk_win32_handle_table_insert (&GDK_WINDOW_HWND (window), window);
+
+  GDK_NOTE (MISC, g_print ("... \"%s\" %dx%d@+%d+%d %p = %p\n",
+                          mbtitle,
+                          window_width, window_height,
+                          ((attributes_mask & GDK_WA_X) ?
+                           impl->position_info.x - offset_x: CW_USEDEFAULT),
+                          impl->position_info.y - offset_y, 
+                          hparent,
+                          GDK_WINDOW_HWND (window)));
 
   g_free (mbtitle);
-  g_free (wctitle);
 
-  if (GDK_DRAWABLE_XID (window) == NULL)
+  if (draw_impl->handle == NULL)
     {
       WIN32_API_FAILED ("CreateWindowEx");
-      g_free (GDK_DRAWABLE_WIN32DATA (window));
-      g_free (private);
+      g_object_unref (window);
       return NULL;
     }
 
-  gdk_drawable_ref (window);
-  gdk_xid_table_insert (&GDK_DRAWABLE_XID (window), window);
-
-  if (private->drawable.colormap)
-    gdk_colormap_ref (private->drawable.colormap);
+  if (!from_set_skip_taskbar_hint && private->window_type == GDK_WINDOW_TEMP)
+    gdk_window_set_skip_taskbar_hint (window, TRUE);
 
   gdk_window_set_cursor (window, ((attributes_mask & GDK_WA_CURSOR) ?
                                  (attributes->cursor) :
@@ -489,84 +752,122 @@ gdk_window_new (GdkWindow     *parent,
   return window;
 }
 
+GdkWindow*
+gdk_window_new (GdkWindow     *parent,
+               GdkWindowAttr *attributes,
+               gint           attributes_mask)
+{
+  return gdk_window_new_internal (parent, attributes, attributes_mask, FALSE);
+}
+
 GdkWindow *
-gdk_window_foreign_new (guint32 anid)
+gdk_window_foreign_new_for_display (GdkDisplay      *display,
+                                    GdkNativeWindow  anid)
 {
   GdkWindow *window;
-  GdkWindowPrivate *private;
-  GdkWindowPrivate *parent_private;
+  GdkWindowObject *private;
+  GdkWindowImplWin32 *impl;
+  GdkDrawableImplWin32 *draw_impl;
+
   HANDLE parent;
   RECT rect;
   POINT point;
 
-  window = gdk_win32_window_alloc ();
-  private = (GdkWindowPrivate *)window;
+  g_return_val_if_fail (display == gdk_display_get_default (), NULL);
 
-  parent = GetParent ((HWND) anid);
-  private->parent = gdk_xid_table_lookup (parent);
-
-  parent_private = (GdkWindowPrivate *)private->parent;
+  window = g_object_new (GDK_TYPE_WINDOW, NULL);
+  private = (GdkWindowObject *)window;
+  impl = GDK_WINDOW_IMPL_WIN32 (private->impl);
+  draw_impl = GDK_DRAWABLE_IMPL_WIN32 (private->impl);
+  draw_impl->wrapper = GDK_DRAWABLE (window);
+  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;
   
-  if (parent_private)
-    parent_private->children = g_list_prepend (parent_private->children, window);
+  private->parent->children = g_list_prepend (private->parent->children, window);
 
-  GDK_DRAWABLE_WIN32DATA (window)->xid = (HWND) anid;
+  draw_impl->handle = (HWND) anid;
   GetClientRect ((HWND) anid, &rect);
   point.x = rect.left;
   point.y = rect.right;
   ClientToScreen ((HWND) anid, &point);
-  if (parent != GetDesktopWindow ())
+  if (parent != _gdk_root_window)
     ScreenToClient (parent, &point);
   private->x = point.x;
   private->y = point.y;
-  private->drawable.width = rect.right - rect.left;
-  private->drawable.height = rect.bottom - rect.top;
-  private->drawable.window_type = GDK_WINDOW_FOREIGN;
-  private->drawable.destroyed = FALSE;
-  private->mapped = IsWindowVisible (GDK_DRAWABLE_XID (window));
+  impl->width = rect.right - rect.left;
+  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
+    private->state |= GDK_WINDOW_STATE_WITHDRAWN;
+  if (GetWindowLong ((HWND)anid, GWL_EXSTYLE) & WS_EX_TOPMOST)
+    private->state |= GDK_WINDOW_STATE_ABOVE;
+  else
+    private->state &= (~GDK_WINDOW_STATE_ABOVE);
+  private->state &= (~GDK_WINDOW_STATE_BELOW);
 
-  private->drawable.colormap = NULL;
+  private->depth = gdk_visual_get_system ()->depth;
 
-  gdk_drawable_ref (window);
-  gdk_xid_table_insert (&GDK_DRAWABLE_XID (window), window);
+  _gdk_window_init_position (GDK_WINDOW (private));
+
+  g_object_ref (window);
+  gdk_win32_handle_table_insert (&GDK_WINDOW_HWND (window), window);
 
   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,
                               gboolean   foreign_destroy)
 {
-  GdkWindowPrivate *private = (GdkWindowPrivate *)window;
+  GdkWindowObject *private = (GdkWindowObject *)window;
 
-  GDK_NOTE (MISC, g_print ("_gdk_windowing_window_destroy %#x\n",
-                          GDK_DRAWABLE_XID (window)));
+  g_return_if_fail (GDK_IS_WINDOW (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);
+    _gdk_input_window_destroy (window);
+
 
-  if (private->drawable.window_type == GDK_WINDOW_FOREIGN)
+  if (!recursing && !foreign_destroy)
     {
-      if (!foreign_destroy && (private->parent != NULL))
-       {
-         /* It's somebody else's window, but in our heirarchy,
-          * so reparent it to the root window, and then call
-          * DestroyWindow() on it.
-          */
-         gdk_window_hide (window);
-         gdk_window_reparent (window, NULL, 0, 0);
-         
-         /* Is this too drastic? Many (most?) applications
-          * quit if any window receives WM_QUIT I think.
-          * OTOH, I don't think foreign windows are much
-          * used, so the question is maybe academic.
-          */
-         PostMessage (GDK_DRAWABLE_XID (window), WM_QUIT, 0, 0);
-       }
+      private->destroyed = TRUE;
+      DestroyWindow (GDK_WINDOW_HWND (window));
     }
-  else if (!recursing && !foreign_destroy)
-    DestroyWindow (GDK_DRAWABLE_XID (window));
+  gdk_win32_handle_table_remove (GDK_WINDOW_HWND (window));
+}
+
+void
+_gdk_windowing_window_destroy_foreign (GdkWindow *window)
+{
+  /* It's somebody else's window, but in our hierarchy,
+   * so reparent it to the root window, and then call
+   * DestroyWindow() on it.
+   */
+  gdk_window_hide (window);
+  gdk_window_reparent (window, NULL, 0, 0);
+  
+  /* Is this too drastic? Many (most?) applications
+   * quit if any window receives WM_QUIT I think.
+   * OTOH, I don't think foreign windows are much
+   * used, so the question is maybe academic.
+   */
+  PostMessage (GDK_WINDOW_HWND (window), WM_QUIT, 0, 0);
 }
 
 /* This function is called when the window really gone.
@@ -575,94 +876,291 @@ void
 gdk_window_destroy_notify (GdkWindow *window)
 {
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
 
   GDK_NOTE (EVENTS,
-           g_print ("gdk_window_destroy_notify: %#x  %s\n",
-                    GDK_DRAWABLE_XID (window),
-                    (GDK_DRAWABLE_DESTROYED (window) ? "(destroyed)" : "")));
+           g_print ("gdk_window_destroy_notify: %p%s\n",
+                    GDK_WINDOW_HWND (window),
+                    (GDK_WINDOW_DESTROYED (window) ? " (destroyed)" : "")));
 
-  if (!GDK_DRAWABLE_DESTROYED (window))
+  if (!GDK_WINDOW_DESTROYED (window))
     {
-      if (GDK_DRAWABLE_TYPE(window) != GDK_WINDOW_FOREIGN)
-       g_warning ("window %#x unexpectedly destroyed",
-                  GDK_DRAWABLE_XID (window));
+      if (GDK_WINDOW_TYPE(window) != GDK_WINDOW_FOREIGN)
+       g_warning ("window %p unexpectedly destroyed",
+                  GDK_WINDOW_HWND (window));
 
       _gdk_window_destroy (window, TRUE);
     }
   
-  gdk_xid_table_remove (GDK_DRAWABLE_XID (window));
-  gdk_drawable_unref (window);
+  gdk_win32_handle_table_remove (GDK_WINDOW_HWND (window));
+  g_object_unref (window);
 }
 
-void
-gdk_window_show (GdkWindow *window)
+static void
+get_outer_rect (GdkWindow *window,
+               gint       width,
+               gint       height,
+               RECT      *rect)
 {
-  g_return_if_fail (window != NULL);
+  LONG style, exstyle;
+      
+  style = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
+  exstyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE);
+      
+  rect->left = rect->top = 0;
+  rect->right = width;
+  rect->bottom = height;
+      
+  API_CALL (AdjustWindowRectEx, (rect, style, FALSE, exstyle));
+}
 
-  if (!GDK_DRAWABLE_DESTROYED (window))
+static void
+adjust_for_gravity_hints (GdkWindowImplWin32 *impl,
+                         RECT               *outer_rect,
+                         gint               *x,
+                         gint               *y)
+{
+  if (impl->hint_flags & GDK_HINT_WIN_GRAVITY)
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_show: %#x\n",
-                              GDK_DRAWABLE_XID (window)));
+      gint orig_x = *x, orig_y = *y;
 
-      ((GdkWindowPrivate *) window)->mapped = TRUE;
-      if (GDK_DRAWABLE_TYPE (window) == GDK_WINDOW_TEMP)
+      switch (impl->hints.win_gravity)
        {
-         ShowWindow (GDK_DRAWABLE_XID (window), SW_SHOWNOACTIVATE);
-         SetWindowPos (GDK_DRAWABLE_XID (window), HWND_TOPMOST, 0, 0, 0, 0,
-                       SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
-#if 0
-         /* Don't put on toolbar */
-         ShowWindow (GDK_DRAWABLE_XID (window), SW_HIDE);
-#endif
+       case GDK_GRAVITY_NORTH:
+       case GDK_GRAVITY_CENTER:
+       case GDK_GRAVITY_SOUTH:
+         *x -= (outer_rect->right - outer_rect->left) / 2;
+         *x += impl->width / 2;
+         break;
+             
+       case GDK_GRAVITY_SOUTH_EAST:
+       case GDK_GRAVITY_EAST:
+       case GDK_GRAVITY_NORTH_EAST:
+         *x -= outer_rect->right - outer_rect->left;
+         *x += impl->width;
+         break;
+
+       case GDK_GRAVITY_STATIC:
+         *x += outer_rect->left;
+         break;
+
+       default:
+         break;
        }
-      else
+
+      switch (impl->hints.win_gravity)
        {
-         ShowWindow (GDK_DRAWABLE_XID (window), SW_SHOWNORMAL);
-         ShowWindow (GDK_DRAWABLE_XID (window), SW_RESTORE);
-         SetForegroundWindow (GDK_DRAWABLE_XID (window));
-         BringWindowToTop (GDK_DRAWABLE_XID (window));
-#if 0
-         ShowOwnedPopups (GDK_DRAWABLE_XID (window), TRUE);
-#endif
+       case GDK_GRAVITY_WEST:
+       case GDK_GRAVITY_CENTER:
+       case GDK_GRAVITY_EAST:
+         *y -= (outer_rect->bottom - outer_rect->top) / 2;
+         *y += impl->height / 2;
+         break;
+
+       case GDK_GRAVITY_SOUTH_WEST:
+       case GDK_GRAVITY_SOUTH:
+       case GDK_GRAVITY_SOUTH_EAST:
+         *y -= outer_rect->bottom - outer_rect->top;
+         *y += impl->height;
+         break;
+
+       case GDK_GRAVITY_STATIC:
+         *y += outer_rect->top;
+         break;
+
+       default:
+         break;
        }
+      GDK_NOTE (MISC,
+               (orig_x != *x || orig_y != *y) ?
+               g_print ("adjust_for_gravity_hints: x: %d->%d, y: %d->%d\n",
+                        orig_x, *x, orig_y, *y)
+                 : (void) 0);
+    }
+}
+
+static void
+show_window_internal (GdkWindow *window,
+                      gboolean   raise,
+                     gboolean   deiconify)
+{
+  GdkWindowObject *private;
+  HWND old_active_window;
+  gboolean focus_on_map = TRUE;
+
+  private = (GdkWindowObject *) window;
+
+  if (private->destroyed)
+    return;
+
+  GDK_NOTE (MISC, g_print ("show_window_internal: %p: %s%s%s\n",
+                          GDK_WINDOW_HWND (window),
+                          _gdk_win32_window_state_to_string (private->state),
+                          (raise ? " raise" : ""),
+                          (deiconify ? " deiconify" : "")));
+  
+  /* If asked to show (not deiconify) an withdrawn and iconified
+   * window, do that.
+   */
+  if (!deiconify &&
+      !GDK_WINDOW_IS_MAPPED (window) &&
+      (private->state & GDK_WINDOW_STATE_ICONIFIED))
+    {  
+      ShowWindow (GDK_WINDOW_HWND (window), SW_MINIMIZE);
+      return;
+    }
+  
+  /* If asked to just show an iconified window, do nothing. */
+  if (!deiconify && (private->state & GDK_WINDOW_STATE_ICONIFIED))
+    return;
+  
+  /* If asked to deiconify an already noniconified window, do
+   * nothing. (Especially, don't cause the window to rise and
+   * activate. There are different calls for that.)
+   */
+  if (deiconify && !(private->state & GDK_WINDOW_STATE_ICONIFIED))
+    return;
+  
+  /* If asked to show (but not raise) a window that is already
+   * visible, do nothing.
+   */
+  if (!deiconify && !raise && IsWindowVisible (GDK_WINDOW_HWND (window)))
+    return;
+
+  /* Other cases */
+  
+  if (!GDK_WINDOW_IS_MAPPED (window))
+    {
+      gdk_synthesize_window_state (window,
+                                  GDK_WINDOW_STATE_WITHDRAWN,
+                                  0);
+      focus_on_map = private->focus_on_map;
+    }
+
+  /* Use SetWindowPos to show transparent windows so automatic redraws
+   * in other windows can be suppressed.
+   */
+  if (GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE) & WS_EX_TRANSPARENT)
+    {
+      UINT flags = SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOMOVE | SWP_NOSIZE;
+      if (!raise)
+       flags |= SWP_NOZORDER;
+      if (!raise || GDK_WINDOW_TYPE (window) == GDK_WINDOW_TEMP || !focus_on_map)
+       flags |= SWP_NOACTIVATE;
+
+      SetWindowPos (GDK_WINDOW_HWND (window), HWND_TOP, 0, 0, 0, 0, flags);
+      return;
+    }
+
+  old_active_window = GetActiveWindow ();
+
+  if (private->state & (GDK_WINDOW_STATE_BELOW | GDK_WINDOW_STATE_ABOVE))
+    {
+      DWORD exstyle = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE);
+
+      if (private->state & GDK_WINDOW_STATE_BELOW)
+        exstyle &= (~WS_EX_TOPMOST);
+      if (private->state & GDK_WINDOW_STATE_ABOVE)
+        exstyle |= WS_EX_TOPMOST;
+
+      if (!SetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE, exstyle))
+        WIN32_API_FAILED ("SetWindowLong");
+    }
+
+  if (private->state & GDK_WINDOW_STATE_FULLSCREEN)
+    gdk_window_fullscreen (window);
+  else if (private->state & GDK_WINDOW_STATE_MAXIMIZED)
+    ShowWindow (GDK_WINDOW_HWND (window), SW_MAXIMIZE);
+  else if (private->state & GDK_WINDOW_STATE_ICONIFIED)
+    ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE);
+  else if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TEMP || !focus_on_map)
+    ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWNOACTIVATE);
+  else
+    ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWNORMAL);
+
+  if (raise)
+    {
+      if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TEMP)
+        SetWindowPos (GDK_WINDOW_HWND (window), HWND_TOPMOST, 0, 0, 0, 0,
+                   SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
+      else if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TOPLEVEL
+              || GDK_WINDOW_TYPE (window) == GDK_WINDOW_DIALOG)
+        SetForegroundWindow (GDK_WINDOW_HWND (window));
+      else
+        BringWindowToTop (GDK_WINDOW_HWND (window));
     }
+  else if (old_active_window != GDK_WINDOW_HWND (window))
+    SetActiveWindow (old_active_window);
+}
+
+void
+gdk_window_show_unraised (GdkWindow *window)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+  
+  show_window_internal (window, FALSE, FALSE);
+}
+
+void
+gdk_window_show (GdkWindow *window)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  show_window_internal (window, TRUE, FALSE);
 }
 
 void
 gdk_window_hide (GdkWindow *window)
 {
+  GdkWindowObject *private;
+  
   g_return_if_fail (window != NULL);
 
-  if (!GDK_DRAWABLE_DESTROYED (window))
-    {
-      GDK_NOTE (MISC, g_print ("gdk_window_hide: %#x\n",
-                              GDK_DRAWABLE_XID (window)));
+  private = (GdkWindowObject*) window;
+  if (private->destroyed)
+    return;
 
-      ((GdkWindowPrivate *) window)->mapped = FALSE;
-      if (GDK_DRAWABLE_TYPE (window) == GDK_WINDOW_TOPLEVEL)
-       ShowOwnedPopups (GDK_DRAWABLE_XID (window), FALSE);
-#if 1
-      ShowWindow (GDK_DRAWABLE_XID (window), SW_HIDE);
-#elif 0
-      ShowWindow (GDK_DRAWABLE_XID (window), SW_MINIMIZE);
-#else
-      CloseWindow (GDK_DRAWABLE_XID (window));
-#endif
+  GDK_NOTE (MISC, g_print ("gdk_window_hide: %p: %s\n",
+                          GDK_WINDOW_HWND (window),
+                          _gdk_win32_window_state_to_string (private->state)));
+  
+  if (GDK_WINDOW_IS_MAPPED (window))
+    gdk_synthesize_window_state (window,
+                                0,
+                                GDK_WINDOW_STATE_WITHDRAWN);
+  
+  _gdk_window_clear_update_area (window);
+  
+  if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TOPLEVEL)
+    ShowOwnedPopups (GDK_WINDOW_HWND (window), FALSE);
+  
+  if (GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE) & WS_EX_TRANSPARENT)
+    {
+      SetWindowPos (GDK_WINDOW_HWND (window), HWND_BOTTOM, 0, 0, 0, 0,
+                   SWP_HIDEWINDOW | SWP_NOREDRAW | SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE);
+    }
+  else
+    {
+      ShowWindow (GDK_WINDOW_HWND (window), SW_HIDE);
     }
 }
 
 void
 gdk_window_withdraw (GdkWindow *window)
 {
+  GdkWindowObject *private;
+  
   g_return_if_fail (window != NULL);
+  
+  private = (GdkWindowObject*) window;
+  if (private->destroyed)
+    return;
 
-  if (!GDK_DRAWABLE_DESTROYED (window))
-    {
-      GDK_NOTE (MISC, g_print ("gdk_window_withdraw: %#x\n",
-                              GDK_DRAWABLE_XID (window)));
-
-      gdk_window_hide (window);        /* XXX */
-    }
+  GDK_NOTE (MISC, g_print ("gdk_window_withdraw: %p: %s\n",
+                          GDK_WINDOW_HWND (window),
+                          _gdk_win32_window_state_to_string (private->state)));
+  
+  gdk_window_hide (window);    /* ??? */
 }
 
 void
@@ -670,58 +1168,36 @@ gdk_window_move (GdkWindow *window,
                 gint       x,
                 gint       y)
 {
-  GdkWindowPrivate *private;
+  GdkWindowObject *private = (GdkWindowObject *)window;
+  GdkWindowImplWin32 *impl;
 
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
 
-  if (!GDK_DRAWABLE_DESTROYED (window))
-    {
-      RECT rect;
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
 
-      GDK_NOTE (MISC, g_print ("gdk_window_move: %#x +%d+%d\n",
-                              GDK_DRAWABLE_XID (window), x, y));
+  GDK_NOTE (MISC, g_print ("gdk_window_move: %p: +%d+%d\n",
+                          GDK_WINDOW_HWND (window), x, y));
+      
+  impl = GDK_WINDOW_IMPL_WIN32 (private->impl);
 
-      private = (GdkWindowPrivate *) window;
-      GetClientRect (GDK_DRAWABLE_XID (window), &rect);
+  if (private->state & GDK_WINDOW_STATE_FULLSCREEN)
+    return;
 
-      if (GDK_DRAWABLE_TYPE (window) != GDK_WINDOW_CHILD)
-       {
-         POINT ptTL, ptBR;
-         DWORD dwStyle;
-         DWORD dwExStyle;
-
-         ptTL.x = 0;
-         ptTL.y = 0; 
-         ClientToScreen (GDK_DRAWABLE_XID (window), &ptTL);
-         rect.left = x;
-         rect.top = y;
-
-         ptBR.x = rect.right;
-         ptBR.y = rect.bottom;
-         ClientToScreen (GDK_DRAWABLE_XID (window), &ptBR);
-         rect.right = x + ptBR.x - ptTL.x;
-         rect.bottom = y + ptBR.y - ptTL.y;
-
-         dwStyle = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_STYLE);
-         dwExStyle = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_EXSTYLE);
-         SafeAdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
-
-         x = rect.left;
-         y = rect.top;
-       }
-      else
-       {
-         private->x = x;
-         private->y = y;
-       }
-      GDK_NOTE (MISC, g_print ("...MoveWindow(%#x,%dx%d@+%d+%d)\n",
-                              GDK_DRAWABLE_XID (window),
-                              rect.right - rect.left, rect.bottom - rect.top,
-                              x, y));
-      if (!MoveWindow (GDK_DRAWABLE_XID (window),
-                      x, y, rect.right - rect.left, rect.bottom - rect.top,
-                      TRUE))
-       WIN32_API_FAILED ("MoveWindow");
+  if (GDK_WINDOW_TYPE (private) == GDK_WINDOW_CHILD)
+    _gdk_window_move_resize_child (window, x, y, impl->width, impl->height);
+  else
+    {
+      RECT outer_rect;
+
+      get_outer_rect (window, impl->width, impl->height, &outer_rect);
+      
+      adjust_for_gravity_hints (impl, &outer_rect, &x, &y);
+
+      API_CALL (SetWindowPos, (GDK_WINDOW_HWND (window), NULL,
+                              x - _gdk_offset_x, y - _gdk_offset_y, 0, 0,
+                              SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER));
     }
 }
 
@@ -730,69 +1206,41 @@ gdk_window_resize (GdkWindow *window,
                   gint       width,
                   gint       height)
 {
-  GdkWindowPrivate *private;
+  GdkWindowObject *private = (GdkWindowObject*) window;
+  GdkWindowImplWin32 *impl;
 
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
 
-  if ((gint16) width < 1)
+  if (width < 1)
     width = 1;
-  if ((gint16) height < 1)
+  if (height < 1)
     height = 1;
 
-  private = (GdkWindowPrivate*) window;
-
-  if (!private->drawable.destroyed &&
-      ((private->resize_count > 0) ||
-       (private->drawable.width != (guint16) width) ||
-       (private->drawable.height != (guint16) height)))
-    {
-      int x, y;
-
-      GDK_NOTE (MISC, g_print ("gdk_window_resize: %#x %dx%d\n",
-                              GDK_DRAWABLE_XID (window), width, height));
-      
-      if (private->drawable.window_type != GDK_WINDOW_CHILD)
-       {
-         POINT pt;
-         RECT rect;
-         DWORD dwStyle;
-         DWORD dwExStyle;
+  GDK_NOTE (MISC, g_print ("gdk_window_resize: %p: %dx%d\n",
+                          GDK_WINDOW_HWND (window), width, height));
 
-         pt.x = 0;
-         pt.y = 0; 
-         ClientToScreen (GDK_DRAWABLE_XID (window), &pt);
-         rect.left = pt.x;
-         rect.top = pt.y;
-         rect.right = pt.x + width;
-         rect.bottom = pt.y + height;
-
-         dwStyle = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_STYLE);
-         dwExStyle = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_EXSTYLE);
-         if (!AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle))
-           WIN32_API_FAILED ("AdjustWindowRectEx");
-
-         x = rect.left;
-         y = rect.top;
-         width = rect.right - rect.left;
-         height = rect.bottom - rect.top;
-       }
-      else
-       {
-         x = private->x;
-         y = private->y;
-         private->drawable.width = width;
-         private->drawable.height = height;
-       }
+  impl = GDK_WINDOW_IMPL_WIN32 (private->impl);
+  
+  if (private->state & GDK_WINDOW_STATE_FULLSCREEN)
+    return;
 
+  if (GDK_WINDOW_TYPE (private) == GDK_WINDOW_CHILD)
+    _gdk_window_move_resize_child (window, private->x, private->y, width, height);
+  else
+    {
+      RECT outer_rect;
+      get_outer_rect (window, width, height, &outer_rect);
+
+      API_CALL (SetWindowPos, (GDK_WINDOW_HWND (window), NULL,
+                              0, 0,
+                              outer_rect.right - outer_rect.left,
+                              outer_rect.bottom - outer_rect.top,
+                              SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER));
       private->resize_count += 1;
-
-      GDK_NOTE (MISC,
-               g_print ("...MoveWindow(%#x,%dx%d@+%d+%d)\n",
-                        GDK_DRAWABLE_XID (window), width, height, x, y));
-      if (!MoveWindow (GDK_DRAWABLE_XID (window),
-                      x, y, width, height,
-                      TRUE))
-       WIN32_API_FAILED ("MoveWindow");
     }
 }
 
@@ -803,66 +1251,44 @@ gdk_window_move_resize (GdkWindow *window,
                        gint       width,
                        gint       height)
 {
-  GdkWindowPrivate *private;
+  GdkWindowObject *private = (GdkWindowObject*) window;
+  GdkWindowImplWin32 *impl;
 
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
 
-  if ((gint16) width < 1)
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  if (width < 1)
     width = 1;
-  if ((gint16) height < 1)
+  if (height < 1)
     height = 1;
+  
+  impl = GDK_WINDOW_IMPL_WIN32 (private->impl);
 
-  if (!GDK_DRAWABLE_DESTROYED (window))
-    {
-      RECT rect;
-      DWORD dwStyle;
-      DWORD dwExStyle;
+  if (private->state & GDK_WINDOW_STATE_FULLSCREEN)
+    return;
 
-      GDK_NOTE (MISC, g_print ("gdk_window_move_resize: %#x %dx%d@+%d+%d\n",
-                              GDK_DRAWABLE_XID (window), width, height, x, y));
-      
-      private = (GdkWindowPrivate*) window;
-      rect.left = x;
-      rect.top = y;
-      rect.right = x + width;
-      rect.bottom = y + height;
+  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)
+    _gdk_window_move_resize_child (window, x, y, width, height);
+  else
+    {
+      RECT outer_rect;
 
-      dwStyle = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_STYLE);
-      dwExStyle = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_EXSTYLE);
-      if (!AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle))
-       WIN32_API_FAILED ("AdjustWindowRectEx");
+      get_outer_rect (window, width, height, &outer_rect);
 
-      if (private->drawable.window_type == GDK_WINDOW_CHILD)
-       {
-         private->x = x;
-         private->y = y;
-         private->drawable.width = width;
-         private->drawable.height = height;
-       }
-      GDK_NOTE (MISC, g_print ("...MoveWindow(%#x,%dx%d@+%d+%d)\n",
-                              GDK_DRAWABLE_XID (window),
-                              rect.right - rect.left, rect.bottom - rect.top,
-                              rect.left, rect.top));
-      if (!MoveWindow (GDK_DRAWABLE_XID (window),
-                      rect.left, rect.top,
-                      rect.right - rect.left, rect.bottom - rect.top,
-                      TRUE))
-       WIN32_API_FAILED ("MoveWindow");
+      adjust_for_gravity_hints (impl, &outer_rect, &x, &y);
 
-      if (private->guffaw_gravity)
-       {
-         GList *tmp_list = private->children;
-         while (tmp_list)
-           {
-             GdkWindowPrivate *child_private = tmp_list->data;
-             
-             child_private->x -= x - private->x;
-             child_private->y -= y - private->y;
-             
-             tmp_list = tmp_list->next;
-           }
-       }
-      
+      API_CALL (SetWindowPos, (GDK_WINDOW_HWND (window), NULL,
+                              x - _gdk_offset_x, y - _gdk_offset_y,
+                              outer_rect.right - outer_rect.left,
+                              outer_rect.bottom - outer_rect.top,
+                              SWP_NOACTIVATE | SWP_NOZORDER));
     }
 }
 
@@ -872,49 +1298,64 @@ gdk_window_reparent (GdkWindow *window,
                     gint       x,
                     gint       y)
 {
-  GdkWindowPrivate *window_private;
-  GdkWindowPrivate *parent_private;
-  GdkWindowPrivate *old_parent_private;
+  GdkWindowObject *window_private;
+  GdkWindowObject *parent_private;
+  GdkWindowObject *old_parent_private;
+  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 (GDK_WINDOW_DESTROYED (window) ||
+      (new_parent && GDK_WINDOW_DESTROYED (new_parent)))
+    {
+      return;
+    }
 
   if (!new_parent)
-    new_parent = gdk_parent_root;
+    new_parent = _gdk_parent_root;
 
-  window_private = (GdkWindowPrivate*) window;
-  old_parent_private = (GdkWindowPrivate *) window_private->parent;
-  parent_private = (GdkWindowPrivate*) new_parent;
+  window_private = (GdkWindowObject*) window;
+  old_parent_private = (GdkWindowObject *) window_private->parent;
+  parent_private = (GdkWindowObject*) new_parent;
+  impl = GDK_WINDOW_IMPL_WIN32 (window_private->impl);
 
-  if (!GDK_DRAWABLE_DESTROYED (window)
-      && !GDK_DRAWABLE_DESTROYED (new_parent))
+  if (!GDK_WINDOW_DESTROYED (window) && !GDK_WINDOW_DESTROYED (new_parent))
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_reparent: %#x %#x\n",
-                              GDK_DRAWABLE_XID (window),
-                              GDK_DRAWABLE_XID (new_parent)));
-      if (!SetParent (GDK_DRAWABLE_XID (window),
-                     GDK_DRAWABLE_XID (new_parent)))
-       WIN32_API_FAILED ("SetParent");
+      GDK_NOTE (MISC, g_print ("gdk_window_reparent: %p: %p\n",
+                              GDK_WINDOW_HWND (window),
+                              GDK_WINDOW_HWND (new_parent)));
+
+      API_CALL (SetParent, (GDK_WINDOW_HWND (window),
+                           GDK_WINDOW_HWND (new_parent)));
 
-      if (!MoveWindow (GDK_DRAWABLE_XID (window),
-                      x, y,
-                      window_private->drawable.width,
-                      window_private->drawable.height,
-                      TRUE))
-       WIN32_API_FAILED ("MoveWindow");
+      API_CALL (MoveWindow, (GDK_WINDOW_HWND (window),
+                            x, y, impl->width, impl->height, TRUE));
     }
+
+  /* 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 = new_parent;
+  window_private->parent = (GdkWindowObject *)new_parent;
 
   if (old_parent_private)
     old_parent_private->children =
       g_list_remove (old_parent_private->children, window);
 
+#if 0
   if ((old_parent_private &&
        (!old_parent_private->guffaw_gravity != !parent_private->guffaw_gravity)) ||
       (!old_parent_private && parent_private->guffaw_gravity))
     gdk_window_set_static_win_gravity (window, parent_private->guffaw_gravity);
-  
+#endif
+
   parent_private->children = g_list_prepend (parent_private->children, window);
+  _gdk_window_init_position (GDK_WINDOW (window_private));
 }
 
 void
@@ -924,24 +1365,29 @@ _gdk_windowing_window_clear_area (GdkWindow *window,
                                  gint       width,
                                  gint       height)
 {
+  GdkWindowImplWin32 *impl;
+
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   
-  if (!GDK_DRAWABLE_DESTROYED (window))
+  impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
+
+  if (!GDK_WINDOW_DESTROYED (window))
     {
       HDC hdc;
 
       if (width == 0)
-       width = ((GdkDrawablePrivate *) window)->width - x;
+       width = impl->width - x;
       if (height == 0)
-       height = ((GdkDrawablePrivate *) window)->height - y;
-      GDK_NOTE (MISC, g_print ("_gdk_windowing_window_clear_area: "
-                              "%#x %dx%d@+%d+%d\n",
-                              GDK_DRAWABLE_XID (window), width, height, x, y));
-      hdc = GetDC (GDK_DRAWABLE_XID (window));
+       height = impl->height - y;
+      GDK_NOTE (MISC, g_print ("_gdk_windowing_window_clear_area: %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_DRAWABLE_XID (window), WM_ERASEBKGND, (WPARAM) hdc, 0);
-      ReleaseDC (GDK_DRAWABLE_XID (window), hdc);
+      SendMessage (GDK_WINDOW_HWND (window), WM_ERASEBKGND, (WPARAM) hdc, 0);
+      GDI_CALL (ReleaseDC, (GDK_WINDOW_HWND (window), hdc));
     }
 }
 
@@ -955,21 +1401,21 @@ _gdk_windowing_window_clear_area_e (GdkWindow *window,
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   
-  if (!GDK_DRAWABLE_DESTROYED (window))
+  if (!GDK_WINDOW_DESTROYED (window))
     {
       RECT rect;
 
-      GDK_NOTE (MISC, g_print ("_gdk_windowing_window_clear_area_e: "
-                              "%#x %dx%d@+%d+%d\n",
-                              GDK_DRAWABLE_XID (window), width, height, x, y));
+      GDK_NOTE (MISC, g_print ("_gdk_windowing_window_clear_area_e: %p: "
+                              "%dx%d@+%d+%d\n",
+                              GDK_WINDOW_HWND (window),
+                              width, height, x, y));
 
       rect.left = x;
       rect.right = x + width + 1;
       rect.top = y;
       rect.bottom = y + height + 1;
-      if (!InvalidateRect (GDK_DRAWABLE_XID (window), &rect, TRUE))
-       WIN32_GDI_FAILED ("InvalidateRect");
-      UpdateWindow (GDK_DRAWABLE_XID (window));
+      GDI_CALL (InvalidateRect, (GDK_WINDOW_HWND (window), &rect, TRUE));
+      UpdateWindow (GDK_WINDOW_HWND (window));
     }
 }
 
@@ -979,13 +1425,12 @@ gdk_window_raise (GdkWindow *window)
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   
-  if (!GDK_DRAWABLE_DESTROYED (window))
+  if (!GDK_WINDOW_DESTROYED (window))
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_raise: %#x\n",
-                              GDK_DRAWABLE_XID (window)));
+      GDK_NOTE (MISC, g_print ("gdk_window_raise: %p\n",
+                              GDK_WINDOW_HWND (window)));
 
-      if (!BringWindowToTop (GDK_DRAWABLE_XID (window)))
-       WIN32_API_FAILED ("BringWindowToTop");
+      API_CALL (BringWindowToTop, (GDK_WINDOW_HWND (window)));
     }
 }
 
@@ -995,14 +1440,13 @@ gdk_window_lower (GdkWindow *window)
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   
-  if (!GDK_DRAWABLE_DESTROYED (window))
+  if (!GDK_WINDOW_DESTROYED (window))
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_lower: %#x\n",
-                              GDK_DRAWABLE_XID (window)));
+      GDK_NOTE (MISC, g_print ("gdk_window_lower: %p\n",
+                              GDK_WINDOW_HWND (window)));
 
-      if (!SetWindowPos (GDK_DRAWABLE_XID (window), HWND_BOTTOM, 0, 0, 0, 0,
-                        SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE))
-       WIN32_API_FAILED ("SetWindowPos");
+      API_CALL (SetWindowPos, (GDK_WINDOW_HWND (window), HWND_BOTTOM, 0, 0, 0, 0,
+                              SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE));
     }
 }
 
@@ -1016,118 +1460,40 @@ gdk_window_set_hints (GdkWindow *window,
                      gint       max_height,
                      gint       flags)
 {
-  WINDOWPLACEMENT size_hints;
-  RECT rect;
-  DWORD dwStyle;
-  DWORD dwExStyle;
-  int diff;
-  
+  /* Note that this function is obsolete */
+
+  GdkWindowImplWin32 *impl;
+
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   
-  if (GDK_DRAWABLE_DESTROYED (window))
+  if (GDK_WINDOW_DESTROYED (window))
     return;
   
-  GDK_NOTE (MISC, g_print ("gdk_window_set_hints: %#x %dx%d..%dx%d @+%d+%d\n",
-                          GDK_DRAWABLE_XID (window),
+  impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
+
+  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));
 
-  GDK_WINDOW_WIN32DATA (window)->hint_flags = flags;
-  size_hints.length = sizeof (size_hints);
-
   if (flags)
     {
-      if (flags & GDK_HINT_POS)
-       if (!GetWindowPlacement (GDK_DRAWABLE_XID (window), &size_hints))
-         WIN32_API_FAILED ("GetWindowPlacement");
-       else
-         {
-           GDK_NOTE (MISC, g_print ("...rcNormalPosition:"
-                                    " (%d,%d)--(%d,%d)\n",
-                                    size_hints.rcNormalPosition.left,
-                                    size_hints.rcNormalPosition.top,
-                                    size_hints.rcNormalPosition.right,
-                                    size_hints.rcNormalPosition.bottom));
-           /* What are the corresponding window coordinates for client
-            * area coordinates x, y
-            */
-           rect.left = x;
-           rect.top = y;
-           rect.right = rect.left + 200;       /* dummy */
-           rect.bottom = rect.top + 200;
-           dwStyle = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_STYLE);
-           dwExStyle = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_EXSTYLE);
-           AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
-           size_hints.flags = 0;
-           size_hints.showCmd = SW_SHOWNA;
-
-           /* Set the normal position hint to that location, with unchanged
-            * width and height.
-            */
-           diff = size_hints.rcNormalPosition.left - rect.left;
-           size_hints.rcNormalPosition.left = rect.left;
-           size_hints.rcNormalPosition.right -= diff;
-           diff = size_hints.rcNormalPosition.top - rect.top;
-           size_hints.rcNormalPosition.top = rect.top;
-           size_hints.rcNormalPosition.bottom -= diff;
-           GDK_NOTE (MISC, g_print ("...setting: (%d,%d)--(%d,%d)\n",
-                                    size_hints.rcNormalPosition.left,
-                                    size_hints.rcNormalPosition.top,
-                                    size_hints.rcNormalPosition.right,
-                                    size_hints.rcNormalPosition.bottom));
-           if (!SetWindowPlacement (GDK_DRAWABLE_XID (window), &size_hints))
-             WIN32_API_FAILED ("SetWindowPlacement");
-           GDK_WINDOW_WIN32DATA (window)->hint_x = rect.left;
-           GDK_WINDOW_WIN32DATA (window)->hint_y = rect.top;
-         }
+      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_MIN_SIZE)
-       {
-         rect.left = 0;
-         rect.top = 0;
-         rect.right = min_width;
-         rect.bottom = min_height;
-         dwStyle = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_STYLE);
-         dwExStyle = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_EXSTYLE);
-         AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
-         GDK_WINDOW_WIN32DATA (window)->hint_min_width =
-           rect.right - rect.left;
-         GDK_WINDOW_WIN32DATA (window)->hint_min_height =
-           rect.bottom - rect.top;
-
-         /* Also chek if he current size of the window is in bounds. */
-         GetClientRect (GDK_DRAWABLE_XID (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_DRAWABLE_XID (window), GWL_STYLE);
-         dwExStyle = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_EXSTYLE);
-         AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
-         GDK_WINDOW_WIN32DATA (window)->hint_max_width =
-           rect.right - rect.left;
-         GDK_WINDOW_WIN32DATA (window)->hint_max_height =
-           rect.bottom - rect.top;
-         /* Again, check if the window is too large currently. */
-         GetClientRect (GDK_DRAWABLE_XID (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);
     }
 }
 
@@ -1136,106 +1502,137 @@ gdk_window_set_geometry_hints (GdkWindow      *window,
                               GdkGeometry    *geometry,
                               GdkWindowHints  geom_mask)
 {
+  GdkWindowImplWin32 *impl;
+#if 0
   WINDOWPLACEMENT size_hints;
   RECT rect;
-  DWORD dwStyle;
-  DWORD dwExStyle;
-  int diff;
-  
+  gint new_width = 0, new_height = 0;
+#endif
+
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   
-  if (GDK_DRAWABLE_DESTROYED (window))
+  if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  size_hints.length = sizeof (size_hints);
+  GDK_NOTE (MISC, g_print ("gdk_window_set_geometry_hints: %p\n",
+                          GDK_WINDOW_HWND (window)));
 
-  GDK_WINDOW_WIN32DATA (window)->hint_flags = geom_mask;
+  impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
+
+  impl->hint_flags = geom_mask;
+  impl->hints = *geometry;
 
   if (geom_mask & GDK_HINT_POS)
-    ; /* XXX */
+    ; /* even the X11 mplementation doesn't care */
 
   if (geom_mask & GDK_HINT_MIN_SIZE)
     {
-      rect.left = 0;
-      rect.top = 0;
-      rect.right = geometry->min_width;
-      rect.bottom = geometry->min_height;
-      dwStyle = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_STYLE);
-      dwExStyle = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_EXSTYLE);
-      AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
-      GDK_WINDOW_WIN32DATA (window)->hint_min_width = rect.right - rect.left;
-      GDK_WINDOW_WIN32DATA (window)->hint_min_height = rect.bottom - rect.top;
-
-      /* Also check if he current size of the window is in bounds */
-      GetClientRect (GDK_DRAWABLE_XID (window), &rect);
-      if (rect.right < geometry->min_width
-         && rect.bottom < geometry->min_height)
-       gdk_window_resize (window, geometry->min_width, geometry->min_height);
+      GDK_NOTE (MISC, g_print ("... MIN_SIZE: %dx%d\n",
+                              geometry->min_width, geometry->min_height));
+
+#if 0
+      /* Check if the 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)
+       {
+         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;
+       }
+#endif
     }
   
   if (geom_mask & GDK_HINT_MAX_SIZE)
     {
-      rect.left = 0;
-      rect.top = 0;
-      rect.right = geometry->max_width;
-      rect.bottom = geometry->max_height;
-      dwStyle = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_STYLE);
-      dwExStyle = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_EXSTYLE);
-      AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
-      GDK_WINDOW_WIN32DATA (window)->hint_max_width = rect.right - rect.left;
-      GDK_WINDOW_WIN32DATA (window)->hint_max_height = rect.bottom - rect.top;
-
-      /* Again, check if the window is too large currently. */
-      GetClientRect (GDK_DRAWABLE_XID (window), &rect);
-      if (rect.right > geometry->max_width
-         && rect.bottom > geometry->max_height)
-       gdk_window_resize (window, geometry->max_width, geometry->max_height);
+      GDK_NOTE (MISC, g_print ("... MAX_SIZE: %dx%d\n",
+                              geometry->max_width, geometry->max_height));
+
+#if 0
+      /* Check if the current size of the window is in bounds */
+      GetClientRect (GDK_WINDOW_HWND (window), &rect);
+
+      if (rect.right > geometry->max_width &&
+         rect.bottom > 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;
+       }
+#endif
+    }
+
+#if 0
+  /* Apply new size constraints */
+  if (new_width != 0 && new_height != 0)
+    gdk_window_resize (window, new_width, new_height);
+#endif
+
+  if (geom_mask & GDK_HINT_BASE_SIZE)
+    {
+      GDK_NOTE (MISC, g_print ("... BASE_SIZE: %dx%d\n",
+                              geometry->base_width, geometry->base_height));
+
+#if 0
+      size_hints.length = sizeof (size_hints);
+
+      if (API_CALL (GetWindowPlacement, (GDK_WINDOW_HWND (window), &size_hints)))
+       {
+         GDK_NOTE (MISC,
+                   g_print ("... rcNormalPosition: (%ld,%ld)--(%ld,%ld)\n",
+                            size_hints.rcNormalPosition.left,
+                            size_hints.rcNormalPosition.top,
+                            size_hints.rcNormalPosition.right,
+                            size_hints.rcNormalPosition.bottom));
+         size_hints.rcNormalPosition.right =
+           size_hints.rcNormalPosition.left + geometry->base_width;
+         size_hints.rcNormalPosition.bottom =
+           size_hints.rcNormalPosition.top + geometry->base_height;
+         GDK_NOTE (MISC, g_print ("...setting: rcNormal: (%ld,%ld)--(%ld,%ld)\n",
+                                  size_hints.rcNormalPosition.left,
+                                  size_hints.rcNormalPosition.top,
+                                  size_hints.rcNormalPosition.right,
+                                  size_hints.rcNormalPosition.bottom));
+         API_CALL (SetWindowPlacement, (GDK_WINDOW_HWND (window), &size_hints));
+       }
+#endif
     }
-  
-  /* I don't know what to do when called with zero base_width and height. */
-  if (geom_mask & GDK_HINT_BASE_SIZE
-      && geometry->base_width > 0
-      && geometry->base_height > 0)
-    if (!GetWindowPlacement (GDK_DRAWABLE_XID (window), &size_hints))
-      WIN32_API_FAILED ("GetWindowPlacement");
-    else
-      {
-       GDK_NOTE (MISC, g_print ("gdk_window_set_geometry_hints:"
-                                " rcNormalPosition: (%d,%d)--(%d,%d)\n",
-                                size_hints.rcNormalPosition.left,
-                                size_hints.rcNormalPosition.top,
-                                size_hints.rcNormalPosition.right,
-                                size_hints.rcNormalPosition.bottom));
-       size_hints.rcNormalPosition.right =
-         size_hints.rcNormalPosition.left + geometry->base_width;
-       size_hints.rcNormalPosition.bottom =
-         size_hints.rcNormalPosition.top + geometry->base_height;
-       GDK_NOTE (MISC, g_print ("...setting: rcNormal: (%d,%d)--(%d,%d)\n",
-                                size_hints.rcNormalPosition.left,
-                                size_hints.rcNormalPosition.top,
-                                size_hints.rcNormalPosition.right,
-                                size_hints.rcNormalPosition.bottom));
-       if (!SetWindowPlacement (GDK_DRAWABLE_XID (window), &size_hints))
-         WIN32_API_FAILED ("SetWindowPlacement");
-      }
   
   if (geom_mask & GDK_HINT_RESIZE_INC)
     {
-      /* XXX */
+      GDK_NOTE (MISC, g_print ("... RESIZE_INC: (%d,%d)\n",
+                              geometry->width_inc, geometry->height_inc));
     }
   
   if (geom_mask & GDK_HINT_ASPECT)
     {
-      /* XXX */
+      GDK_NOTE (MISC, g_print ("... ASPECT: %g--%g\n",
+                              geometry->min_aspect, geometry->max_aspect));
+    }
+
+  if (geom_mask & GDK_HINT_WIN_GRAVITY)
+    {
+      GDK_NOTE (MISC, g_print ("... GRAVITY: %d\n", geometry->win_gravity));
     }
 }
 
@@ -1243,36 +1640,27 @@ void
 gdk_window_set_title (GdkWindow   *window,
                      const gchar *title)
 {
-  gint titlelen;
-  wchar_t *wcstr;
-  gint wlen;
-  char *mbstr;
+  char *mbtitle;
 
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   g_return_if_fail (title != NULL);
-  g_return_if_fail (strlen (title) > 0);
+
+  /* Empty window titles not allowed, so set it to just a period. */
+  if (!title[0])
+    title = ".";
   
-  GDK_NOTE (MISC, g_print ("gdk_window_set_title: %#x %s\n",
-                          GDK_DRAWABLE_XID (window), title));
-  if (!GDK_DRAWABLE_DESTROYED (window))
+  GDK_NOTE (MISC, g_print ("gdk_window_set_title: %p: %s\n",
+                          GDK_WINDOW_HWND (window), title));
+  
+  if (!GDK_WINDOW_DESTROYED (window))
     {
       /* As the title is in UTF-8 we must translate it
        * to the system codepage.
        */
-      titlelen = strlen (title);
-      wcstr = g_new (wchar_t, titlelen + 1);
-      mbstr = g_new (char, 3*titlelen + 1);
-      wlen = gdk_nmbstowchar_ts (wcstr, title, titlelen, titlelen);
-      wcstr[wlen] = 0;
-      WideCharToMultiByte (GetACP (), 0, wcstr, -1,
-                          mbstr, 3*titlelen, NULL, NULL);
-
-      if (!SetWindowText (GDK_DRAWABLE_XID (window), mbstr))
-       WIN32_API_FAILED ("SetWindowText");
-
-      g_free (mbstr);
-      g_free (wcstr);
+      mbtitle = g_locale_from_utf8 (title, -1, NULL, NULL, NULL);
+      API_CALL (SetWindowText, (GDK_WINDOW_HWND (window), mbtitle));
+      g_free (mbtitle);
     }
 }
 
@@ -1283,8 +1671,9 @@ 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",
-                          GDK_DRAWABLE_XID (window), (role ? role : "NULL")));
+  GDK_NOTE (MISC, g_print ("gdk_window_set_role: %p: %s\n",
+                          GDK_WINDOW_HWND (window),
+                          (role ? role : "NULL")));
   /* XXX */
 }
 
@@ -1292,39 +1681,59 @@ void
 gdk_window_set_transient_for (GdkWindow *window, 
                              GdkWindow *parent)
 {
+  HWND window_id, parent_id;
+
   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",
-                          GDK_DRAWABLE_XID (window),
-                          GDK_DRAWABLE_XID (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;
+
+  if (((GdkWindowObject *) window)->window_type == GDK_WINDOW_CHILD)
+    {
+      GDK_NOTE (MISC, g_print ("...a child window!\n"));
+      return;
+    }
+  
+  window_id = GDK_WINDOW_HWND (window);
+  parent_id = GDK_WINDOW_HWND (parent);
+
+  /* This changes the *owner* of the window, despite the misleading
+   * name. (Owner and parent are unrelated concepts.) At least that's
+   * what people who seem to know what they talk about say on
+   * USENET. Search on Google.
+   */
+  SetLastError (0);
+  if (SetWindowLong (window_id, GWL_HWNDPARENT, (long) parent_id) == 0 &&
+      GetLastError () != 0)
+    WIN32_API_FAILED ("SetWindowLong");
 }
 
 void
-gdk_window_set_background (GdkWindow *window,
-                          GdkColor  *color)
+gdk_window_set_background (GdkWindow      *window,
+                          const GdkColor *color)
 {
+  GdkWindowObject *private = (GdkWindowObject *)window;
+  
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   
-  if (!GDK_DRAWABLE_DESTROYED (window))
-    {
-      GDK_NOTE (MISC, g_print ("gdk_window_set_background: %#x %s\n",
-                              GDK_DRAWABLE_XID (window), 
-                              gdk_win32_color_to_string (color)));
+  GDK_NOTE (MISC, g_print ("gdk_window_set_background: %p: %s\n",
+                          GDK_WINDOW_HWND (window), 
+                          _gdk_win32_color_to_string (color)));
 
-      if (GDK_WINDOW_WIN32DATA (window)->bg_type == GDK_WIN32_BG_PIXMAP)
-       {
-         if (GDK_WINDOW_WIN32DATA (window)->bg_pixmap != NULL)
-           {
-             gdk_drawable_unref (GDK_WINDOW_WIN32DATA (window)->bg_pixmap);
-             GDK_WINDOW_WIN32DATA (window)->bg_pixmap = NULL;
-           }
-         GDK_WINDOW_WIN32DATA (window)->bg_type = GDK_WIN32_BG_NORMAL;
-       }
-      GDK_WINDOW_WIN32DATA (window)->bg_type = GDK_WIN32_BG_PIXEL;
-      GDK_WINDOW_WIN32DATA (window)->bg_pixel = color->pixel;
+  private->bg_color = *color;
+
+  if (private->bg_pixmap &&
+      private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
+      private->bg_pixmap != GDK_NO_BG)
+    {
+      g_object_unref (private->bg_pixmap);
+      private->bg_pixmap = NULL;
     }
 }
 
@@ -1333,37 +1742,33 @@ gdk_window_set_back_pixmap (GdkWindow *window,
                            GdkPixmap *pixmap,
                            gint       parent_relative)
 {
+  GdkWindowObject *private = (GdkWindowObject *)window;
+
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
+  g_return_if_fail (pixmap == NULL || !parent_relative);
+  g_return_if_fail (pixmap == NULL || gdk_drawable_get_depth (window) == gdk_drawable_get_depth (pixmap));
   
-  if (!GDK_DRAWABLE_DESTROYED (window))
+  if (private->bg_pixmap &&
+      private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
+      private->bg_pixmap != GDK_NO_BG)
+    g_object_unref (private->bg_pixmap);
+
+  if (parent_relative)
     {
-      if (GDK_WINDOW_WIN32DATA (window)->bg_type == GDK_WIN32_BG_PIXMAP)
-       {
-         if (GDK_WINDOW_WIN32DATA (window)->bg_pixmap != NULL)
-           {
-             gdk_drawable_unref (GDK_WINDOW_WIN32DATA (window)->bg_pixmap);
-             GDK_WINDOW_WIN32DATA (window)->bg_pixmap = NULL;
-           }
-         GDK_WINDOW_WIN32DATA (window)->bg_type = GDK_WIN32_BG_NORMAL;
-       }
-      if (parent_relative)
-       {
-         GDK_WINDOW_WIN32DATA (window)->bg_type =
-           GDK_WIN32_BG_PARENT_RELATIVE;
-       }
-      else if (!pixmap)
+      private->bg_pixmap = GDK_PARENT_RELATIVE_BG;
+      GDK_NOTE (MISC, g_print (G_STRLOC ": setting background pixmap to parent_relative\n"));
+    }
+  else
+    {
+      if (pixmap)
        {
-         
+         g_object_ref (pixmap);
+         private->bg_pixmap = pixmap;
        }
       else
        {
-         /* We must cache the pixmap in the GdkWindowWin32Data and
-          * paint it each time we get WM_ERASEBKGND
-          */
-         GDK_WINDOW_WIN32DATA (window)->bg_type = GDK_WIN32_BG_PIXMAP;
-         GDK_WINDOW_WIN32DATA (window)->bg_pixmap = pixmap;
-         gdk_drawable_ref (pixmap);
+         private->bg_pixmap = GDK_NO_BG;
        }
     }
 }
@@ -1372,29 +1777,88 @@ void
 gdk_window_set_cursor (GdkWindow *window,
                       GdkCursor *cursor)
 {
+  GdkWindowImplWin32 *impl;
   GdkCursorPrivate *cursor_private;
-  HCURSOR xcursor;
-  POINT pt;
+  GdkWindowObject *parent_window;
+  HCURSOR hcursor;
+  HCURSOR hprevcursor;
   
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   
+  impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
   cursor_private = (GdkCursorPrivate*) cursor;
   
-  if (!GDK_DRAWABLE_DESTROYED (window))
-    {
-      if (!cursor)
-       xcursor = LoadCursor (NULL, IDC_ARROW);
-      else
-       xcursor = cursor_private->xcursor;
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
 
-      GDK_NOTE (MISC, g_print ("gdk_window_set_cursor: %#x %#x\n",
-                              GDK_DRAWABLE_XID (window), xcursor));
-      GDK_WINDOW_WIN32DATA (window)->xcursor = xcursor;
+  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;
 
-      GetCursorPos (&pt);
-      if (ChildWindowFromPoint (GDK_DRAWABLE_XID (window), pt) == GDK_DRAWABLE_XID (window))
-       SetCursor (xcursor);
+  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).
+       */
+      if ((impl->hcursor = CopyCursor (hcursor)) == NULL)
+       WIN32_API_FAILED ("CopyCursor");
+      GDK_NOTE (MISC, g_print ("...CopyCursor (%p) = %p\n",
+                              hcursor, impl->hcursor));
+    }
+
+  /* If the pointer is over our window, set new cursor if given */
+  if (gdk_window_get_pointer(window, NULL, NULL, NULL) == window)
+    if (impl->hcursor != NULL)
+      SetCursor (impl->hcursor);
+
+  /* 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)
+       {
+         /* Look for a suitable cursor to use instead */
+         hcursor = NULL;
+          parent_window = GDK_WINDOW_OBJECT (window)->parent;
+          while (hcursor == NULL)
+           {
+             if (parent_window)
+               {
+                 impl = GDK_WINDOW_IMPL_WIN32 (parent_window->impl);
+                 hcursor = impl->hcursor;
+                 parent_window = parent_window->parent;
+               }
+             else
+               {
+                 hcursor = LoadCursor (NULL, IDC_ARROW);
+               }
+           }
+          SetCursor (hcursor);
+        }
+
+      GDK_NOTE (MISC, g_print ("...DestroyCursor (%p)\n",
+                              hprevcursor));
+      
+      API_CALL (DestroyCursor, (hprevcursor));
     }
 }
 
@@ -1409,14 +1873,41 @@ 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_DRAWABLE_DESTROYED (window))
+  if (!GDK_WINDOW_DESTROYED (window))
     {
       RECT rect;
 
-      if (!GetClientRect (GDK_DRAWABLE_XID (window), &rect))
-       WIN32_API_FAILED ("GetClientRect");
+      API_CALL (GetClientRect, (GDK_WINDOW_HWND (window), &rect));
+
+      if (window != _gdk_parent_root)
+       {
+         POINT pt;
+         GdkWindow *parent = gdk_window_get_parent (window);
+
+         pt.x = rect.left;
+         pt.y = rect.top;
+         ClientToScreen (GDK_WINDOW_HWND (window), &pt);
+         ScreenToClient (GDK_WINDOW_HWND (parent), &pt);
+         rect.left = pt.x;
+         rect.top = pt.y;
+
+         pt.x = rect.right;
+         pt.y = rect.bottom;
+         ClientToScreen (GDK_WINDOW_HWND (window), &pt);
+         ScreenToClient (GDK_WINDOW_HWND (parent), &pt);
+         rect.right = pt.x;
+         rect.bottom = pt.y;
+
+         if (parent == _gdk_parent_root)
+           {
+             rect.left += _gdk_offset_x;
+             rect.top += _gdk_offset_y;
+             rect.right += _gdk_offset_x;
+             rect.bottom += _gdk_offset_y;
+           }
+       }
 
       if (x)
        *x = rect.left;
@@ -1428,6 +1919,12 @@ gdk_window_get_geometry (GdkWindow *window,
        *height = rect.bottom - rect.top;
       if (depth)
        *depth = gdk_drawable_get_visual (window)->depth;
+
+      GDK_NOTE (MISC, g_print ("gdk_window_get_geometry: %p: %ldx%ldx%d@+%ld+%ld\n",
+                              GDK_WINDOW_HWND (window),
+                              rect.right - rect.left, rect.bottom - rect.top,
+                              gdk_drawable_get_visual (window)->depth,
+                              rect.left, rect.top));
     }
 }
 
@@ -1442,13 +1939,13 @@ gdk_window_get_origin (GdkWindow *window,
 
   g_return_val_if_fail (window != NULL, 0);
 
-  if (!GDK_DRAWABLE_DESTROYED (window))
+  if (!GDK_WINDOW_DESTROYED (window))
     {
       POINT pt;
 
       pt.x = 0;
       pt.y = 0;
-      ClientToScreen (GDK_DRAWABLE_XID (window), &pt);
+      ClientToScreen (GDK_WINDOW_HWND (window), &pt);
       tx = pt.x;
       ty = pt.y;
       return_val = 1;
@@ -1457,12 +1954,13 @@ gdk_window_get_origin (GdkWindow *window,
     return_val = 0;
   
   if (x)
-    *x = tx;
+    *x = tx + _gdk_offset_x;
   if (y)
-    *y = ty;
+    *y = ty + _gdk_offset_y;
 
-  GDK_NOTE (MISC, g_print ("gdk_window_get_origin: %#x: +%d+%d\n",
-                          GDK_DRAWABLE_XID (window), tx, ty));
+  GDK_NOTE (MISC, g_print ("gdk_window_get_origin: %p: +%d+%d\n",
+                          GDK_WINDOW_HWND (window),
+                          tx, ty));
   return return_val;
 }
 
@@ -1479,103 +1977,160 @@ gdk_window_get_root_origin (GdkWindow *window,
                            gint      *x,
                            gint      *y)
 {
-  GdkWindowPrivate *rover;
-  POINT pt;
+  GdkRectangle rect;
 
-  g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
 
-  rover = (GdkWindowPrivate*) window;
+  gdk_window_get_frame_extents (window, &rect);
+
   if (x)
-    *x = 0;
+    *x = rect.x;
+
   if (y)
-    *y = 0;
-  if (GDK_DRAWABLE_DESTROYED (window))
-    return;
-      
-  while (rover->parent && ((GdkWindowPrivate*) rover->parent)->parent)
-    rover = (GdkWindowPrivate *) rover->parent;
-  if (rover->drawable.destroyed)
+    *y = rect.y;
+
+  GDK_NOTE (MISC, g_print ("gdk_window_get_root_origin: %p: +%d+%d\n",
+                          GDK_WINDOW_HWND (window), rect.x, rect.y));
+}
+
+void
+gdk_window_get_frame_extents (GdkWindow    *window,
+                              GdkRectangle *rect)
+{
+  GdkWindowObject *private;
+  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;
+  rect->height = 1;
+  
+  if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  pt.x = 0;
-  pt.y = 0;
-  ClientToScreen (GDK_DRAWABLE_XID (rover), &pt);
-  if (x)
-    *x = pt.x;
-  if (y)
-    *y = pt.y;
+  /* FIXME: window is documented to be a toplevel GdkWindow, so is it really
+   * necessary to walk its parent chain?
+   */
+  while (private->parent && ((GdkWindowObject*) private->parent)->parent)
+    private = (GdkWindowObject*) private->parent;
 
-  GDK_NOTE (MISC, g_print ("gdk_window_get_root_origin: %#x: (%#x) +%d+%d\n",
-                          GDK_DRAWABLE_XID (window),
-                          GDK_DRAWABLE_XID (rover), pt.x, pt.y));
+  hwnd = GDK_WINDOW_HWND (window);
+
+  /* find the frame window */
+  while (HWND_DESKTOP != GetParent (hwnd))
+    {
+      hwnd = GetParent (hwnd);
+      g_return_if_fail (NULL != hwnd);
+    }
+
+  API_CALL (GetWindowRect, (hwnd, &r));
+
+  rect->x = r.left + _gdk_offset_x;
+  rect->y = r.top + _gdk_offset_y;
+  rect->width = r.right - r.left;
+  rect->height = r.bottom - r.top;
+
+  GDK_NOTE (MISC, g_print ("gdk_window_get_frame_extents: %p: %ldx%ld@+%ld+%ld\n",
+                          GDK_WINDOW_HWND (window),
+                          r.right - r.left, r.bottom - r.top,
+                          r.left, r.top));
 }
 
 GdkWindow*
-gdk_window_get_pointer (GdkWindow       *window,
-                       gint            *x,
-                       gint            *y,
-                       GdkModifierType *mask)
+_gdk_windowing_window_get_pointer (GdkDisplay      *display,
+                                  GdkWindow       *window,
+                                  gint            *x,
+                                  gint            *y,
+                                  GdkModifierType *mask)
 {
   GdkWindow *return_val;
-  POINT pointc, point;
+  POINT screen_point, point;
   HWND hwnd, hwndc;
+  BYTE kbd[256];
 
   g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), NULL);
   
-  if (!window)
-    window = gdk_parent_root;
-
   return_val = NULL;
-  GetCursorPos (&pointc);
-  point = pointc;
-  ScreenToClient (GDK_DRAWABLE_XID (window), &point);
+  GetCursorPos (&screen_point);
+  point = screen_point;
+  ScreenToClient (GDK_WINDOW_HWND (window), &point);
 
-  if (x)
-    *x = point.x;
-  if (y)
-    *y = point.y;
+  *x = point.x;
+  *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_window_lookup (hwnd);
+  if (window == _gdk_parent_root)
+    {
+      *x += _gdk_offset_x;
+      *y += _gdk_offset_y;
+    }
 
-  if (mask)
+  hwnd = WindowFromPoint (screen_point);
+  if (hwnd != NULL)
     {
-      BYTE kbd[256];
-
-      GetKeyboardState (kbd);
-      *mask = 0;
-      if (kbd[VK_SHIFT] & 0x80)
-       *mask |= GDK_SHIFT_MASK;
-      if (kbd[VK_CAPITAL] & 0x80)
-       *mask |= GDK_LOCK_MASK;
-      if (kbd[VK_CONTROL] & 0x80)
-       *mask |= GDK_CONTROL_MASK;
-      if (kbd[VK_MENU] & 0x80)
-       *mask |= GDK_MOD1_MASK;
-      if (kbd[VK_LBUTTON] & 0x80)
-       *mask |= GDK_BUTTON1_MASK;
-      if (kbd[VK_MBUTTON] & 0x80)
-       *mask |= GDK_BUTTON2_MASK;
-      if (kbd[VK_RBUTTON] & 0x80)
-       *mask |= GDK_BUTTON3_MASK;
+      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;
+      
+  GetKeyboardState (kbd);
+  *mask = 0;
+  if (kbd[VK_SHIFT] & 0x80)
+    *mask |= GDK_SHIFT_MASK;
+  if (kbd[VK_CAPITAL] & 0x80)
+    *mask |= GDK_LOCK_MASK;
+  if (kbd[VK_CONTROL] & 0x80)
+    *mask |= GDK_CONTROL_MASK;
+  if (kbd[VK_MENU] & 0x80)
+    *mask |= GDK_MOD1_MASK;
+  if (kbd[VK_LBUTTON] & 0x80)
+    *mask |= GDK_BUTTON1_MASK;
+  if (kbd[VK_MBUTTON] & 0x80)
+    *mask |= GDK_BUTTON2_MASK;
+  if (kbd[VK_RBUTTON] & 0x80)
+    *mask |= GDK_BUTTON3_MASK;
   
   return return_val;
 }
 
+void
+_gdk_windowing_get_pointer (GdkDisplay       *display,
+                           GdkScreen       **screen,
+                           gint             *x,
+                           gint             *y,
+                           GdkModifierType  *mask)
+{
+  GdkScreen *default_screen = gdk_display_get_default_screen (display);
+  GdkWindow *root_window = gdk_screen_get_root_window (default_screen);
+  
+  *screen = default_screen;
+  _gdk_windowing_window_get_pointer (display, root_window, x, y, mask);
+}
+
 GdkWindow*
-gdk_window_at_pointer (gint *win_x,
-                      gint *win_y)
+_gdk_windowing_window_at_pointer (GdkDisplay *display,
+                                 gint       *win_x,
+                                 gint       *win_y)
 {
   GdkWindow *window;
   POINT point, pointc;
@@ -1588,11 +2143,9 @@ gdk_window_at_pointer (gint *win_x,
 
   if (hwnd == NULL)
     {
-      window = gdk_parent_root;
-      if (win_x)
-       *win_x = pointc.x;
-      if (win_y)
-       *win_y = pointc.y;
+      window = _gdk_parent_root;
+      *win_x = pointc.x + _gdk_offset_x;
+      *win_y = pointc.y + _gdk_offset_y;
       return window;
     }
       
@@ -1604,53 +2157,33 @@ gdk_window_at_pointer (gint *win_x,
     ScreenToClient (hwndc, &point);
   } while (hwndc != hwnd && (hwnd = hwndc, 1));
 
-  window = gdk_window_lookup (hwnd);
+  window = gdk_win32_handle_table_lookup ((GdkNativeWindow) hwnd);
 
   if (window && (win_x || win_y))
     {
       GetClientRect (hwnd, &rect);
-      if (win_x)
-       *win_x = point.x - rect.left;
-      if (win_y)
-       *win_y = point.y - rect.top;
+      *win_x = point.x - rect.left;
+      *win_y = point.y - rect.top;
     }
 
-  GDK_NOTE (MISC, g_print ("gdk_window_at_pointer: +%d+%d %#x%s\n",
-                          point.x, point.y, hwnd,
+  GDK_NOTE (MISC, g_print ("_gdk_windowing_window_at_pointer: +%d+%d %p%s\n",
+                          *win_x, *win_y,
+                          hwnd,
                           (window == NULL ? " NULL" : "")));
 
   return window;
 }
 
-GList*
-gdk_window_get_children (GdkWindow *window)
-{
-  GdkWindowPrivate *private;
-  GList *children;
-
-  g_return_val_if_fail (window != NULL, NULL);
-  g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
-
-  if (GDK_DRAWABLE_DESTROYED (window))
-    return NULL;
-
-  /* XXX ??? */
-  g_warning ("gdk_window_get_children not implemented");
-  children = NULL;
-
-  return children;
-}
-
 GdkEventMask  
 gdk_window_get_events (GdkWindow *window)
 {
   g_return_val_if_fail (window != NULL, 0);
   g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
 
-  if (GDK_DRAWABLE_DESTROYED (window))
+  if (GDK_WINDOW_DESTROYED (window))
     return 0;
 
-  return GDK_WINDOW_WIN32DATA (window)->event_mask;
+  return GDK_WINDOW_OBJECT (window)->event_mask;
 }
 
 void          
@@ -1660,16 +2193,14 @@ gdk_window_set_events (GdkWindow   *window,
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
 
-  if (GDK_DRAWABLE_DESTROYED (window))
+  if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  GDK_WINDOW_WIN32DATA (window)->event_mask = event_mask;
-}
-
-void
-gdk_window_add_colormap_windows (GdkWindow *window)
-{
-  g_warning ("gdk_window_add_colormap_windows not implemented");
+  /* 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
@@ -1682,42 +2213,36 @@ gdk_window_shape_combine_mask (GdkWindow *window,
 
   if (!mask)
     {
-      GDK_NOTE (MISC, g_print ("gdk_window_shape_combine_mask: %#x none\n",
-                              GDK_DRAWABLE_XID (window)));
-      SetWindowRgn (GDK_DRAWABLE_XID (window), NULL, TRUE);
+      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
     {
       HRGN hrgn;
-      DWORD dwStyle;
-      DWORD dwExStyle;
       RECT rect;
 
       /* Convert mask bitmap to region */
-      hrgn = BitmapToRegion (GDK_DRAWABLE_XID (mask));
+      hrgn = _gdk_win32_bitmap_to_hrgn (mask);
 
-      GDK_NOTE (MISC, g_print ("gdk_window_shape_combine_mask: %#x %#x\n",
-                              GDK_DRAWABLE_XID (window),
-                              GDK_DRAWABLE_XID (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_DRAWABLE_XID (window), GWL_STYLE);
-      dwExStyle = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_EXSTYLE);
-      GetClientRect (GDK_DRAWABLE_XID (window), &rect);
-      AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
-      OffsetRgn (hrgn, -rect.left, -rect.top);
+      _gdk_win32_get_adjusted_client_rect (window, &rect);
 
+      OffsetRgn (hrgn, -rect.left, -rect.top);
       OffsetRgn (hrgn, x, y);
 
       /* If this is a top-level window, add the title bar to the region */
-      if (GDK_DRAWABLE_TYPE (window) == GDK_WINDOW_TOPLEVEL)
+      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_DRAWABLE_XID (window), hrgn, TRUE);
+      SetWindowRgn (GDK_WINDOW_HWND (window), hrgn, TRUE);
     }
 }
 
@@ -1731,6 +2256,306 @@ gdk_window_set_override_redirect (GdkWindow *window,
   g_warning ("gdk_window_set_override_redirect not implemented");
 }
 
+void
+gdk_window_set_accept_focus (GdkWindow *window,
+                            gboolean accept_focus)
+{
+  GdkWindowObject *private;
+  g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  private = (GdkWindowObject *)window;  
+  
+  accept_focus = accept_focus != FALSE;
+
+  if (private->accept_focus != accept_focus)
+    private->accept_focus = accept_focus;
+}
+
+void
+gdk_window_set_focus_on_map (GdkWindow *window,
+                            gboolean focus_on_map)
+{
+  GdkWindowObject *private;
+  g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  private = (GdkWindowObject *)window;  
+  
+  focus_on_map = focus_on_map != FALSE;
+
+  if (private->focus_on_map != focus_on_map)
+    private->focus_on_map = focus_on_map;
+}
+
+static HICON
+pixbuf_to_hicon_alpha_winxp (GdkWindow *window,
+                            GdkPixbuf *pixbuf)
+{
+  /* Based on code from
+   * http://www.dotnet247.com/247reference/msgs/13/66301.aspx
+   */
+  HDC hdc;
+  BITMAPV5HEADER bi;
+  HBITMAP hBitmap, hMonoBitmap;
+  guchar *indata, *inrow;
+  guchar *outdata, *outrow;
+  HICON hAlphaIcon = NULL;
+  ICONINFO ii;
+  gint width, height, i, j, rowstride;
+
+  if (pixbuf == NULL)
+    return NULL;
+
+  width = gdk_pixbuf_get_width (pixbuf); /* width of icon */
+  height = gdk_pixbuf_get_height (pixbuf); /* height of icon */
+
+  ZeroMemory (&bi, sizeof (BITMAPV5HEADER));
+  bi.bV5Size = sizeof (BITMAPV5HEADER);
+  bi.bV5Width = width;
+  bi.bV5Height = height;
+  bi.bV5Planes = 1;
+  bi.bV5BitCount = 32;
+  bi.bV5Compression = BI_BITFIELDS;
+  /* The following mask specification specifies a supported 32 BPP
+   * alpha format for Windows XP (BGRA format).
+   */
+  bi.bV5RedMask   = 0x00FF0000;
+  bi.bV5GreenMask = 0x0000FF00;
+  bi.bV5BlueMask  = 0x000000FF;
+  bi.bV5AlphaMask = 0xFF000000;
+
+  /* Create the DIB section with an alpha channel. */
+  hdc = GetDC (NULL);
+  hBitmap = CreateDIBSection (hdc, (BITMAPINFO *)&bi, DIB_RGB_COLORS,
+                             (void **)&outdata, NULL, (DWORD)0);
+  ReleaseDC (NULL, hdc);
+
+  /* Draw something on the DIB section */
+  indata = gdk_pixbuf_get_pixels (pixbuf);
+  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+  for (j=0; j<height; j++)
+    {
+      outrow = outdata + 4*j*width;
+      inrow  = indata  + (height-j-1)*rowstride;
+      for (i=0; i<width; i++)
+       {
+         outrow[4*i+0] = inrow[4*i+2];
+         outrow[4*i+1] = inrow[4*i+1];
+         outrow[4*i+2] = inrow[4*i+0];
+         outrow[4*i+3] = inrow[4*i+3];
+       }
+    }
+
+  /* Create an empty mask bitmap */
+  hMonoBitmap = CreateBitmap (width, height, 1, 1, NULL);
+
+  ii.fIcon = TRUE;
+  ii.xHotspot = 0;
+  ii.yHotspot = 0;
+  ii.hbmMask = hMonoBitmap;
+  ii.hbmColor = hBitmap;
+
+  /* Create the alpha cursor with the alpha DIB section */
+  hAlphaIcon = CreateIconIndirect (&ii);
+
+  GDI_CALL (DeleteObject, (hBitmap));
+  GDI_CALL (DeleteObject, (hMonoBitmap));
+
+  return hAlphaIcon;
+}
+
+static HICON
+pixbuf_to_hicon_normal (GdkWindow *window,
+                       GdkPixbuf *pixbuf)
+{
+  GdkPixmap *pixmap;
+  GdkBitmap *mask;
+  HBITMAP hbmmask = NULL;
+  ICONINFO ii;
+  HICON hIcon;
+  gint w = 0, h = 0;
+
+  if (pixbuf == NULL)
+    return NULL;
+
+  /* create a normal icon with a bitmap mask */
+  w = gdk_pixbuf_get_width (pixbuf);
+  h = gdk_pixbuf_get_height (pixbuf);
+  gdk_pixbuf_render_pixmap_and_mask_for_colormap (pixbuf, 
+                                                 gdk_drawable_get_colormap (window),
+                                                 &pixmap,
+                                                 &mask,
+                                                 128);
+
+  /* we need the inverted mask for the XOR op */
+  {
+    HDC hdc1 = CreateCompatibleDC (NULL);
+    HBITMAP hbmold1;
+
+    hbmmask = CreateCompatibleBitmap (hdc1, w, h);
+    hbmold1 = SelectObject (hdc1, hbmmask);
+    if (mask)
+      {
+       HDC hdc2 = CreateCompatibleDC (NULL);
+       HBITMAP hbmold2 = SelectObject (hdc2, GDK_PIXMAP_HBITMAP (mask));
+       GDI_CALL (BitBlt, (hdc1, 0,0,w,h, hdc2, 0,0, NOTSRCCOPY));
+       GDI_CALL (SelectObject, (hdc2, hbmold2));
+       GDI_CALL (DeleteDC, (hdc2));
+      }
+    else
+      {
+       RECT rect;
+       GetClipBox (hdc1, &rect);
+       GDI_CALL (FillRect, (hdc1, &rect, GetStockObject (BLACK_BRUSH)));
+      }
+    GDI_CALL (SelectObject, (hdc1, hbmold1));
+    GDI_CALL (DeleteDC, (hdc1));
+  }
+
+  ii.fIcon = TRUE;
+  ii.xHotspot = ii.yHotspot = 0; /* ignored for icons */
+  ii.hbmMask = hbmmask;
+  ii.hbmColor = GDK_PIXMAP_HBITMAP (pixmap);
+  hIcon = CreateIconIndirect (&ii);
+  if (!hIcon)
+    WIN32_API_FAILED ("CreateIconIndirect");
+  GDI_CALL (DeleteObject, (hbmmask));
+
+#if 0 /* to debug pixmap and mask setting */
+  {
+    static int num = 0;
+    GdkPixbuf* pixbuf = NULL;
+    char name[256];
+
+    pixbuf = gdk_pixbuf_get_from_drawable (NULL, pixmap, NULL, 0, 0, 0, 0, w, h);
+    if (pixbuf)
+      {
+       num = (num + 1) % 999; /* restrict maximim number */
+       sprintf (name, "c:\\temp\\ico%03dpixm.png", num); 
+       gdk_pixbuf_save (pixbuf, name, "png", NULL, NULL);
+       gdk_pixbuf_unref (pixbuf);
+      }
+  }
+#endif
+
+  if (pixmap)
+    g_object_unref (G_OBJECT (pixmap));
+  if (mask)
+    g_object_unref (G_OBJECT (mask));
+
+  return hIcon;
+}
+
+static HICON
+pixbuf_to_hicon (GdkWindow *window,
+                GdkPixbuf *pixbuf)
+{
+  static gboolean is_win_xp=FALSE, is_win_xp_checked=FALSE;
+
+  if (!is_win_xp_checked)
+    {
+      OSVERSIONINFO version;
+
+      is_win_xp_checked = TRUE;
+      memset (&version, 0, sizeof (version));
+      version.dwOSVersionInfoSize = sizeof (version);
+      is_win_xp = GetVersionEx (&version)
+       && version.dwPlatformId == VER_PLATFORM_WIN32_NT
+       && (version.dwMajorVersion > 5
+           || (version.dwMajorVersion == 5 && version.dwMinorVersion >= 1));
+    }
+
+  if (pixbuf == NULL)
+    return NULL;
+
+  if (is_win_xp && gdk_pixbuf_get_has_alpha (pixbuf))
+    return pixbuf_to_hicon_alpha_winxp (window, pixbuf);
+  else
+    return pixbuf_to_hicon_normal (window, pixbuf);
+}
+
+void          
+gdk_window_set_icon_list (GdkWindow *window,
+                         GList     *pixbufs)
+{
+  GdkPixbuf *pixbuf, *big_pixbuf, *small_pixbuf;
+  gint big_diff, small_diff;
+  gint big_w, big_h, small_w, small_h;
+  gint w, h;
+  gint dw, dh, diff;
+  HICON small_hicon, big_hicon;
+  GdkWindowImplWin32 *impl;
+  gint i, big_i, small_i;
+
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
+
+  /* ideal sizes for small and large icons */
+  big_w = GetSystemMetrics (SM_CXICON);
+  big_h = GetSystemMetrics (SM_CYICON);
+  small_w = GetSystemMetrics (SM_CXSMICON);
+  small_h = GetSystemMetrics (SM_CYSMICON);
+
+  /* find closest sized icons in the list */
+  big_pixbuf = NULL;
+  small_pixbuf = NULL;
+  big_diff = 0;
+  small_diff = 0;
+  i = 0;
+  while (pixbufs)
+    {
+      pixbuf = (GdkPixbuf*) pixbufs->data;
+      w = gdk_pixbuf_get_width (pixbuf);
+      h = gdk_pixbuf_get_height (pixbuf);
+
+      dw = ABS (w - big_w);
+      dh = ABS (h - big_h);
+      diff = dw*dw + dh*dh;
+      if (big_pixbuf == NULL || diff < big_diff)
+       {
+         big_pixbuf = pixbuf;
+         big_diff = diff;
+         big_i = i;
+       }
+
+      dw = ABS(w - small_w);
+      dh = ABS(h - small_h);
+      diff = dw*dw + dh*dh;
+      if (small_pixbuf == NULL || diff < small_diff)
+       {
+         small_pixbuf = pixbuf;
+         small_diff = diff;
+         small_i = i;
+       }
+
+      pixbufs = g_list_next (pixbufs);
+      i++;
+    }
+
+  /* Create the icons */
+  big_hicon = pixbuf_to_hicon (window, big_pixbuf);
+  small_hicon = pixbuf_to_hicon (window, small_pixbuf);
+
+  /* Set the icons */
+  SendMessage (GDK_WINDOW_HWND (window), WM_SETICON, ICON_BIG,
+              (LPARAM)big_hicon);
+  SendMessage (GDK_WINDOW_HWND (window), WM_SETICON, ICON_SMALL,
+              (LPARAM)small_hicon);
+
+  /* Store the icons, destroying any previous icons */
+  if (impl->hicon_big)
+    GDI_CALL (DestroyIcon, (impl->hicon_big));
+  impl->hicon_big = big_hicon;
+  if (impl->hicon_small)
+    GDI_CALL (DestroyIcon, (impl->hicon_small));
+  impl->hicon_small = small_hicon;
+}
+
 void          
 gdk_window_set_icon (GdkWindow *window, 
                     GdkWindow *icon_window,
@@ -1740,13 +2565,7 @@ gdk_window_set_icon (GdkWindow *window,
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
 
-  if (GDK_DRAWABLE_DESTROYED (window))
-    return;
-  
-  /* Nothing to do, really. As we share window classes between windows
-   * we can't have window-specific icons, sorry. Don't print any warning
-   * either.
-   */
+  /* do nothing, use gdk_window_set_icon_list instead */
 }
 
 void
@@ -1756,11 +2575,24 @@ gdk_window_set_icon_name (GdkWindow   *window,
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
 
-  if (GDK_DRAWABLE_DESTROYED (window))
+  if (GDK_WINDOW_DESTROYED (window))
     return;
   
-  if (!SetWindowText (GDK_DRAWABLE_XID (window), name))
-    WIN32_API_FAILED ("SetWindowText");
+  API_CALL (SetWindowText, (GDK_WINDOW_HWND (window), name));
+}
+
+GdkWindow *
+gdk_window_get_group (GdkWindow *window)
+{
+  g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
+  g_return_val_if_fail (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD, NULL);
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return NULL;
+  
+  g_warning ("gdk_window_get_group not yet implemented");
+
+  return NULL;
 }
 
 void          
@@ -1772,7 +2604,7 @@ gdk_window_set_group (GdkWindow *window,
   g_return_if_fail (leader != NULL);
   g_return_if_fail (GDK_IS_WINDOW (leader));
 
-  if (GDK_DRAWABLE_DESTROYED (window) || GDK_DRAWABLE_DESTROYED (leader))
+  if (GDK_WINDOW_DESTROYED (window) || GDK_WINDOW_DESTROYED (leader))
     return;
   
   g_warning ("gdk_window_set_group not implemented");
@@ -1782,80 +2614,123 @@ void
 gdk_window_set_decorations (GdkWindow      *window,
                            GdkWMDecoration decorations)
 {
-  LONG style, exstyle;
+  LONG style, bits;
+  const LONG settable_bits = WS_BORDER|WS_THICKFRAME|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX|WS_MAXIMIZEBOX;
 
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   
-  style = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_STYLE);
-  exstyle = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_EXSTYLE);
+  GDK_NOTE (MISC, g_print ("gdk_window_set_decorations: %p: %s%s%s%s%s%s%s\n",
+                          GDK_WINDOW_HWND (window),
+                          (decorations & GDK_DECOR_ALL ? "ALL " : ""),
+                          (decorations & GDK_DECOR_BORDER ? "BORDER " : ""),
+                          (decorations & GDK_DECOR_RESIZEH ? "RESIZEH " : ""),
+                          (decorations & GDK_DECOR_TITLE ? "TITLE " : ""),
+                          (decorations & GDK_DECOR_MENU ? "MENU " : ""),
+                          (decorations & GDK_DECOR_MINIMIZE ? "MINIMIZE " : ""),
+                          (decorations & GDK_DECOR_MAXIMIZE ? "MAXIMIZE " : "")));
 
-  style &= (WS_OVERLAPPED|WS_POPUP|WS_CHILD|WS_MINIMIZE|WS_VISIBLE|WS_DISABLED
-           |WS_CLIPSIBLINGS|WS_CLIPCHILDREN|WS_MAXIMIZE);
+  style = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
 
-  exstyle &= (WS_EX_TOPMOST|WS_EX_TRANSPARENT);
+  bits = 0;
 
-  if (decorations & GDK_DECOR_ALL)
-    style |= (WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_MAXIMIZEBOX);
   if (decorations & GDK_DECOR_BORDER)
-    style |= (WS_BORDER);
+    bits |= WS_BORDER;
   if (decorations & GDK_DECOR_RESIZEH)
-    style |= (WS_THICKFRAME);
+    bits |= WS_THICKFRAME;
   if (decorations & GDK_DECOR_TITLE)
-    style |= (WS_CAPTION);
+    bits |= WS_CAPTION;
   if (decorations & GDK_DECOR_MENU)
-    style |= (WS_SYSMENU);
+    bits |= WS_SYSMENU;
   if (decorations & GDK_DECOR_MINIMIZE)
-    style |= (WS_MINIMIZEBOX);
+    bits |= WS_MINIMIZEBOX;
   if (decorations & GDK_DECOR_MAXIMIZE)
-    style |= (WS_MAXIMIZEBOX);
+    bits |= WS_MAXIMIZEBOX;
+
+  if (decorations & GDK_DECOR_ALL)
+    style |= settable_bits, style &= ~bits;
+  else
+    style &= ~settable_bits, style |= bits;
   
-  SetWindowLong (GDK_DRAWABLE_XID (window), GWL_STYLE, style);
+  SetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE, style);
+  SetWindowPos (GDK_WINDOW_HWND (window), NULL, 0, 0, 0, 0,
+               SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE |
+               SWP_NOREPOSITION | SWP_NOSIZE | SWP_NOZORDER);
+}
+
+gboolean
+gdk_window_get_decorations(GdkWindow       *window,
+                          GdkWMDecoration *decorations)
+{
+  LONG style = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
+
+  *decorations = 0;
+
+  if (style & WS_BORDER)
+    *decorations |= GDK_DECOR_BORDER;
+  if (style & WS_THICKFRAME)
+    *decorations |= GDK_DECOR_RESIZEH;
+  if (style & WS_CAPTION)
+    *decorations |= GDK_DECOR_TITLE;
+  if (style & WS_SYSMENU)
+    *decorations |= GDK_DECOR_MENU;
+  if (style & WS_MINIMIZEBOX)
+    *decorations |= GDK_DECOR_MINIMIZE;
+  if (style & WS_MAXIMIZEBOX)
+    *decorations |= GDK_DECOR_MAXIMIZE;
+
+  return *decorations != 0;
 }
 
 void
 gdk_window_set_functions (GdkWindow    *window,
                          GdkWMFunction functions)
 {
-  LONG style, exstyle;
+  LONG style, bits;
+  const LONG settable_bits = (WS_THICKFRAME|WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_SYSMENU);
 
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   
-  style = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_STYLE);
-  exstyle = GetWindowLong (GDK_DRAWABLE_XID (window), GWL_EXSTYLE);
+  GDK_NOTE (MISC, g_print ("gdk_window_set_functions: %p: %s%s%s%s%s%s\n",
+                          GDK_WINDOW_HWND (window),
+                          (functions & GDK_FUNC_ALL ? "ALL " : ""),
+                          (functions & GDK_FUNC_RESIZE ? "RESIZE " : ""),
+                          (functions & GDK_FUNC_MOVE ? "MOVE " : ""),
+                          (functions & GDK_FUNC_MINIMIZE ? "MINIMIZE " : ""),
+                          (functions & GDK_FUNC_MAXIMIZE ? "MAXIMIZE " : ""),
+                          (functions & GDK_FUNC_CLOSE ? "CLOSE " : "")));
 
-  style &= (WS_OVERLAPPED|WS_POPUP|WS_CHILD|WS_MINIMIZE|WS_VISIBLE|WS_DISABLED
-           |WS_CLIPSIBLINGS|WS_CLIPCHILDREN|WS_MAXIMIZE|WS_CAPTION|WS_BORDER
-           |WS_SYSMENU);
+  style = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
 
-  exstyle &= (WS_EX_TOPMOST|WS_EX_TRANSPARENT);
+  bits = 0;
 
-  if (functions & GDK_FUNC_ALL)
-    style |= (WS_THICKFRAME|WS_MINIMIZEBOX|WS_MAXIMIZEBOX);
   if (functions & GDK_FUNC_RESIZE)
-    style |= (WS_THICKFRAME);
+    bits |= WS_THICKFRAME;
   if (functions & GDK_FUNC_MOVE)
-    style |= (WS_THICKFRAME);
+    bits |= (WS_THICKFRAME|WS_SYSMENU);
   if (functions & GDK_FUNC_MINIMIZE)
-    style |= (WS_MINIMIZEBOX);
+    bits |= WS_MINIMIZEBOX;
   if (functions & GDK_FUNC_MAXIMIZE)
-    style |= (WS_MAXIMIZEBOX);
+    bits |= WS_MAXIMIZEBOX;
+  if (functions & GDK_FUNC_CLOSE)
+    bits |= WS_SYSMENU;
+  
+  if (functions & GDK_FUNC_ALL)
+    style |= settable_bits, style &= ~bits;
+  else
+    style &= ~settable_bits, style |= bits;
   
-  SetWindowLong (GDK_DRAWABLE_XID (window), GWL_STYLE, style);
+  SetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE, style);
+  SetWindowPos (GDK_WINDOW_HWND (window), NULL, 0, 0, 0, 0,
+               SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE |
+               SWP_NOREPOSITION | SWP_NOSIZE | SWP_NOZORDER);
 }
 
-/* 
- * propagate the shapes from all child windows of a GDK window to the parent 
- * window. Shamelessly ripped from Enlightenment's code
- * 
- * - Raster
- */
-
 static void
-QueryTree (HWND hwnd,
+QueryTree (HWND   hwnd,
           HWND **children,
-          gint *nchildren)
+          gint  *nchildren)
 {
   guint i, n;
   HWND child;
@@ -1890,7 +2765,6 @@ gdk_propagate_shapes (HANDLE   win,
 {
    RECT emptyRect;
    HRGN region, childRegion;
-   RECT rect;
    HWND *list = NULL;
    gint i, num;
 
@@ -1918,6 +2792,7 @@ gdk_propagate_shapes (HANDLE   win,
             }
          }
        SetWindowRgn (win, region, TRUE);
+       g_free (list);
      }
    else
      DeleteObject (region);
@@ -1929,10 +2804,10 @@ gdk_window_set_child_shapes (GdkWindow *window)
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
    
-  if (GDK_DRAWABLE_DESTROYED (window))
+  if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  gdk_propagate_shapes (GDK_DRAWABLE_XID (window), FALSE);
+  gdk_propagate_shapes (GDK_WINDOW_HWND (window), FALSE);
 }
 
 void
@@ -1941,122 +2816,463 @@ gdk_window_merge_child_shapes (GdkWindow *window)
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   
-  if (GDK_DRAWABLE_DESTROYED (window))
+  if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  gdk_propagate_shapes (GDK_DRAWABLE_XID (window), TRUE);
+  gdk_propagate_shapes (GDK_WINDOW_HWND (window), TRUE);
 }
 
-/* Support for windows that can be guffaw-scrolled
- * (See http://www.gtk.org/~otaylor/whitepapers/guffaw-scrolling.txt)
- */
+gboolean 
+gdk_window_set_static_gravities (GdkWindow *window,
+                                gboolean   use_static)
+{
+  GdkWindowObject *private = (GdkWindowObject *)window;
+  
+  g_return_val_if_fail (window != NULL, FALSE);
+  g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
 
-static gboolean
-gdk_window_gravity_works (void)
+  if (!use_static == !private->guffaw_gravity)
+    return TRUE;
+  
+  if (use_static)
+    return FALSE;
+  
+  private->guffaw_gravity = use_static;
+  
+  return TRUE;
+}
+
+void
+gdk_window_begin_resize_drag (GdkWindow     *window,
+                              GdkWindowEdge  edge,
+                              gint           button,
+                              gint           root_x,
+                              gint           root_y,
+                              guint32        timestamp)
 {
-  enum { UNKNOWN, NO, YES };
-  static gint gravity_works = UNKNOWN;
+  g_return_if_fail (GDK_IS_WINDOW (window));
   
-  if (gravity_works == UNKNOWN)
-    {
-      GdkWindowAttr attr;
-      GdkWindow *parent;
-      GdkWindow *child;
-      gint y;
-      
-      attr.window_type = GDK_WINDOW_TEMP;
-      attr.wclass = GDK_INPUT_OUTPUT;
-      attr.x = 0;
-      attr.y = 0;
-      attr.width = 100;
-      attr.height = 100;
-      attr.event_mask = 0;
-      
-      parent = gdk_window_new (NULL, &attr, GDK_WA_X | GDK_WA_Y);
-      
-      attr.window_type = GDK_WINDOW_CHILD;
-      child = gdk_window_new (parent, &attr, GDK_WA_X | GDK_WA_Y);
-      
-      gdk_window_set_static_win_gravity (child, TRUE);
-      
-      gdk_window_resize (parent, 100, 110);
-      gdk_window_move (parent, 0, -10);
-      gdk_window_move_resize (parent, 0, 0, 100, 100);
-      
-      gdk_window_resize (parent, 100, 110);
-      gdk_window_move (parent, 0, -10);
-      gdk_window_move_resize (parent, 0, 0, 100, 100);
-      
-      gdk_window_get_geometry (child, NULL, &y, NULL, NULL, NULL);
-      
-      gdk_window_destroy (parent);
-      gdk_window_destroy (child);
-      
-      gravity_works = ((y == -20) ? YES : NO);
-    }
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  /* XXX: isn't all this default on win32 ... */  
+}
+
+void
+gdk_window_begin_move_drag (GdkWindow *window,
+                            gint       button,
+                            gint       root_x,
+                            gint       root_y,
+                            guint32    timestamp)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
   
-  return (gravity_works == YES);
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  /* XXX: isn't all this default on win32 ... */  
 }
 
-static void
-gdk_window_set_static_bit_gravity (GdkWindow *window, gboolean on)
+
+/*
+ * Setting window states
+ */
+void
+gdk_window_iconify (GdkWindow *window)
 {
+  HWND old_active_window;
+
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  GDK_NOTE (MISC, g_print ("gdk_window_iconify: %p: %s\n",
+                          GDK_WINDOW_HWND (window),
+                          _gdk_win32_window_state_to_string (((GdkWindowObject *) window)->state)));
 
-  GDK_NOTE (MISC, g_print ("gdk_window_set_static_bit_gravity: Not implemented\n"));
+  if (GDK_WINDOW_IS_MAPPED (window))
+    {
+      old_active_window = GetActiveWindow ();
+      ShowWindow (GDK_WINDOW_HWND (window), SW_MINIMIZE);
+      if (old_active_window != GDK_WINDOW_HWND (window))
+       SetActiveWindow (old_active_window);
+    }
+  else
+    {
+      gdk_synthesize_window_state (window,
+                                   0,
+                                   GDK_WINDOW_STATE_ICONIFIED);
+    }
 }
 
-static void
-gdk_window_set_static_win_gravity (GdkWindow *window, gboolean on)
+void
+gdk_window_deiconify (GdkWindow *window)
 {
   g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
 
-  GDK_NOTE (MISC,
-           g_print ("gdk_window_set_static_win_gravity: Not implemented\n"));
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  GDK_NOTE (MISC, g_print ("gdk_window_deiconify: %p: %s\n",
+                          GDK_WINDOW_HWND (window),
+                          _gdk_win32_window_state_to_string (((GdkWindowObject *) window)->state)));
+
+  if (GDK_WINDOW_IS_MAPPED (window))
+    {  
+      show_window_internal (window, FALSE, TRUE);
+    }
+  else
+    {
+      gdk_synthesize_window_state (window,
+                                   GDK_WINDOW_STATE_ICONIFIED,
+                                   0);
+    }
+}
+
+void
+gdk_window_stick (GdkWindow *window)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  /* FIXME: Do something? */
 }
 
-/*************************************************************
- * gdk_window_set_static_gravities:
- *     Set the bit gravity of the given window to static,
- *     and flag it so all children get static subwindow
- *     gravity.
- *   arguments:
- *     window: window for which to set static gravity
- *     use_static: Whether to turn static gravity on or off.
- *   results:
- *     Does the XServer support static gravity?
- *************************************************************/
+void
+gdk_window_unstick (GdkWindow *window)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
 
-gboolean 
-gdk_window_set_static_gravities (GdkWindow *window,
-                                gboolean   use_static)
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  /* FIXME: Do something? */
+}
+
+void
+gdk_window_maximize (GdkWindow *window)
 {
-  GdkWindowPrivate *private = (GdkWindowPrivate *)window;
-  GList *tmp_list;
-  
-  g_return_val_if_fail (window != NULL, FALSE);
-  g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
+  g_return_if_fail (GDK_IS_WINDOW (window));
 
-  if (!use_static == !private->guffaw_gravity)
-    return TRUE;
-  
-  if (use_static && !gdk_window_gravity_works ())
-    return FALSE;
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  GDK_NOTE (MISC, g_print ("gdk_window_maximize: %p: %s\n",
+                          GDK_WINDOW_HWND (window),
+                          _gdk_win32_window_state_to_string (((GdkWindowObject *) window)->state)));
+
+  if (GDK_WINDOW_IS_MAPPED (window))
+    ShowWindow (GDK_WINDOW_HWND (window), SW_MAXIMIZE);
+  else
+    gdk_synthesize_window_state (window,
+                                0,
+                                GDK_WINDOW_STATE_MAXIMIZED);
+}
+
+void
+gdk_window_unmaximize (GdkWindow *window)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  GDK_NOTE (MISC, g_print ("gdk_window_unmaximize: %p: %s\n",
+                          GDK_WINDOW_HWND (window),
+                          _gdk_win32_window_state_to_string (((GdkWindowObject *) window)->state)));
+
+  if (GDK_WINDOW_IS_MAPPED (window))
+    ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE);
+  else
+    gdk_synthesize_window_state (window,
+                                GDK_WINDOW_STATE_MAXIMIZED,
+                                0);
+}
+
+typedef struct _FullscreenInfo FullscreenInfo;
+
+struct _FullscreenInfo
+{
+  RECT  r;
+  guint hint_flags;
+  LONG  style;
+};
+
+void
+gdk_window_fullscreen (GdkWindow *window)
+{
+  gint width, height;
+  FullscreenInfo *fi;
+  GdkWindowObject *private = (GdkWindowObject *) window;
+
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  fi = g_new (FullscreenInfo, 1);
+
+  if (!GetWindowRect (GDK_WINDOW_HWND (window), &(fi->r)))
+    g_free (fi);
+  else
+    {
+      GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (private->impl);
+
+      width = GetSystemMetrics (SM_CXSCREEN);
+      height = GetSystemMetrics (SM_CYSCREEN);
+      /* remember for restoring */
+      fi->hint_flags = impl->hint_flags;
+      impl->hint_flags &= ~GDK_HINT_MAX_SIZE;
+      g_object_set_data (G_OBJECT (window), "fullscreen-info", fi);
+      fi->style = GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE);
+
+      SetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE, 
+                     (fi->style & ~WS_OVERLAPPEDWINDOW) | WS_POPUP);
+      if (!SetWindowPos (GDK_WINDOW_HWND (window), HWND_TOP /*not MOST, taskswitch!*/,
+                         0, 0, width, height,
+                         SWP_NOCOPYBITS | SWP_SHOWWINDOW))
+        WIN32_API_FAILED ("SetWindowPos");
+
+      gdk_synthesize_window_state (window, 0, GDK_WINDOW_STATE_FULLSCREEN);
+    }
+}
+
+void
+gdk_window_unfullscreen (GdkWindow *window)
+{
+  FullscreenInfo *fi;
+  GdkWindowObject *private = (GdkWindowObject *) window;
+
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  fi = g_object_get_data (G_OBJECT(window), "fullscreen-info");
+  if (fi)
+    {
+      GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (private->impl);
+
+      impl->hint_flags = fi->hint_flags;
+      SetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE, fi->style);
+      if (!SetWindowPos (GDK_WINDOW_HWND (window), HWND_NOTOPMOST,
+                         fi->r.left, fi->r.top, fi->r.right - fi->r.left, fi->r.bottom - fi->r.top,
+                         SWP_NOCOPYBITS | SWP_SHOWWINDOW))
+         WIN32_API_FAILED ("SetWindowPos");
+
+      g_object_set_data (G_OBJECT (window), "fullscreen-info", NULL);
+      g_free (fi);
+
+      gdk_synthesize_window_state (window, GDK_WINDOW_STATE_FULLSCREEN, 0);
+    }
+}
+
+void
+gdk_window_set_keep_above (GdkWindow *window, gboolean setting)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  if (GDK_WINDOW_IS_MAPPED (window))
+    {
+      if (!SetWindowPos(GDK_WINDOW_HWND (window), setting ? HWND_TOPMOST : HWND_NOTOPMOST,
+                        0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE))
+         WIN32_API_FAILED ("SetWindowPos");
+    }
+  else
+    gdk_synthesize_window_state (window,
+                                setting ? GDK_WINDOW_STATE_BELOW : GDK_WINDOW_STATE_ABOVE,
+                                setting ? GDK_WINDOW_STATE_ABOVE : 0);
+}
+
+void
+gdk_window_set_keep_below (GdkWindow *window, gboolean setting)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  if (GDK_WINDOW_IS_MAPPED (window))
+    {
+      if (!SetWindowPos(GDK_WINDOW_HWND (window), setting ? HWND_BOTTOM : HWND_NOTOPMOST,
+                        0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE))
+         WIN32_API_FAILED ("SetWindowPos");
+    }
+  else
+    gdk_synthesize_window_state (window,
+                                setting ? GDK_WINDOW_STATE_ABOVE : GDK_WINDOW_STATE_BELOW,
+                                setting ? GDK_WINDOW_STATE_BELOW : 0);
+}
+
+void
+gdk_window_focus (GdkWindow *window,
+                  guint32    timestamp)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
   
-  private->guffaw_gravity = use_static;
+  GDK_NOTE (MISC, g_print ("gdk_window_focus: %p: %s\n",
+                          GDK_WINDOW_HWND (window),
+                          _gdk_win32_window_state_to_string (((GdkWindowObject *) window)->state)));
+
+  if (((GdkWindowObject *) window)->state & GDK_WINDOW_STATE_MAXIMIZED)
+    ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWMAXIMIZED);
+  else
+    ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWNORMAL);
+  SetFocus (GDK_WINDOW_HWND (window));
+}
+
+void
+gdk_window_set_modal_hint (GdkWindow *window,
+                          gboolean   modal)
+{
+  GdkWindowObject *private;
+
+  g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
   
-  if (!GDK_DRAWABLE_DESTROYED (window))
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  private = (GdkWindowObject*) window;
+
+  private->modal_hint = modal;
+
+  if (GDK_WINDOW_IS_MAPPED (window))
+    API_CALL (SetWindowPos, (GDK_WINDOW_HWND (window), 
+                            modal ? HWND_TOPMOST : HWND_NOTOPMOST,
+                            0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE));
+}
+
+void
+gdk_window_set_skip_taskbar_hint (GdkWindow *window,
+                                 gboolean   skips_taskbar)
+{
+  static GdkWindow *owner = NULL;
+  GdkWindowAttr wa;
+
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  GDK_NOTE (MISC, g_print ("gdk_window_set_skip_taskbar_hint: %p: %s\n",
+                          GDK_WINDOW_HWND (window),
+                          skips_taskbar ? "TRUE" : "FALSE"));
+
+  if (skips_taskbar)
     {
-      gdk_window_set_static_bit_gravity (window, use_static);
-      
-      tmp_list = private->children;
-      while (tmp_list)
+      if (owner == NULL)
        {
-         gdk_window_set_static_win_gravity (window, use_static);
-         
-         tmp_list = tmp_list->next;
+         wa.window_type = GDK_WINDOW_TEMP;
+         wa.wclass = GDK_INPUT_OUTPUT;
+         wa.width = wa.height = 1;
+         wa.event_mask = 0;
+         owner = gdk_window_new_internal (NULL, &wa, 0, TRUE);
        }
+
+      SetWindowLong (GDK_WINDOW_HWND (window), GWL_HWNDPARENT,
+                    (long) GDK_WINDOW_HWND (owner));
+
+#if 0 /* Should we also turn off the minimize and maximize buttons? */
+      SetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE,
+                    GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE) & ~(WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_SYSMENU));
+      SetWindowPos (GDK_WINDOW_HWND (window), NULL, 0, 0, 0, 0,
+                   SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE |
+                   SWP_NOREPOSITION | SWP_NOSIZE | SWP_NOZORDER);
+#endif
+    }
+  else
+    {
+      SetWindowLong (GDK_WINDOW_HWND (window), GWL_HWNDPARENT, 0);
     }
+}
+
+void
+gdk_window_set_skip_pager_hint (GdkWindow *window,
+                               gboolean   skips_pager)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+}
+
+void
+gdk_window_set_type_hint (GdkWindow        *window,
+                         GdkWindowTypeHint hint)
+{
+  g_return_if_fail (window != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
   
-  return TRUE;
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  GDK_NOTE (MISC, g_print ("gdk_window_set_type_hint: %p: %d\n",
+                          GDK_WINDOW_HWND (window), hint));
+  switch (hint)
+    {
+    case GDK_WINDOW_TYPE_HINT_DIALOG:
+      break;
+    case GDK_WINDOW_TYPE_HINT_MENU:
+      gdk_window_set_decorations (window,
+                                 GDK_DECOR_ALL |
+                                 GDK_DECOR_RESIZEH |
+                                 GDK_DECOR_MINIMIZE |
+                                 GDK_DECOR_MAXIMIZE);
+      break;
+    case GDK_WINDOW_TYPE_HINT_TOOLBAR:
+      gdk_window_set_skip_taskbar_hint (window, TRUE);
+      break;
+    case GDK_WINDOW_TYPE_HINT_UTILITY:
+      break;
+    case GDK_WINDOW_TYPE_HINT_SPLASHSCREEN:
+      gdk_window_set_decorations (window,
+                                 GDK_DECOR_ALL |
+                                 GDK_DECOR_RESIZEH |
+                                 GDK_DECOR_MENU |
+                                 GDK_DECOR_MINIMIZE |
+                                 GDK_DECOR_MAXIMIZE);
+      break;
+    case GDK_WINDOW_TYPE_HINT_DOCK:
+      break;
+    case GDK_WINDOW_TYPE_HINT_DESKTOP:
+      break;
+    default:
+      g_warning ("Unknown hint %d passed to gdk_window_set_type_hint", hint);
+      /* Fall thru */
+    case GDK_WINDOW_TYPE_HINT_NORMAL:
+      break;
+    }
+}
+
+void
+gdk_window_shape_combine_region (GdkWindow *window,
+                                 GdkRegion *shape_region,
+                                 gint       offset_x,
+                                 gint       offset_y)
+{
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  /* XXX: even on X implemented conditional ... */  
+}
+
+GdkWindow *
+gdk_window_lookup_for_display (GdkDisplay *display, GdkNativeWindow anid)
+{
+  g_return_val_if_fail (display == gdk_display_get_default(), NULL);
+
+  return gdk_window_lookup (anid);
+}
+
+void
+gdk_window_enable_synchronized_configure (GdkWindow *window)
+{
+}
+
+void
+gdk_window_configure_finished (GdkWindow *window)
+{
 }