]> Pileus Git - ~andy/gtk/blobdiff - gdk/win32/gdkgc-win32.c
Update.
[~andy/gtk] / gdk / win32 / gdkgc-win32.c
index e0fca11dbb31f3d4de084ca3e177974ff8c05c2e..f441106cae096a744468a839628d04dbc7e70070 100644 (file)
@@ -2,23 +2,23 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * 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 "gdkgc.h"
 #include "gdkfont.h"
 #include "gdkpixmap.h"
-#include "gdkprivate.h"
-#include "gdkx.h"
-
-GdkGC*
-gdk_gc_new (GdkWindow *window)
-{
-  return gdk_gc_new_with_values (window, NULL, 0);
-}
-
-GdkGC*
-gdk_gc_new_with_values (GdkWindow      *window,
-                       GdkGCValues     *values,
-                       GdkGCValuesMask  values_mask)
+#include "gdkregion-generic.h"
+#include "gdkinternals.h"
+#include "gdkprivate-win32.h"
+
+static void gdk_win32_gc_destroy    (GdkGC           *gc);
+static void gdk_win32_gc_get_values (GdkGC           *gc,
+                                    GdkGCValues     *values);
+static void gdk_win32_gc_set_values (GdkGC           *gc,
+                                    GdkGCValues     *values,
+                                    GdkGCValuesMask  values_mask);
+static void gdk_win32_gc_set_dashes (GdkGC           *gc,
+                                    gint             dash_offset,
+                                    gint8            dash_list[],
+                                    gint             n);
+
+static void gdk_gc_win32_class_init (GdkGCWin32Class *klass);
+static void gdk_gc_win32_finalize   (GObject         *object);
+
+static gpointer parent_class = NULL;
+
+GType
+gdk_gc_win32_get_type (void)
 {
-  GdkGC *gc;
-  GdkGCPrivate *private;
-  static GdkColor black;
-  static GdkColor white;
-  static gboolean beenhere = FALSE;
+  static GType object_type = 0;
 
-  if (!beenhere)
+  if (!object_type)
     {
-      gdk_color_black (gdk_colormap_get_system (), &black);
-      gdk_color_white (gdk_colormap_get_system (), &white);
-      beenhere = TRUE;
+      static const GTypeInfo object_info =
+      {
+        sizeof (GdkGCWin32Class),
+        (GBaseInitFunc) NULL,
+        (GBaseFinalizeFunc) NULL,
+        (GClassInitFunc) gdk_gc_win32_class_init,
+        NULL,           /* class_finalize */
+        NULL,           /* class_data */
+        sizeof (GdkGCWin32),
+        0,              /* n_preallocs */
+        (GInstanceInitFunc) NULL,
+      };
+      
+      object_type = g_type_register_static (GDK_TYPE_GC,
+                                            "GdkGCWin32",
+                                            &object_info);
     }
+  
+  return object_type;
+}
 
-  g_return_val_if_fail (window != NULL, NULL);
+static void
+gdk_gc_win32_class_init (GdkGCWin32Class *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GdkGCClass *gc_class = GDK_GC_CLASS (klass);
+  
+  parent_class = g_type_class_peek_parent (klass);
 
-  if (GDK_DRAWABLE_DESTROYED (window))
-    return NULL;
+  object_class->finalize = gdk_gc_win32_finalize;
+
+  gc_class->get_values = gdk_win32_gc_get_values;
+  gc_class->set_values = gdk_win32_gc_set_values;
+  gc_class->set_dashes = gdk_win32_gc_set_dashes;
+}
 
-  private = g_new (GdkGCPrivate, 1);
-  gc = (GdkGC*) private;
+static void
+gdk_gc_win32_finalize (GObject *object)
+{
+  GdkGCWin32 *win32_gc = GDK_GC_WIN32 (object);
+  
+  if (win32_gc->clip_region)
+    gdk_region_destroy (win32_gc->clip_region);
+  
+  if (win32_gc->values_mask & GDK_GC_FONT)
+    gdk_font_unref (win32_gc->font);
+  
+  if (win32_gc->values_mask & GDK_GC_TILE)
+    gdk_drawable_unref (win32_gc->tile);
+  
+  if (win32_gc->values_mask & GDK_GC_STIPPLE)
+    gdk_drawable_unref (win32_gc->stipple);
+  
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
 
-  private->ref_count = 1;
-  private->rop2 = R2_COPYPEN;
-  private->fill_style = GDK_SOLID;
-  private->values_mask = values_mask;
-  private->values_mask |= GDK_GC_FUNCTION | GDK_GC_FILL;
+static void
+gdk_win32_gc_values_to_win32values (GdkGCValues    *values,
+                                   GdkGCValuesMask mask,
+                                   GdkGCWin32     *win32_gc)
+{                                  
+  char *s = "";
+  gint sw, sh;
 
-  GDK_NOTE (MISC, g_print ("gdk_gc_new: {"));
+  GDK_NOTE (MISC, g_print ("{"));
 
-  if (values_mask & GDK_GC_FOREGROUND)
+  if (mask & GDK_GC_FOREGROUND)
     {
-      private->foreground = values->foreground;
+      win32_gc->foreground = values->foreground.pixel;
+      win32_gc->values_mask |= GDK_GC_FOREGROUND;
+      GDK_NOTE (MISC, (g_print ("fg=%.06x", win32_gc->foreground),
+                      s = ","));
     }
-  else
-    private->foreground = black;
   
-  if (values_mask & GDK_GC_BACKGROUND)
+  if (mask & GDK_GC_BACKGROUND)
     {
-      private->background = values->background;
+      win32_gc->background = values->background.pixel;
+      win32_gc->values_mask |= GDK_GC_BACKGROUND;
+      GDK_NOTE (MISC, (g_print ("%sbg=%.06x", s, win32_gc->background),
+                      s = ","));
     }
-  else
-    private->background = white;
 
-  if ((values_mask & GDK_GC_FONT) && (values->font->type == GDK_FONT_FONT
-                                     || values->font->type == GDK_FONT_FONTSET))
+  if ((mask & GDK_GC_FONT) && (values->font->type == GDK_FONT_FONT
+                              || values->font->type == GDK_FONT_FONTSET))
     {
-      private->font = values->font;
-      gdk_font_ref (private->font);
-      GDK_NOTE (MISC, g_print (" font"));
+      if (win32_gc->font != NULL)
+       gdk_font_unref (win32_gc->font);
+      win32_gc->font = values->font;
+      if (win32_gc->font != NULL)
+       {
+         gchar *xlfd;
+
+         gdk_font_ref (win32_gc->font);
+         win32_gc->values_mask |= GDK_GC_FONT;
+         GDK_NOTE (MISC, (xlfd = gdk_font_full_name_get (win32_gc->font),
+                          g_print ("%sfont=%s", s, xlfd),
+                          s = ",",
+                          gdk_font_full_name_free (xlfd)));
+       }
+      else
+       {
+         win32_gc->values_mask &= ~GDK_GC_FONT;
+         GDK_NOTE (MISC, (g_print ("%sfont=NULL"),
+                          s = ","));
+       }
     }
-  else
-    private->font = NULL;
 
-  if (values_mask & GDK_GC_FUNCTION)
+  if (mask & GDK_GC_FUNCTION)
     {
+      GDK_NOTE (MISC, (g_print ("%srop2=", s),
+                      s = ","));
       switch (values->function)
        {
        case GDK_COPY:
-         private->rop2 = R2_COPYPEN; break;
+         win32_gc->rop2 = R2_COPYPEN;
+         GDK_NOTE (MISC, g_print ("COPYPEN"));
+         break;
        case GDK_INVERT:
-         private->rop2 = R2_NOT; break;
+         win32_gc->rop2 = R2_NOT;
+         GDK_NOTE (MISC, g_print ("NOT"));
+         break;
        case GDK_XOR:
-         private->rop2 = R2_XORPEN; break;
+         win32_gc->rop2 = R2_XORPEN;
+         GDK_NOTE (MISC, g_print ("XORPEN"));
+         break;
        case GDK_CLEAR:
-         private->rop2 = R2_BLACK; break;
+         win32_gc->rop2 = R2_BLACK;
+         GDK_NOTE (MISC, g_print ("BLACK"));
+         break;
        case GDK_AND:
-         private->rop2 = R2_MASKPEN; break;
+         win32_gc->rop2 = R2_MASKPEN;
+         GDK_NOTE (MISC, g_print ("MASKPEN"));
+         break;
        case GDK_AND_REVERSE:
-         private->rop2 = R2_MASKPENNOT; break;
+         win32_gc->rop2 = R2_MASKPENNOT;
+         GDK_NOTE (MISC, g_print ("MASKPENNOT"));
+         break;
        case GDK_AND_INVERT:
-         private->rop2 = R2_MASKNOTPEN; break;
+         win32_gc->rop2 = R2_MASKNOTPEN;
+         GDK_NOTE (MISC, g_print ("MASKNOTPEN"));
+         break;
        case GDK_NOOP:
-         private->rop2 = R2_NOP; break;
+         win32_gc->rop2 = R2_NOP;
+         GDK_NOTE (MISC, g_print ("NOP"));
+         break;
        case GDK_OR:
-         private->rop2 = R2_MERGEPEN; break;
+         win32_gc->rop2 = R2_MERGEPEN;
+         GDK_NOTE (MISC, g_print ("MERGEPEN"));
+         break;
        case GDK_EQUIV:
-         private->rop2 = R2_NOTXORPEN; break;
+         win32_gc->rop2 = R2_NOTXORPEN;
+         GDK_NOTE (MISC, g_print ("NOTXORPEN"));
+         break;
        case GDK_OR_REVERSE:
-         private->rop2 = R2_MERGEPENNOT; break;
+         win32_gc->rop2 = R2_MERGEPENNOT;
+         GDK_NOTE (MISC, g_print ("MERGEPENNOT"));
+         break;
        case GDK_COPY_INVERT:
-         private->rop2 = R2_NOTCOPYPEN; break;
+         win32_gc->rop2 = R2_NOTCOPYPEN;
+         GDK_NOTE (MISC, g_print ("NOTCOPYPEN"));
+         break;
        case GDK_OR_INVERT:
-         private->rop2 = R2_MERGENOTPEN; break;
+         win32_gc->rop2 = R2_MERGENOTPEN;
+         GDK_NOTE (MISC, g_print ("MERGENOTPEN"));
+         break;
        case GDK_NAND:
-         private->rop2 = R2_NOTMASKPEN; break;
+         win32_gc->rop2 = R2_NOTMASKPEN;
+         GDK_NOTE (MISC, g_print ("NOTMASKPEN"));
+         break;
+       case GDK_NOR:
+         win32_gc->rop2 = R2_NOTMERGEPEN;
+         GDK_NOTE (MISC, g_print ("NOTMERGEPEN"));
+         break;
        case GDK_SET:
-         private->rop2 = R2_WHITE; break;
+         win32_gc->rop2 = R2_WHITE;
+         GDK_NOTE (MISC, g_print ("WHITE"));
+         break;
        }
-      GDK_NOTE (MISC, g_print (" function=%d", private->rop2));
+      win32_gc->values_mask |= GDK_GC_FUNCTION;
     }
 
-  if (values_mask & GDK_GC_FILL)
+  if (mask & GDK_GC_FILL)
     {
-      private->fill_style = values->fill;
-      GDK_NOTE (MISC, g_print (" fill=%d", private->fill_style));
+      win32_gc->fill_style = values->fill;
+      win32_gc->values_mask |= GDK_GC_FILL;
+      GDK_NOTE (MISC, (g_print ("%sfill=%d", s, win32_gc->fill_style),
+                      s = ","));
     }
 
-  if (values_mask & GDK_GC_TILE)
+  if (mask & GDK_GC_TILE)
     {
-      private->tile = values->tile;
-      gdk_pixmap_ref (private->tile);
-      GDK_NOTE (MISC, g_print (" tile=%#x", GDK_DRAWABLE_XID (private->tile)));
+      if (win32_gc->tile != NULL)
+       gdk_drawable_unref (win32_gc->tile);
+      win32_gc->tile = values->tile;
+      if (win32_gc->tile != NULL)
+       {
+         gdk_drawable_ref (win32_gc->tile);
+         win32_gc->values_mask |= GDK_GC_TILE;
+         GDK_NOTE (MISC, (g_print ("%stile=%#x", s,
+                                   GDK_PIXMAP_HBITMAP (win32_gc->tile)),
+                          s = ","));
+       }
+      else
+       {
+         win32_gc->values_mask &= ~GDK_GC_TILE;
+         GDK_NOTE (MISC, (g_print ("%stile=NULL", s),
+                          s = ","));
+       }
     }
-  else
-    private->tile = NULL;
 
-  if (values_mask & GDK_GC_STIPPLE)
+  if (mask & GDK_GC_STIPPLE)
     {
-      private->stipple = values->stipple;
-      gdk_pixmap_ref (private->stipple);
-      GDK_NOTE (MISC, g_print (" stipple=%#x", GDK_DRAWABLE_XID (private->stipple)));
+      if (win32_gc->stipple != NULL)
+       gdk_drawable_unref (win32_gc->stipple);
+      win32_gc->stipple = values->stipple;
+      if (win32_gc->stipple != NULL)
+       {
+         gdk_drawable_get_size (win32_gc->stipple, &sw, &sh);
+
+         if (sw != 8 || sh != 8)
+           {
+             /* It seems that it *must* be 8x8, at least on my machine. 
+              * Thus, tile an 8x8 bitmap with the stipple in case it is
+              * smaller, or simply use just the top left 8x8 in case it is
+              * larger.
+              */
+             gchar dummy[8];
+             GdkPixmap *bm = gdk_bitmap_create_from_data (NULL, dummy, 8, 8);
+             GdkGC *gc = gdk_gc_new (bm);
+             gint i, j;
+
+             i = 0;
+             while (i < 8)
+               {
+                 j = 0;
+                 while (j < 8)
+                   {
+                     gdk_draw_drawable (bm, gc, win32_gc->stipple, 0, 0, i, j, sw, sh);
+                     j += sh;
+                   }
+                 i += sw;
+               }
+             win32_gc->stipple = bm;
+             gdk_gc_unref (gc);
+           }
+         else
+           gdk_drawable_ref (win32_gc->stipple);
+         win32_gc->values_mask |= GDK_GC_STIPPLE;
+         GDK_NOTE (MISC, (g_print ("%sstipple=%#x", s,
+                                   GDK_PIXMAP_HBITMAP (win32_gc->stipple)),
+                          s = ","));
+       }
+      else
+       {
+         win32_gc->values_mask &= ~GDK_GC_STIPPLE;
+         GDK_NOTE (MISC, (g_print ("%sstipple=NULL", s),
+                          s = ","));
+       }
     }
-  else
-    private->stipple = NULL;
 
-  if (values_mask & GDK_GC_CLIP_MASK)
+  if (mask & GDK_GC_CLIP_MASK)
     {
-      private->clip_region =
-       BitmapToRegion ((HBITMAP) GDK_DRAWABLE_XID (values->clip_mask));
-      GDK_NOTE (MISC, g_print (" clip=%#x", private->clip_region));
+      if (win32_gc->clip_region != NULL)
+       {
+         gdk_region_destroy (win32_gc->clip_region);
+         win32_gc->clip_region = NULL;
+       }
+      if (win32_gc->hcliprgn != NULL)
+       DeleteObject (win32_gc->hcliprgn);
+
+      if (values->clip_mask != NULL)
+       {
+         win32_gc->hcliprgn =
+           BitmapToRegion ((HBITMAP) GDK_PIXMAP_HBITMAP (values->clip_mask));
+         win32_gc->values_mask |= GDK_GC_CLIP_MASK;
+         OffsetRgn (win32_gc->hcliprgn,
+                    win32_gc->parent_instance.clip_x_origin,
+                    win32_gc->parent_instance.clip_y_origin);
+       }
+      else
+       {
+         win32_gc->hcliprgn = NULL;
+         win32_gc->values_mask &= ~GDK_GC_CLIP_MASK;
+       }
+      GDK_NOTE (MISC, (g_print ("%sclip=%#x", s, win32_gc->hcliprgn),
+                      s = ","));
     }
-  else
-    private->clip_region = NULL;
 
-  if (values_mask & GDK_GC_SUBWINDOW)
+  if (mask & GDK_GC_SUBWINDOW)
     {
-      private->subwindow_mode = values->subwindow_mode;
-      GDK_NOTE (MISC, g_print (" subw=%d", private->subwindow_mode));
+      win32_gc->subwindow_mode = values->subwindow_mode;
+      win32_gc->values_mask |= GDK_GC_SUBWINDOW;
+      GDK_NOTE (MISC, (g_print ("%ssubw=%d", s, win32_gc->subwindow_mode),
+                      s = ","));
     }
 
-  if (values_mask & GDK_GC_TS_X_ORIGIN)
+  if (mask & GDK_GC_TS_X_ORIGIN)
     {
-      private->ts_x_origin = values->ts_x_origin;
-      GDK_NOTE (MISC, g_print (" ts_x=%d", private->ts_x_origin));
+      win32_gc->values_mask |= GDK_GC_TS_X_ORIGIN;
+      GDK_NOTE (MISC, (g_print ("%sts_x=%d", s, values->ts_x_origin),
+                      s = ","));
     }
 
-  if (values_mask & GDK_GC_TS_Y_ORIGIN)
+  if (mask & GDK_GC_TS_Y_ORIGIN)
     {
-      private->ts_y_origin = values->ts_y_origin;
-      GDK_NOTE (MISC, g_print (" ts_y=%d", private->ts_y_origin));
+      win32_gc->values_mask |= GDK_GC_TS_Y_ORIGIN;
+      GDK_NOTE (MISC, (g_print ("%sts_y=%d", s, values->ts_y_origin),
+                      s = ","));
     }
 
-  if (values_mask & GDK_GC_CLIP_X_ORIGIN)
+  if (mask & GDK_GC_CLIP_X_ORIGIN)
     {
-      private->clip_x_origin = values->clip_x_origin;
-      GDK_NOTE (MISC, g_print (" clip_x=%d", private->clip_x_origin));
+      win32_gc->values_mask |= GDK_GC_CLIP_X_ORIGIN;
+      GDK_NOTE (MISC, (g_print ("%sclip_x=%d", s, values->clip_x_origin),
+                      s = ","));
     }
 
-  if (values_mask & GDK_GC_CLIP_Y_ORIGIN)
+  if (mask & GDK_GC_CLIP_Y_ORIGIN)
     {
-      private->clip_y_origin = values->clip_y_origin; 
-      GDK_NOTE (MISC, g_print (" clip_y=%d", private->clip_y_origin));
+      win32_gc->values_mask |= GDK_GC_CLIP_Y_ORIGIN;
+      GDK_NOTE (MISC, (g_print ("%sclip_y=%d", s, values->clip_y_origin),
+                      s = ","));
    }
  
-  if (values_mask & GDK_GC_EXPOSURES)
+  if (mask & GDK_GC_EXPOSURES)
     {
-      private->graphics_exposures = values->graphics_exposures;
-      GDK_NOTE (MISC, g_print (" exp=%d", private->graphics_exposures));
+      win32_gc->graphics_exposures = values->graphics_exposures;
+      win32_gc->values_mask |= GDK_GC_EXPOSURES;
+      GDK_NOTE (MISC, (g_print ("%sexp=%d", s, win32_gc->graphics_exposures),
+                      s = ","));
     }
 
-  private->pen_style = PS_GEOMETRIC;
-  private->pen_width = 1;
+  if (mask & GDK_GC_LINE_WIDTH)
+    {
+      win32_gc->pen_width = values->line_width;
+      win32_gc->values_mask |= GDK_GC_LINE_WIDTH;
+      GDK_NOTE (MISC, (g_print ("%spw=%d", s, win32_gc->pen_width),
+                      s = ","));
+    }
 
-  if (values_mask & (GDK_GC_LINE_WIDTH | GDK_GC_LINE_STYLE))
+  if (mask & GDK_GC_LINE_STYLE)
     {
-      if (values_mask & GDK_GC_LINE_WIDTH)
+      win32_gc->pen_style &= ~(PS_STYLE_MASK);
+      GDK_NOTE (MISC, (g_print ("%sps|=", s),
+                      s = ","));
+      switch (values->line_style)
        {
-         private->pen_width = values->line_width;
-         GDK_NOTE (MISC, g_print (" pw=%d", private->pen_width));
-       }
-      if (values_mask & GDK_GC_LINE_STYLE)
-       {
-         switch (values->line_style)
-           {
-           case GDK_LINE_SOLID:
-             private->pen_style |= PS_SOLID; break;
-           case GDK_LINE_ON_OFF_DASH:
-           case GDK_LINE_DOUBLE_DASH: /* ??? */
-             private->pen_style |= PS_DASH; break;
-           }
-         GDK_NOTE (MISC, g_print (" ps=%#x", private->pen_style));
+       case GDK_LINE_SOLID:
+         GDK_NOTE (MISC, g_print ("LINE_SOLID"));
+         win32_gc->pen_style |= PS_SOLID;
+         break;
+       case GDK_LINE_ON_OFF_DASH:
+       case GDK_LINE_DOUBLE_DASH: /* ??? */
+         GDK_NOTE (MISC, g_print ("DASH"));
+         win32_gc->pen_style |= PS_DASH;
+         break;
        }
+      win32_gc->values_mask |= GDK_GC_LINE_STYLE;
     }
 
-  if (values_mask & GDK_GC_CAP_STYLE)
+  if (mask & GDK_GC_CAP_STYLE)
     {
+      win32_gc->pen_style &= ~(PS_ENDCAP_MASK);
+      GDK_NOTE (MISC, (g_print ("%sps|=", s),
+                      s = ","));
       switch (values->cap_style)
        {
        case GDK_CAP_NOT_LAST:  /* ??? */
        case GDK_CAP_BUTT:
-         private->pen_style |= PS_ENDCAP_FLAT; break;
+         GDK_NOTE (MISC, g_print ("ENDCAP_FLAT"));
+         win32_gc->pen_style |= PS_ENDCAP_FLAT;
+         break;
        case GDK_CAP_ROUND:
-         private->pen_style |= PS_ENDCAP_ROUND; break;
+         GDK_NOTE (MISC, g_print ("ENDCAP_ROUND"));
+         win32_gc->pen_style |= PS_ENDCAP_ROUND;
+         break;
        case GDK_CAP_PROJECTING:
-         private->pen_style |= PS_ENDCAP_SQUARE; break;
+         GDK_NOTE (MISC, g_print ("ENDCAP_SQUARE"));
+         win32_gc->pen_style |= PS_ENDCAP_SQUARE;
+         break;
        }
-      GDK_NOTE (MISC, g_print (" ps=%#x", private->pen_style));
+      win32_gc->values_mask |= GDK_GC_CAP_STYLE;
     }
 
-  if (values_mask & GDK_GC_JOIN_STYLE)
+  if (mask & GDK_GC_JOIN_STYLE)
     {
+      win32_gc->pen_style &= ~(PS_JOIN_MASK);
+      GDK_NOTE (MISC, (g_print ("%sps|=", s),
+                      s = ","));
       switch (values->join_style)
        {
        case GDK_JOIN_MITER:
-         private->pen_style |= PS_JOIN_MITER;
+         GDK_NOTE (MISC, g_print ("JOIN_MITER"));
+         win32_gc->pen_style |= PS_JOIN_MITER;
          break;
        case GDK_JOIN_ROUND:
-         private->pen_style |= PS_JOIN_ROUND;
+         GDK_NOTE (MISC, g_print ("JOIN_ROUND"));
+         win32_gc->pen_style |= PS_JOIN_ROUND;
          break;
        case GDK_JOIN_BEVEL:
-         private->pen_style |= PS_JOIN_BEVEL;
+         GDK_NOTE (MISC, g_print ("JOIN_BEVEL"));
+         win32_gc->pen_style |= PS_JOIN_BEVEL;
          break;
        }
-      GDK_NOTE (MISC, g_print (" ps=%#x", private->pen_style));
+      win32_gc->values_mask |= GDK_GC_JOIN_STYLE;
     }
+  GDK_NOTE (MISC, g_print ("}\n"));
+}
 
-  private->hwnd = NULL;
-  private->xgc = NULL;
+GdkGC*
+_gdk_win32_gc_new (GdkDrawable   *drawable,
+                  GdkGCValues    *values,
+                  GdkGCValuesMask mask)
+{
+  GdkGC *gc;
+  GdkGCWin32 *win32_gc;
 
-  GDK_NOTE (MISC, g_print ("} = %p\n", private));
+  /* NOTICE that the drawable here has to be the impl drawable,
+   * not the publically-visible drawables.
+   */
+  g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_WIN32 (drawable), NULL);
 
-  return gc;
-}
+  gc = g_object_new (gdk_gc_win32_get_type (), NULL);
+  win32_gc = GDK_GC_WIN32 (gc);
 
-void
-gdk_gc_destroy (GdkGC *gc)
-{
-  gdk_gc_unref (gc);
-}
+  win32_gc->hdc = NULL;
+  win32_gc->clip_region = NULL;
+  win32_gc->hcliprgn = NULL;
 
-GdkGC *
-gdk_gc_ref (GdkGC *gc)
-{
-  GdkGCPrivate *private = (GdkGCPrivate*) gc;
+  /* Use the same default values as X11 does, even if they don't make
+   * sense per se. But apps always set fg and bg anyway.
+   */
+  win32_gc->foreground = 0;
+  win32_gc->background = 1;
+  win32_gc->font = NULL;
+  win32_gc->rop2 = R2_COPYPEN;
+  win32_gc->fill_style = GDK_SOLID;
+  win32_gc->tile = NULL;
+  win32_gc->stipple = NULL;
+  win32_gc->pen_style = PS_GEOMETRIC|PS_ENDCAP_FLAT|PS_JOIN_MITER;
+  win32_gc->pen_width = 0;
 
-  g_return_val_if_fail (gc != NULL, NULL);
-  private->ref_count += 1;
+  win32_gc->values_mask = GDK_GC_FUNCTION | GDK_GC_FILL;
 
-  return gc;
-}
+  GDK_NOTE (MISC, g_print ("_gdk_win32_gc_new: "));
+  gdk_win32_gc_values_to_win32values (values, mask, win32_gc);
 
-void
-gdk_gc_unref (GdkGC *gc)
-{
-  GdkGCPrivate *private = (GdkGCPrivate*) gc;
-  
-  g_return_if_fail (gc != NULL);
-  
-  if (private->ref_count > 1)
-    private->ref_count -= 1;
-  else
-    {
-      if (private->values_mask & GDK_GC_FONT)
-       gdk_font_unref (private->font);
+  win32_gc->hwnd = NULL;
 
-      if (private->values_mask & GDK_GC_TILE)
-       gdk_pixmap_unref (private->tile);
-      
-      if (private->values_mask & GDK_GC_STIPPLE)
-       gdk_pixmap_unref (private->stipple);
-      
-      if (private->values_mask & GDK_GC_CLIP_MASK)
-       DeleteObject (private->clip_region);
+  GDK_NOTE (MISC, g_print (" = %p\n", gc));
 
-      g_free (gc);
-    }
+  return gc;
 }
 
-void
-gdk_gc_get_values (GdkGC       *gc,
-                  GdkGCValues *values)
+static void
+gdk_win32_gc_get_values (GdkGC       *gc,
+                        GdkGCValues *values)
 {
-  GdkGCPrivate *private;
-
-  g_return_if_fail (gc != NULL);
-  g_return_if_fail (values != NULL);
-
-  private = (GdkGCPrivate*) gc;
+  GdkGCWin32 *win32_gc = GDK_GC_WIN32 (gc);
 
-  values->foreground = private->foreground;
-  values->background = private->background;
-  values->font = private->font;
+  values->foreground.pixel = win32_gc->foreground;
+  values->background.pixel = win32_gc->background;
+  values->font = win32_gc->font;
 
-  switch (private->rop2)
+  switch (win32_gc->rop2)
     {
     case R2_COPYPEN:
       values->function = GDK_COPY; break;
@@ -358,341 +552,132 @@ gdk_gc_get_values (GdkGC       *gc,
       values->function = GDK_OR_INVERT; break;
     case R2_NOTMASKPEN:
       values->function = GDK_NAND; break;
+    case R2_NOTMERGEPEN:
+      values->function = GDK_NOR; break;
     case R2_WHITE:
       values->function = GDK_SET; break;
     }
 
-  values->fill = private->fill_style;
+  values->fill = win32_gc->fill_style;
 
-  values->tile = private->tile;
-  values->stipple = private->stipple;
-  if (private->clip_region != NULL)
-    {
-      RECT rect;
-      HBRUSH hbr;
-      HDC hdc;
-      HGDIOBJ oldbitmap;
-      GdkPixmap *pixmap;
-
-      GetRgnBox (private->clip_region, &rect);
-      pixmap =
-       gdk_pixmap_new (NULL, rect.right - rect.left, rect.bottom - rect.top,
-                       1);
-      hbr = GetStockObject (WHITE_BRUSH);
-      if ((hdc = CreateCompatibleDC (NULL)) == NULL)
-       g_warning ("gdk_gc_get_values: CreateCompatibleDC failed");
-      if ((oldbitmap =
-          SelectObject (hdc, GDK_DRAWABLE_XID (pixmap))) == NULL)
-       g_warning ("gdk_gc_get_values: SelectObject #1 failed");
-      hbr = GetStockObject (BLACK_BRUSH);
-      if (!FillRect (hdc, &rect, hbr))
-       g_warning ("gdk_gc_get_values: FillRect failed");
-      hbr = GetStockObject (WHITE_BRUSH);
-      if (!FillRgn (hdc, private->clip_region, hbr))
-       g_warning ("gdk_gc_get_values: FillRgn failed");
-      if (SelectObject (hdc, oldbitmap) == NULL)
-       g_warning ("gdk_gc_get_values: SelectObject #2 failed");
-      DeleteDC (hdc);
-      values->clip_mask = pixmap;
-    }
-  else
-    values->clip_mask = NULL;
-  values->subwindow_mode = private->subwindow_mode;
-  values->ts_x_origin = private->ts_x_origin;
-  values->ts_y_origin = private->ts_y_origin;
-  values->clip_x_origin = private->clip_x_origin;
-  values->clip_y_origin = private->clip_y_origin;
-  values->graphics_exposures = private->graphics_exposures;
-  values->line_width = private->pen_width;
+  values->tile = win32_gc->tile;
+  values->stipple = win32_gc->stipple;
+
+  /* Also the X11 backend always returns a NULL clip_mask */
+  values->clip_mask = NULL;
+
+  values->subwindow_mode = win32_gc->subwindow_mode;
+  values->ts_x_origin = win32_gc->parent_instance.ts_x_origin;
+  values->ts_y_origin = win32_gc->parent_instance.ts_y_origin;
+  values->clip_x_origin = win32_gc->parent_instance.clip_x_origin;
+  values->clip_y_origin = win32_gc->parent_instance.clip_y_origin;
+  values->graphics_exposures = win32_gc->graphics_exposures;
+  values->line_width = win32_gc->pen_width;
   
-  if (private->pen_style & PS_SOLID)
+  if (win32_gc->pen_style & PS_SOLID)
     values->line_style = GDK_LINE_SOLID;
-  else if (private->pen_style & PS_DASH)
+  else if (win32_gc->pen_style & PS_DASH)
     values->line_style = GDK_LINE_ON_OFF_DASH;
   else
     values->line_style = GDK_LINE_SOLID;
 
   /* PS_ENDCAP_ROUND is zero */
-  if (private->pen_style & PS_ENDCAP_FLAT)
+  if (win32_gc->pen_style & PS_ENDCAP_FLAT)
     values->cap_style = GDK_CAP_BUTT;
-  else if (private->pen_style & PS_ENDCAP_SQUARE)
+  else if (win32_gc->pen_style & PS_ENDCAP_SQUARE)
     values->cap_style = GDK_CAP_PROJECTING;
   else
     values->cap_style = GDK_CAP_ROUND;
     
   /* PS_JOIN_ROUND is zero */
-  if (private->pen_style & PS_JOIN_MITER)
+  if (win32_gc->pen_style & PS_JOIN_MITER)
     values->join_style = GDK_JOIN_MITER;
-  else if (private->pen_style & PS_JOIN_BEVEL)
+  else if (win32_gc->pen_style & PS_JOIN_BEVEL)
     values->join_style = GDK_JOIN_BEVEL;
   else
     values->join_style = GDK_JOIN_ROUND;
 }
 
-void
-gdk_gc_set_foreground (GdkGC   *gc,
-                      GdkColor *color)
+static void
+gdk_win32_gc_set_values (GdkGC           *gc,
+                        GdkGCValues     *values,
+                        GdkGCValuesMask  mask)
 {
-  GdkGCPrivate *private;
+  g_return_if_fail (GDK_IS_GC (gc));
 
-  g_return_if_fail (gc != NULL);
-  g_return_if_fail (color != NULL);
+  GDK_NOTE (MISC, g_print ("gdk_win32_gc_set_values: "));
 
-  private = (GdkGCPrivate*) gc;
-  {
-    GDK_NOTE (MISC, g_print ("gdk_gc_set_foreground: (%d) %s\n",
-                            private, gdk_color_to_string (color)));
-    private->foreground = *color;
-    private->values_mask |= GDK_GC_FOREGROUND;
-  }
+  gdk_win32_gc_values_to_win32values (values, mask, GDK_GC_WIN32 (gc));
 }
 
-void
-gdk_gc_set_background (GdkGC   *gc,
-                      GdkColor *color)
+static void
+gdk_win32_gc_set_dashes (GdkGC *gc,
+                        gint   dash_offset,
+                        gint8  dash_list[],
+                        gint   n)
 {
-  GdkGCPrivate *private;
-
-  g_return_if_fail (gc != NULL);
-  g_return_if_fail (color != NULL);
-
-  private = (GdkGCPrivate*) gc;
+  GdkGCWin32 *win32_gc;
 
-  GDK_NOTE (MISC, g_print ("gdk_gc_set_backround: (%d) %s\n",
-                          private, gdk_color_to_string(color)));
-  private->background = *color;
-  private->values_mask |= GDK_GC_BACKGROUND;
-}
+  g_return_if_fail (GDK_IS_GC (gc));
+  g_return_if_fail (dash_list != NULL);
 
-void
-gdk_gc_set_font (GdkGC  *gc,
-                GdkFont *font)
-{
-  GdkGCPrivate *gc_private;
-  GdkFontPrivate *font_private;
-  gchar *xlfd;
+  win32_gc = GDK_GC_WIN32 (gc);
 
-  g_return_if_fail (gc != NULL);
-  g_return_if_fail (font != NULL);
+  win32_gc->pen_style &= ~(PS_STYLE_MASK);
+  win32_gc->pen_style |= PS_DASH;
 
-  if (font->type == GDK_FONT_FONT
-      || font->type == GDK_FONT_FONTSET)
+  /* 
+   * Set the extended line style. This could be done by 
+   * PS_USERSTYLE and ExtCreatePen; but ONLY on WinNT, 
+   * so let's make a guess (based on the implementation 
+   * in DIA). On Win9x this does only work for lines
+   * with width one ...
+   *
+   * More workarounds for Win9x descibed at:
+   * http://www.codeguru.com/gdi/dashed.shtml
+   */
+  if (!IS_WIN_NT () && win32_gc->pen_width > 1)
     {
-      gc_private = (GdkGCPrivate*) gc;
-      
-      GDK_NOTE (MISC, (xlfd = gdk_font_xlfd_create (font),
-                      g_print ("gdk_gc_set_font: (%d) %s\n",
-                               gc_private, xlfd),
-                      gdk_font_xlfd_free (xlfd)));
-
-      if (gc_private->font != NULL)
-       gdk_font_unref (gc_private->font);
-      gc_private->font = font;
-      gdk_font_ref (gc_private->font);
-      gc_private->values_mask |= GDK_GC_FONT;
+      GDK_NOTE (MISC, g_print ("gdk_win32_gc_set_dashes: not fully supported\n"));
+      win32_gc->pen_style |= PS_SOLID;
+      return;
     }
-}
-
-void
-gdk_gc_set_function (GdkGC      *gc,
-                    GdkFunction  function)
-{
-  GdkGCPrivate *private;
-
-  g_return_if_fail (gc != NULL);
-
-  private = (GdkGCPrivate*) gc;
-
-  GDK_NOTE (MISC, g_print ("gdk_gc_set_function: (%d) %d\n", private, function));
-
-  switch (function)
+  
+  /* win32_gc->pen_style = PS_COSMETIC; ??? */
+  if (2 == n)
     {
-    case GDK_COPY:
-      private->rop2 = R2_COPYPEN; break;
-    case GDK_INVERT:
-      private->rop2 = R2_NOT; break;
-    case GDK_XOR:
-      private->rop2 = R2_XORPEN; break;
-    case GDK_CLEAR:
-      private->rop2 = R2_BLACK; break;
-    case GDK_AND:
-      private->rop2 = R2_MASKPEN; break;
-    case GDK_AND_REVERSE:
-      private->rop2 = R2_MASKPENNOT; break;
-    case GDK_AND_INVERT:
-      private->rop2 = R2_MASKNOTPEN; break;
-    case GDK_NOOP:
-      private->rop2 = R2_NOP; break;
-    case GDK_OR:
-      private->rop2 = R2_MERGEPEN; break;
-    case GDK_EQUIV:
-      private->rop2 = R2_NOTXORPEN; break;
-    case GDK_OR_REVERSE:
-      private->rop2 = R2_MERGEPENNOT; break;
-    case GDK_COPY_INVERT:
-      private->rop2 = R2_NOTCOPYPEN; break;
-    case GDK_OR_INVERT:
-      private->rop2 = R2_MERGENOTPEN; break;
-    case GDK_NAND:
-      private->rop2 = R2_NOTMASKPEN; break;
-    case GDK_SET:
-      private->rop2 = R2_WHITE; break;
+      if ((dash_list[0] == dash_list[1]) && (dash_list[0] > 2))
+        {
+          win32_gc->pen_style |= PS_DASH;
+          GDK_NOTE (MISC, g_print("gdk_win32_gc_set_dashes: PS_DASH (%d,%d)\n", 
+                                  dash_list[0], dash_list[1]));
+        }
+      else
+        {
+          win32_gc->pen_style |= PS_DOT;
+          GDK_NOTE (MISC, g_print("gdk_win32_gc_set_dashes: PS_DOT (%d,%d)\n", 
+                                  dash_list[0], dash_list[1]));
+        }
     }
-  private->values_mask |= GDK_GC_FUNCTION;
-}
-
-void
-gdk_gc_set_fill (GdkGC  *gc,
-                GdkFill  fill)
-{
-  GdkGCPrivate *private;
-
-  g_return_if_fail (gc != NULL);
-
-  private = (GdkGCPrivate*) gc;
-
-  private->fill_style = fill;
-  private->values_mask |= GDK_GC_FILL;
-}
-
-void
-gdk_gc_set_tile (GdkGC    *gc,
-                GdkPixmap *tile)
-{
-  GdkGCPrivate *private;
-  HBITMAP pixmap;
-
-  g_return_if_fail (gc != NULL);
-
-  private = (GdkGCPrivate*) gc;
-
-  pixmap = NULL;
-
-  if (tile)
-    pixmap = GDK_DRAWABLE_XID (tile);
-
-  if (private->tile != NULL)
-    gdk_pixmap_unref (private->tile);
-  private->tile = tile;
-  if (tile)
-    gdk_pixmap_ref (tile);
-  if (pixmap != NULL)
-    private->values_mask |= GDK_GC_TILE;
-  else
-    private->values_mask &= ~GDK_GC_TILE;
-}
-
-void
-gdk_gc_set_stipple (GdkGC     *gc,
-                   GdkPixmap *stipple)
-{
-  GdkGCPrivate *private;
-  HBITMAP pixmap;
-
-  g_return_if_fail (gc != NULL);
-
-  private = (GdkGCPrivate*) gc;
-
-  pixmap = NULL;
-
-  if (stipple)
-    pixmap = GDK_DRAWABLE_XID (stipple);
-
-  if (private->stipple != NULL)
-    gdk_pixmap_unref (private->stipple);
-  private->stipple = stipple;
-  if (stipple)
-    gdk_pixmap_ref (stipple);
-  if (pixmap != NULL)
-    private->values_mask |= GDK_GC_STIPPLE;
-  else
-    private->values_mask &= ~GDK_GC_STIPPLE;
-}
-
-void
-gdk_gc_set_ts_origin (GdkGC *gc,
-                     gint   x,
-                     gint   y)
-{
-  GdkGCPrivate *private;
-
-  g_return_if_fail (gc != NULL);
-
-  private = (GdkGCPrivate*) gc;
-
-  private->ts_x_origin = x;
-  private->ts_y_origin = y;
-  private->values_mask |= GDK_GC_TS_X_ORIGIN |GDK_GC_TS_Y_ORIGIN;
-}
-
-void
-gdk_gc_set_clip_origin (GdkGC *gc,
-                       gint   x,
-                       gint   y)
-{
-  GdkGCPrivate *private;
-
-  g_return_if_fail (gc != NULL);
-
-  private = (GdkGCPrivate*) gc;
-
-  GDK_NOTE (MISC, g_print ("gdk_gc_set_clip_origin: (%d) +%d+%d\n",
-                          private, x, y));
-
-  private->clip_x_origin = x;
-  private->clip_y_origin = y;
-  private->values_mask |= GDK_GC_CLIP_X_ORIGIN |GDK_GC_CLIP_Y_ORIGIN;
-}
-
-void
-gdk_gc_set_clip_mask (GdkGC    *gc,
-                     GdkBitmap *mask)
-{
-  GdkGCPrivate *private;
-  HBITMAP xmask;
-  
-  g_return_if_fail (gc != NULL);
-  
-  if (mask)
+  else if (4 == n)
     {
-      if (GDK_DRAWABLE_DESTROYED (mask))
-       return;
-      xmask = GDK_DRAWABLE_XID (mask);
+      win32_gc->pen_style |= PS_DASHDOT; 
+      GDK_NOTE (MISC, g_print("gdk_win32_gc_set_dashes: PS_DASHDOT (%d,%d,%d,%d)\n", 
+                              dash_list[0], dash_list[1],
+                              dash_list[2], dash_list[3]));
     }
-  else
-    xmask = NULL;
-
-  private = (GdkGCPrivate*) gc;
-
-  GDK_NOTE (MISC, g_print ("gdk_gc_set_clip_mask: (%d) %#x\n", private, xmask));
-
-  if (private->clip_region != NULL)
-    if (!DeleteObject (private->clip_region))
-      g_warning ("gdk_gc_set_clip_mask: DeleteObject failed");
-  if (xmask != NULL)
+  else if (6 == n)
     {
-      private->clip_region = BitmapToRegion (xmask);
-      {
-       RECT rect;
-       GetRgnBox (private->clip_region, &rect);
-       GDK_NOTE (MISC, g_print ("...box = %dx%d@+%d+%d\n",
-                                rect.right - rect.left, rect.bottom - rect.top,
-                                rect.left, rect.top));
-      }
-#if 0
-      /* Test code that sets clip region to whole of mask */
-      {
-       BITMAP bm;
-       GetObject (xmask, sizeof (bm), &bm);
-       private->clip_region = CreateRectRgn (0, 0, bm.bmWidth, bm.bmHeight);
-      }
-#endif
-      private->values_mask |= GDK_GC_CLIP_MASK;
+      win32_gc->pen_style |= PS_DASHDOTDOT; 
+      GDK_NOTE (MISC, g_print("gdk_win32_gc_set_dashes: PS_DASHDOTDOT (%d,%d,%d,%d,%d,%d)\n", 
+                              dash_list[0], dash_list[1],
+                              dash_list[2], dash_list[3],
+                              dash_list[4], dash_list[5]));
     }
   else
     {
-      private->values_mask &= ~GDK_GC_CLIP_MASK;
-      private->clip_region = NULL;
+      win32_gc->pen_style |= PS_DASH;
+      GDK_NOTE (MISC, g_print("gdk_win32_gc_set_dashes: no guess for %d dashes\n", n));
     }
 }
 
@@ -700,245 +685,150 @@ void
 gdk_gc_set_clip_rectangle (GdkGC       *gc,
                           GdkRectangle *rectangle)
 {
-  GdkGCPrivate *private;
-   
-  g_return_if_fail (gc != NULL);
+  GdkGCWin32 *win32_gc;
+
+  g_return_if_fail (GDK_IS_GC (gc));
+
+  win32_gc = GDK_GC_WIN32 (gc);
 
-  private = (GdkGCPrivate*) gc;
+  if (win32_gc->clip_region)
+    gdk_region_destroy (win32_gc->clip_region);
 
-  if (private->clip_region != NULL)
-    if (!DeleteObject (private->clip_region))
-      g_warning ("gdk_gc_set_clip_rectangle: DeleteObject failed");
   if (rectangle)
     {
       GDK_NOTE (MISC,
                g_print ("gdk_gc_set_clip_rectangle: (%d) %dx%d@+%d+%d\n",
-                        private,
+                        win32_gc,
                         rectangle->width, rectangle->height,
                         rectangle->x, rectangle->y));
-      if ((private->clip_region =
-          CreateRectRgn (rectangle->x, rectangle->y,
-                         rectangle->x + rectangle->width,
-                         rectangle->y + rectangle->height)) == NULL)
-       g_warning ("gdk_gc_set_clip_rectangle: CreateRectRgn failed");
-
-      private->values_mask |= GDK_GC_CLIP_MASK;
+      win32_gc->clip_region = gdk_region_rectangle (rectangle);
+      win32_gc->values_mask |= GDK_GC_CLIP_MASK;
     }
   else
     {
-      GDK_NOTE (MISC, g_print ("gdk_gc_set_clip_rectangle: (%d) None\n",
-                              private));
-      private->clip_region = NULL;
-      private->values_mask &= ~GDK_GC_CLIP_MASK;
+      GDK_NOTE (MISC, g_print ("gdk_gc_set_clip_rectangle: (%d) NULL\n",
+                              win32_gc));
+      win32_gc->clip_region = NULL;
+      win32_gc->values_mask &= ~GDK_GC_CLIP_MASK;
     }
-    private->values_mask &= ~(GDK_GC_CLIP_X_ORIGIN |GDK_GC_CLIP_Y_ORIGIN);
+    win32_gc->values_mask &= ~(GDK_GC_CLIP_X_ORIGIN | GDK_GC_CLIP_Y_ORIGIN);
 } 
 
 void
 gdk_gc_set_clip_region (GdkGC           *gc,
                        GdkRegion        *region)
 {
-  GdkGCPrivate *private;
+  GdkGCWin32 *win32_gc;
 
-  g_return_if_fail (gc != NULL);
+  g_return_if_fail (GDK_IS_GC (gc));
 
-  private = (GdkGCPrivate*) gc;
+  win32_gc = GDK_GC_WIN32 (gc);
 
-  GDK_NOTE (MISC, g_print ("gdk_gc_set_clip_region: (%d) %s\n",
-                          private, (region != NULL ? "xxx" : "None")));
+  if (win32_gc->clip_region)
+    gdk_region_destroy (win32_gc->clip_region);
 
-  if (private->clip_region != NULL)
-    if (!DeleteObject (private->clip_region))
-      g_warning ("gdk_gc_set_clip_region: DeleteObject failed");
   if (region)
     {
-      GdkRegionPrivate *region_private;
-
-      region_private = (GdkRegionPrivate*) region;
-      private->clip_region = CreateRectRgn (1, 1, 0, 0);
-      CombineRgn (private->clip_region, region_private->xregion, NULL, RGN_COPY);
-      private->values_mask |= GDK_GC_CLIP_MASK;
+      GDK_NOTE (MISC, g_print ("gdk_gc_set_clip_region: %d %dx%d+%d+%d\n",
+                              win32_gc,
+                              region->extents.x2 - region->extents.x1,
+                              region->extents.y2 - region->extents.y1,
+                              region->extents.x1, region->extents.y1));
+      win32_gc->clip_region = gdk_region_copy (region);
+      win32_gc->values_mask |= GDK_GC_CLIP_MASK;
     }
   else
     {
-      private->clip_region = NULL;
-      private->values_mask &= ~GDK_GC_CLIP_MASK;
+      GDK_NOTE (MISC, g_print ("gdk_gc_set_clip_region: %d NULL\n",
+                              win32_gc));
+      win32_gc->clip_region = NULL;
+      win32_gc->values_mask &= ~GDK_GC_CLIP_MASK;
     }
-}
-
-void
-gdk_gc_set_subwindow (GdkGC           *gc,
-                     GdkSubwindowMode  mode)
-{
-  GdkGCPrivate *private;
-
-  g_return_if_fail (gc != NULL);
 
-  private = (GdkGCPrivate*) gc;
+  gc->clip_x_origin = 0;
+  gc->clip_y_origin = 0;
 
-  private->subwindow_mode = mode;
-  private->values_mask |= GDK_GC_SUBWINDOW;
+  win32_gc->values_mask &= ~(GDK_GC_CLIP_X_ORIGIN | GDK_GC_CLIP_Y_ORIGIN);
 }
 
 void
-gdk_gc_set_exposures (GdkGC *gc,
-                     gint   exposures)
+gdk_gc_copy (GdkGC *dst_gc,
+            GdkGC *src_gc)
 {
-  GdkGCPrivate *private;
+  GdkGCWin32 *dst_win32_gc;
+  GdkGCWin32 *src_win32_gc;
+  DWORD nbytes;
+  LPRGNDATA rgn;
 
-  g_return_if_fail (gc != NULL);
-
-  private = (GdkGCPrivate*) gc;
-
-  private->graphics_exposures = exposures;
-  private->values_mask |= GDK_GC_EXPOSURES;;
+  g_return_if_fail (GDK_IS_GC_WIN32 (dst_gc));
+  g_return_if_fail (GDK_IS_GC_WIN32 (src_gc));
+  
+  dst_win32_gc = GDK_GC_WIN32 (dst_gc);
+  src_win32_gc = GDK_GC_WIN32 (src_gc);
+
+  if (dst_win32_gc->font != NULL)
+    gdk_font_unref (dst_win32_gc->font);
+  if (dst_win32_gc->tile != NULL)
+    gdk_drawable_unref (dst_win32_gc->tile);
+  if (dst_win32_gc->stipple != NULL)
+    gdk_drawable_unref (dst_win32_gc->stipple);
+  if (dst_win32_gc->clip_region != NULL)
+    gdk_region_destroy (dst_win32_gc->clip_region);
+  
+  *dst_win32_gc = *src_win32_gc;
+
+  if (dst_win32_gc->clip_region != NULL)
+    dst_win32_gc->clip_region = gdk_region_copy (dst_win32_gc->clip_region);
+  if (dst_win32_gc->font != NULL)
+    gdk_font_ref (dst_win32_gc->font);
+  if (dst_win32_gc->tile != NULL)
+    gdk_drawable_ref (dst_win32_gc->tile);
+  if (dst_win32_gc->stipple != NULL)
+    gdk_drawable_ref (dst_win32_gc->stipple);
 }
 
-void
-gdk_gc_set_line_attributes (GdkGC      *gc,
-                           gint         line_width,
-                           GdkLineStyle line_style,
-                           GdkCapStyle  cap_style,
-                           GdkJoinStyle join_style)
-{
-  GdkGCPrivate *private;
-  int xline_style;
-  int xcap_style;
-  int xjoin_style;
-
-  g_return_if_fail (gc != NULL);
-
-  private = (GdkGCPrivate*) gc;
-
-  GDK_NOTE (MISC,
-           g_print ("gdk_gc_set_line_attributes: (%d) %d %s %s %s\n",
-                    private, line_width,
-                    (line_style == GDK_LINE_SOLID ? "SOLID" :
-                     (line_style == GDK_LINE_ON_OFF_DASH ? "ON_OFF_DASH" :
-                      (line_style == GDK_LINE_DOUBLE_DASH ? "DOUBLE_DASH" :
-                       "???"))),
-                    (cap_style == GDK_CAP_BUTT ? "BUTT" :
-                     (cap_style == GDK_CAP_ROUND ? "ROUND" :
-                      (cap_style == GDK_CAP_PROJECTING ? "PROJECTING" :
-                       "???"))),
-                    (join_style == GDK_JOIN_MITER ? "MITER" :
-                     (join_style == GDK_JOIN_ROUND ? "ROUND" :
-                      (join_style == GDK_JOIN_BEVEL ? "BEVEL" :
-                       "???")))));
-
-  private->pen_width = line_width;
-
-  /* Mask old style bits away */
-  private->pen_style &= ~(PS_STYLE_MASK|PS_ENDCAP_MASK|PS_JOIN_MASK);
-
-  /* Add new bits */
-  switch (line_style)
-    {
-    case GDK_LINE_SOLID:
-      private->pen_style |= PS_SOLID; break;
-    case GDK_LINE_ON_OFF_DASH:
-    case GDK_LINE_DOUBLE_DASH: /* ??? */
-      private->pen_style |= PS_DASH; break;
-    }
+static guint bitmask[9] = { 0, 1, 3, 7, 15, 31, 63, 127, 255 };
 
-  switch (cap_style)
-    {
-    case GDK_CAP_NOT_LAST:
-      /* ??? */
-      break;
-    case GDK_CAP_BUTT:
-      private->pen_style |= PS_ENDCAP_FLAT; break;
-    case GDK_CAP_ROUND:
-      private->pen_style |= PS_ENDCAP_ROUND; break;
-    case GDK_CAP_PROJECTING:
-      private->pen_style |= PS_ENDCAP_SQUARE; break;
-    }
-
-  switch (join_style)
-    {
-    case GDK_JOIN_MITER:
-      private->pen_style |= PS_JOIN_MITER;
-      break;
-    case GDK_JOIN_ROUND:
-      private->pen_style |= PS_JOIN_ROUND;
-      break;
-    case GDK_JOIN_BEVEL:
-      private->pen_style |= PS_JOIN_BEVEL;
-      break;
-    }
-}
-
-void
-gdk_gc_set_dashes (GdkGC *gc,
-                  gint   dash_offset,
-                  gchar  dash_list[],
-                  gint   n)
+COLORREF
+gdk_colormap_color (GdkColormap *colormap,
+                   gulong       pixel)
 {
-  GdkGCPrivate *private;
+  const GdkVisual *visual;
+  GdkColormapPrivateWin32 *colormap_private;
+  guchar r, g, b;
 
-  g_return_if_fail (gc != NULL);
-  g_return_if_fail (dash_list != NULL);
+  if (colormap == NULL)
+    return PALETTEINDEX (pixel);
 
-  /* XXX ??? */
+  colormap_private = GDK_COLORMAP_PRIVATE_DATA (colormap);
 
-  private = (GdkGCPrivate *) gc;
+  if (colormap_private->xcolormap->rc_palette)
+    return PALETTEINDEX (pixel);
 
-  private->pen_style &= ~(PS_STYLE_MASK);
-  private->pen_style |= PS_DASH;
+  visual = colormap->visual;
+  r = (pixel & visual->red_mask) >> visual->red_shift;
+  r = (r * 255) / bitmask[visual->red_prec];
+  g = (pixel & visual->green_mask) >> visual->green_shift;
+  g = (g * 255) / bitmask[visual->green_prec];
+  b = (pixel & visual->blue_mask) >> visual->blue_shift;
+  b = (b * 255) / bitmask[visual->blue_prec];
+  
+  return RGB (r, g, b);
 }
 
-void
-gdk_gc_copy (GdkGC *dst_gc, GdkGC *src_gc)
+static void
+predraw_set_foreground (GdkGC       *gc,
+                       GdkColormap *colormap,
+                       gboolean    *ok)
 {
-  GdkGCPrivate *dst_private, *src_private;
-
-  src_private = (GdkGCPrivate *) src_gc;
-  dst_private = (GdkGCPrivate *) dst_gc;
-
-  *dst_private = *src_private;
-}
-
-HDC
-gdk_gc_predraw (GdkDrawable  *drawable,
-               GdkGCPrivate *gc_private)
-{
-  GdkDrawablePrivate *drawable_private = (GdkDrawablePrivate *) drawable;
-  GdkColormapPrivate *colormap_private =
-    (GdkColormapPrivate *) drawable_private->colormap;
-  GdkVisual *visual;
-  COLORREF bg;
+  GdkGCWin32 *win32_gc = (GdkGCWin32 *) gc;
+  GdkColormapPrivateWin32 *colormap_private;
   COLORREF fg;
   LOGBRUSH logbrush;
   HPEN hpen;
   HBRUSH hbr;
-  guchar r, g, b;
-  static guint mask[9] = { 0, 1, 3, 7, 15, 31, 63, 127, 255 };
-
-  g_assert (gc_private->xgc == NULL);
-
-  if (GDK_DRAWABLE_TYPE (drawable) == GDK_DRAWABLE_PIXMAP)
-    {
-      if ((gc_private->xgc = CreateCompatibleDC (NULL)) == NULL)
-       g_warning ("gdk_gc_predraw: CreateCompatibleDC failed");
 
-      if ((gc_private->saved_dc = SaveDC (gc_private->xgc)) == 0)
-       g_warning ("gdk_gc_predraw: SaveDC #1 failed");
-      
-      if (SelectObject (gc_private->xgc, drawable_private->xwindow) == NULL)
-       g_warning ("gdk_gc_predraw: SelectObject #1 failed");
-    }
-  else
-    {
-      if ((gc_private->xgc = GetDC (drawable_private->xwindow)) == NULL)
-       g_warning ("gdk_gc_predraw: GetDC failed");
-      
-      if ((gc_private->saved_dc = SaveDC (gc_private->xgc)) == 0)
-       g_warning ("gdk_gc_predraw: SaveDC #2 failed");
-    }
-  
-  gc_private->hwnd = drawable_private->xwindow;
-  
-  if (colormap_private == NULL)
+  if (colormap == NULL)
     {
       /* A 1 bit deep bitmap */
       struct
@@ -963,183 +853,323 @@ gdk_gc_predraw (GdkDrawable  *drawable,
            logpal.palPalEntry[1].peBlue = 0xFF;
          logpal.palPalEntry[1].peFlags = 0x00;
          if ((hpal = CreatePalette ((LOGPALETTE *) &logpal)) == NULL)
-           g_warning ("gdk_gc_predraw: CreatePalette failed");
+           WIN32_GDI_FAILED ("CreatePalette"), *ok = FALSE;
        }
-      SelectPalette (gc_private->xgc, hpal, FALSE);
-      RealizePalette (gc_private->xgc);
-      fg = PALETTEINDEX (gc_private->foreground.pixel);
+      SelectPalette (win32_gc->hdc, hpal, FALSE);
+      RealizePalette (win32_gc->hdc);
+      fg = PALETTEINDEX (win32_gc->foreground);
     }
-  else if (colormap_private->xcolormap->rc_palette)
+  else
     {
-      int k;
-      if (SelectPalette (gc_private->xgc,
-                        colormap_private->xcolormap->palette, FALSE) == NULL)
-       g_warning ("gdk_gc_predraw: SelectPalette failed");
-      if (TRUE || colormap_private->xcolormap->stale)
+      colormap_private = GDK_COLORMAP_PRIVATE_DATA (colormap);
+      if (colormap_private->xcolormap->rc_palette)
        {
-         if ((k = RealizePalette (gc_private->xgc)) == GDI_ERROR)
-           g_warning ("gdk_gc_predraw: RealizePalette failed");
-         colormap_private->xcolormap->stale = FALSE;
-       }
+         int k;
+         if (SelectPalette (win32_gc->hdc, colormap_private->xcolormap->palette,
+                            FALSE) == NULL)
+           WIN32_GDI_FAILED ("SelectPalette"), *ok = FALSE;
+         if (TRUE || colormap_private->xcolormap->stale)
+           {
+             if ((k = RealizePalette (win32_gc->hdc)) == GDI_ERROR)
+               WIN32_GDI_FAILED ("RealizePalette"), *ok = FALSE;
+             colormap_private->xcolormap->stale = FALSE;
+           }
 #if 0
-      g_print ("Selected palette %#x for gc %#x, realized %d colors\n",
-              colormap_private->xcolormap->palette, gc_private->xgc, k);
+         g_print ("Selected palette %#x for gc %#x, realized %d colors\n",
+                  colormap_private->xcolormap->palette, win32_gc->hdc, k);
 #endif
-      fg = PALETTEINDEX (gc_private->foreground.pixel);
-    }
-  else
-    {
-      visual = colormap_private->visual;
-      r = (gc_private->foreground.pixel & visual->red_mask) >> visual->red_shift;
-      r = (r * 255) / mask[visual->red_prec];
-      g = (gc_private->foreground.pixel & visual->green_mask) >> visual->green_shift;
-      g = (g * 255) / mask[visual->green_prec];
-      b = (gc_private->foreground.pixel & visual->blue_mask) >> visual->blue_shift;
-      b = (b * 255) / mask[visual->blue_prec];
-
-      fg = GetNearestColor (gc_private->xgc, RGB (r, g, b));
+       }
     }
+
+  fg = gdk_colormap_color (colormap, win32_gc->foreground);
+
+  if (SetTextColor (win32_gc->hdc, fg) == CLR_INVALID)
+    WIN32_GDI_FAILED ("SetTextColor"), *ok = FALSE;
+
+  /* Create and select pen and brush. */
+
   logbrush.lbStyle = BS_SOLID;
   logbrush.lbColor = fg;
-  if ((hpen = ExtCreatePen (gc_private->pen_style, gc_private->pen_width,
-                           &logbrush, 0, NULL)) == NULL)
-    g_warning ("gdk_gc_predraw: CreatePen failed");
-  
-  if (SelectObject (gc_private->xgc, hpen) == NULL)
-    g_warning ("gdk_gc_predraw: SelectObject #2 failed");
 
-  if (SetTextColor (gc_private->xgc, fg) == CLR_INVALID)
-    g_warning ("gdk_gc_predraw: SetTextColor failed");
+  if (*ok && (hpen = ExtCreatePen (win32_gc->pen_style,
+                                  (win32_gc->pen_width > 0 ? win32_gc->pen_width : 1),
+                                  &logbrush, 0, NULL)) == NULL)
+    WIN32_GDI_FAILED ("ExtCreatePen");
+  
+  if (SelectObject (win32_gc->hdc, hpen) == NULL)
+    WIN32_GDI_FAILED ("SelectObject"), *ok = FALSE;
 
-#if 0
-  switch (gc_private->fill_style)
+  switch (win32_gc->fill_style)
     {
-    case GDK_STIPPLED:
-      {
-       GdkPixmap *stipple = gc_private->stipple;
-       GdkPixmapPrivate *stipple_private = (GdkPixmapPrivate *) stipple;
-       HBITMAP hbm = stipple_private->xwindow;
-       if (NULL == (hbr = CreatePatternBrush (hbm)))
-         g_warning ("gdk_gc_predraw: CreatePatternBrush failed");
+    case GDK_OPAQUE_STIPPLED:
+      if (*ok && (hbr = CreatePatternBrush (GDK_PIXMAP_HBITMAP (win32_gc->stipple))) == NULL)
+       WIN32_GDI_FAILED ("CreatePatternBrush"), *ok = FALSE;
        
-#ifdef NATIVE_WIN16
-       SetBrushOrg  (gc_private->xgc, gc_private->ts_x_origin,
-                     gc_private->ts_y_origin);
-#else
-       SetBrushOrgEx(gc_private->xgc, gc_private->ts_x_origin,
-                     gc_private->ts_y_origin, NULL);
-#endif
-      }
+      if (*ok && !SetBrushOrgEx(win32_gc->hdc, gc->ts_x_origin,
+                               gc->ts_y_origin, NULL))
+       WIN32_GDI_FAILED ("SetBrushOrgEx"), *ok = FALSE;
       break;
+
     case GDK_SOLID:
     default:
-      if ((hbr = CreateSolidBrush (fg)) == NULL)
-       g_warning ("gdk_gc_predraw: CreateSolidBrush failed");
+      if (*ok && (hbr = CreateSolidBrush (fg)) == NULL)
+       WIN32_GDI_FAILED ("CreateSolidBrush"), *ok = FALSE;
       break;
   }
-#else
-  if ((hbr = CreateSolidBrush (fg)) == NULL)
-    g_warning ("gdk_gc_predraw: CreateSolidBrush failed");
-#endif
-  if (SelectObject (gc_private->xgc, hbr) == NULL)
-    g_warning ("gdk_gc_predraw: SelectObject #3 failed");
+  if (*ok && SelectObject (win32_gc->hdc, hbr) == NULL)
+    WIN32_GDI_FAILED ("SelectObject"), *ok = FALSE;
+}  
+
+void
+predraw_set_background (GdkGC       *gc,
+                       GdkColormap *colormap,
+                       gboolean    *ok)
+{
+  GdkGCWin32 *win32_gc = (GdkGCWin32 *) gc;
+  COLORREF bg = gdk_colormap_color (colormap, win32_gc->background);
+
+  if (SetBkColor (win32_gc->hdc, bg) == CLR_INVALID)
+    WIN32_GDI_FAILED ("SetBkColor"), *ok = FALSE;
+}
 
-  if (gc_private->values_mask & GDK_GC_BACKGROUND)
+HDC
+gdk_win32_hdc_get (GdkDrawable    *drawable,
+                  GdkGC          *gc,
+                  GdkGCValuesMask usage)
+{
+  GdkGCWin32 *win32_gc = (GdkGCWin32 *) gc;
+  GdkColormapPrivateWin32 *colormap_private =
+    (GdkColormapPrivateWin32 *) GDK_DRAWABLE_IMPL_WIN32 (drawable)->colormap;
+  gboolean ok = TRUE;
+  int flag;
+
+  g_assert (win32_gc->hdc == NULL);
+
+  win32_gc->hwnd = GDK_DRAWABLE_IMPL_WIN32(drawable)->handle;
+
+  if (GDK_IS_PIXMAP_IMPL_WIN32 (drawable))
     {
-      if (colormap_private == NULL)
-       {
-         /* a bitmap */
-         bg = PALETTEINDEX (gc_private->background.pixel);
-       }
-      else if (colormap_private->xcolormap->rc_palette)
-       {
-         bg = PALETTEINDEX (gc_private->background.pixel);
-       }
-      else
-       {
-         visual = colormap_private->visual;
-         r = (gc_private->background.pixel & visual->red_mask) >> visual->red_shift;
-         r = (r * 255) / mask[visual->red_prec];
-         g = (gc_private->background.pixel & visual->green_mask) >> visual->green_shift;
-         g = (g * 255) / mask[visual->green_prec];
-         b = (gc_private->background.pixel & visual->blue_mask) >> visual->blue_shift;
-         b = (b * 255) / mask[visual->green_prec];
-         
-         fg = GetNearestColor (gc_private->xgc, RGB (r, g, b));
-       }
-      if (SetBkColor (gc_private->xgc, bg) == CLR_INVALID)
-       g_warning ("gdk_gc_predraw: SetBkColor failed");
+      if ((win32_gc->hdc = CreateCompatibleDC (NULL)) == NULL)
+       WIN32_GDI_FAILED ("CreateCompatibleDC"), ok = FALSE;
+
+      if (ok && (win32_gc->saved_dc = SaveDC (win32_gc->hdc)) == 0)
+       WIN32_GDI_FAILED ("SaveDC"), ok = FALSE;
+      
+      if (ok && SelectObject (win32_gc->hdc, win32_gc->hwnd) == NULL)
+       WIN32_GDI_FAILED ("SelectObject"), ok = FALSE;
+    }
+  else
+    {
+      if ((win32_gc->hdc = GetDC (win32_gc->hwnd)) == NULL)
+       WIN32_GDI_FAILED ("GetDC");
+      
+      if (ok && (win32_gc->saved_dc = SaveDC (win32_gc->hdc)) == 0)
+       WIN32_GDI_FAILED ("SaveDC");
     }
   
-  if (SetBkMode (gc_private->xgc, TRANSPARENT) == 0)
-    g_warning ("gdk_gc_predraw: SetBkMode failed");
+  if (ok && (usage & GDK_GC_FOREGROUND))
+    predraw_set_foreground (gc, GDK_DRAWABLE_IMPL_WIN32 (drawable)->colormap, &ok);
+
+  if (ok
+      && (usage & GDK_GC_BACKGROUND)
+      && (win32_gc->values_mask & GDK_GC_BACKGROUND))
+    predraw_set_background (gc, GDK_DRAWABLE_IMPL_WIN32 (drawable)->colormap, &ok);
   
-  if (SetTextAlign (gc_private->xgc, TA_BASELINE) == GDI_ERROR)
-    g_warning ("gdk_gc_predraw: SetTextAlign failed");
+  if (ok && (usage & GDK_GC_FONT))
+    {
+      if (SetBkMode (win32_gc->hdc, TRANSPARENT) == 0)
+       WIN32_GDI_FAILED ("SetBkMode"), ok = FALSE;
+  
+      if (ok && SetTextAlign (win32_gc->hdc, TA_BASELINE) == GDI_ERROR)
+       WIN32_GDI_FAILED ("SetTextAlign"), ok = FALSE;
+    }
   
-  if (gc_private->values_mask & GDK_GC_FUNCTION)
-    if (SetROP2 (gc_private->xgc, gc_private->rop2) == 0)
-      g_warning ("gdk_gc_predraw: SetROP2 failed");
+  if (ok && (win32_gc->values_mask & GDK_GC_FUNCTION))
+    if (SetROP2 (win32_gc->hdc, win32_gc->rop2) == 0)
+      WIN32_GDI_FAILED ("SetROP2"), ok = FALSE;
+
+  if (win32_gc->values_mask & GDK_GC_CLIP_MASK)
+    g_assert ((win32_gc->clip_region != NULL) != (win32_gc->hcliprgn != NULL));
+
+  if (ok
+      && (win32_gc->values_mask & GDK_GC_CLIP_MASK)
+      && win32_gc->clip_region != NULL)
+    {
+      HRGN hrgn;
+      RGNDATA *rgndata;
+      RECT *rect;
+      GdkRegionBox *boxes = win32_gc->clip_region->rects;
+      guint nbytes =
+       sizeof (RGNDATAHEADER) + (sizeof (RECT) * win32_gc->clip_region->numRects);
+      int i;
+
+      rgndata =        g_malloc (nbytes);
+      rgndata->rdh.dwSize = sizeof (RGNDATAHEADER);
+      rgndata->rdh.iType = RDH_RECTANGLES;
+      rgndata->rdh.nCount = rgndata->rdh.nRgnSize = 0;
+      SetRect (&rgndata->rdh.rcBound,
+              G_MAXSHORT, G_MAXSHORT, G_MINSHORT, G_MINSHORT);
+
+      for (i = 0; i < win32_gc->clip_region->numRects; i++)
+       {
+         rect = ((RECT *) rgndata->Buffer) + rgndata->rdh.nCount++;
+
+         rect->left = CLAMP (boxes[i].x1 + gc->clip_x_origin,
+                             G_MINSHORT, G_MAXSHORT);
+         rect->right = CLAMP (boxes[i].x2 + gc->clip_x_origin,
+                              G_MINSHORT, G_MAXSHORT);
+         rect->top = CLAMP (boxes[i].y1 + gc->clip_y_origin,
+                            G_MINSHORT, G_MAXSHORT);
+         rect->bottom = CLAMP (boxes[i].y2 + gc->clip_y_origin,
+                               G_MINSHORT, G_MAXSHORT);
+
+         GDK_NOTE (MISC, g_print ("clip rgn box %d: %dx%d@+%d+%d\n",
+                                  i,
+                                  rect->right-rect->left,
+                                  rect->bottom-rect->top,
+                                  rect->left, rect->top));
+
+         if (rect->left < rgndata->rdh.rcBound.left)
+           rgndata->rdh.rcBound.left = rect->left;
+         if (rect->right > rgndata->rdh.rcBound.right)
+           rgndata->rdh.rcBound.right = rect->right;
+         if (rect->top < rgndata->rdh.rcBound.top)
+           rgndata->rdh.rcBound.top = rect->top;
+         if (rect->bottom > rgndata->rdh.rcBound.bottom)
+           rgndata->rdh.rcBound.bottom = rect->bottom;
+       }
+      if ((hrgn = ExtCreateRegion (NULL, nbytes, rgndata)) == NULL)
+       WIN32_API_FAILED ("ExtCreateRegion"), ok = FALSE;
 
-  if (gc_private->values_mask & GDK_GC_CLIP_MASK
-      && gc_private->clip_region != NULL)
+      if (ok && SelectClipRgn (win32_gc->hdc, hrgn) == ERROR)
+       WIN32_API_FAILED ("SelectClipRgn"), ok = FALSE;
+
+      if (hrgn != NULL)
+       DeleteObject (hrgn);
+    }
+  else if (ok
+          && (win32_gc->values_mask & GDK_GC_CLIP_MASK)
+          && win32_gc->hcliprgn != NULL)
     {
-      if (gc_private->values_mask & (GDK_GC_CLIP_X_ORIGIN | GDK_GC_CLIP_Y_ORIGIN))
-       OffsetRgn (gc_private->clip_region,
-                  gc_private->clip_x_origin, gc_private->clip_y_origin);
-      SelectClipRgn (gc_private->xgc, gc_private->clip_region);
+      if (SelectClipRgn (win32_gc->hdc, win32_gc->hcliprgn) == ERROR)
+       WIN32_API_FAILED ("SelectClipRgn"), ok = FALSE;
     }
 
-  return gc_private->xgc;
+  if (gdk_debug_flags & GDK_DEBUG_MISC)
+    {
+      HGDIOBJ obj;
+      LOGBRUSH logbrush;
+      EXTLOGPEN extlogpen;
+      HRGN hrgn;
+      RECT rect;
+
+      g_print ("gdk_win32_hdc_get: %d: %#x\n", win32_gc, win32_gc->hdc);
+      obj = GetCurrentObject (win32_gc->hdc, OBJ_BRUSH);
+      GetObject (obj, sizeof (LOGBRUSH), &logbrush);
+      g_print ("brush: style: %s color: %.06x hatch: %#x\n",
+              (logbrush.lbStyle == BS_HOLLOW ? "HOLLOW" :
+               (logbrush.lbStyle == BS_PATTERN ? "PATTERN" :
+                (logbrush.lbStyle == BS_SOLID ? "SOLID" :
+                 "???"))),
+              logbrush.lbColor,
+              logbrush.lbHatch);
+      obj = GetCurrentObject (win32_gc->hdc, OBJ_PEN);
+      GetObject (obj, sizeof (EXTLOGPEN), &extlogpen);
+      g_print ("pen: type: %s style: %s endcap: %s join: %s width: %d brush: %s\n",
+              ((extlogpen.elpPenStyle & PS_TYPE_MASK) ==
+               PS_GEOMETRIC ? "GEOMETRIC" : "COSMETIC"),
+              ((extlogpen.elpPenStyle & PS_STYLE_MASK) ==
+               PS_NULL ? "NULL" :
+               ((extlogpen.elpPenStyle & PS_STYLE_MASK) ==
+                PS_SOLID ? "SOLID" : "???")),
+              ((extlogpen.elpPenStyle & PS_ENDCAP_MASK) ==
+               PS_ENDCAP_FLAT ? "FLAT" :
+               ((extlogpen.elpPenStyle & PS_ENDCAP_MASK) ==
+                PS_ENDCAP_ROUND ? "ROUND" :
+                ((extlogpen.elpPenStyle & PS_ENDCAP_MASK) ==
+                 PS_ENDCAP_SQUARE ? "ROUND" :
+                 ((extlogpen.elpPenStyle & PS_ENDCAP_MASK) ==
+                  PS_ENDCAP_SQUARE ? "ROUND" : "???")))),
+              ((extlogpen.elpPenStyle & PS_JOIN_MASK) ==
+               PS_JOIN_BEVEL ? "BEVEL" :
+               ((extlogpen.elpPenStyle & PS_JOIN_MASK) ==
+                PS_JOIN_MITER ? "MITER" :
+                ((extlogpen.elpPenStyle & PS_JOIN_MASK) ==
+                 PS_JOIN_ROUND ? "ROUND" : "???"))),
+              extlogpen.elpWidth,
+              (extlogpen.elpBrushStyle == BS_DIBPATTERN ? "DIBPATTERN" :
+               (extlogpen.elpBrushStyle == BS_DIBPATTERNPT ? "DIBPATTERNPT" :
+                (extlogpen.elpBrushStyle == BS_HATCHED ? "HATCHED" :
+                 (extlogpen.elpBrushStyle == BS_HOLLOW ? "HOLLOW" :
+                  (extlogpen.elpBrushStyle == BS_PATTERN ? "PATTERN" :
+                   (extlogpen.elpBrushStyle == BS_SOLID ? "SOLID" : "???")))))));
+      hrgn = CreateRectRgn (0, 0, 0, 0);
+      if ((flag = GetClipRgn (win32_gc->hdc, hrgn)) == -1)
+       WIN32_API_FAILED ("GetClipRgn");
+      else if (flag == 0)
+       g_print ("no clip region\n");
+      else if (flag == 1)
+       {
+         GetRgnBox (hrgn, &rect);
+         g_print ("clip region bbox: %dx%d@+%d+%d\n",
+                  rect.right - rect.left,
+                  rect.bottom - rect.top,
+                  rect.left, rect.top);
+       }
+    }
+
+  return win32_gc->hdc;
 }
 
 void
-gdk_gc_postdraw (GdkDrawable  *drawable_private,
-                GdkGCPrivate *gc_private)
+gdk_win32_hdc_release (GdkDrawable    *drawable,
+                      GdkGC          *gc,
+                      GdkGCValuesMask usage)
 {
-  GdkDrawablePrivate *drawable_private = (GdkDrawablePrivate *) drawable;
-  GdkColormapPrivate *colormap_private =
-    (GdkColormapPrivate *) drawable_private->colormap;
-  HGDIOBJ hpen;
-  HGDIOBJ hbr;
+  GdkGCWin32 *win32_gc = (GdkGCWin32 *) gc;
+  HGDIOBJ hpen = NULL;
+  HGDIOBJ hbr = NULL;
 
-  if ((hpen = GetCurrentObject (gc_private->xgc, OBJ_PEN)) == NULL)
-    g_warning ("gdk_gc_postdraw: GetCurrentObject #1 failed");
+  if (usage & GDK_GC_FOREGROUND)
+    {
+      if ((hpen = GetCurrentObject (win32_gc->hdc, OBJ_PEN)) == NULL)
+       WIN32_GDI_FAILED ("GetCurrentObject");
 
-  if ((hbr = GetCurrentObject (gc_private->xgc, OBJ_BRUSH)) == NULL)
-    g_warning ("gdk_gc_postdraw: GetCurrentObject #2 failed");
+      if ((hbr = GetCurrentObject (win32_gc->hdc, OBJ_BRUSH)) == NULL)
+       WIN32_GDI_FAILED ("GetCurrentObject");
+    }
 
-  if (!RestoreDC (gc_private->xgc, gc_private->saved_dc))
-    g_warning ("gdk_gc_postdraw: RestoreDC failed");
+  if (!RestoreDC (win32_gc->hdc, win32_gc->saved_dc))
+    WIN32_GDI_FAILED ("RestoreDC");
 #if 0
   if (colormap_private != NULL
       && colormap_private->xcolormap->rc_palette
       && colormap_private->xcolormap->stale)
     {
-      SelectPalette (gc_private->xgc, GetStockObject (DEFAULT_PALETTE), FALSE);
+      SelectPalette (win32_gc->hdc, GetStockObject (DEFAULT_PALETTE), FALSE);
       if (!UnrealizeObject (colormap_private->xcolormap->palette))
-       g_warning ("gdk_gc_postraw: UnrealizeObject failed");
+       WIN32_GDI_FAILED ("UnrealizeObject");
     }
 #endif
-  if (GDK_DRAWABLE_TYPE (drawable) == GDK_DRAWABLE_PIXMAP)
+  if (GDK_IS_PIXMAP_IMPL_WIN32 (drawable))
     {
-      if (!DeleteDC (gc_private->xgc))
-       g_warning ("gdk_gc_postdraw: DeleteDC failed");
+      if (!DeleteDC (win32_gc->hdc))
+       WIN32_GDI_FAILED ("DeleteDC");
     }
   else
     {
-      ReleaseDC (gc_private->hwnd, gc_private->xgc);
+      ReleaseDC (win32_gc->hwnd, win32_gc->hdc);
     }
 
   if (hpen != NULL)
     if (!DeleteObject (hpen))
-      g_warning ("gdk_gc_postdraw: DeleteObject #1 failed");
+      WIN32_GDI_FAILED ("DeleteObject");
   
   if (hbr != NULL)
     if (!DeleteObject (hbr))
-      g_warning ("gdk_gc_postdraw: DeleteObject #2 failed");
+      WIN32_GDI_FAILED ("DeleteObject");
 
-  gc_private->xgc = NULL;
+  win32_gc->hdc = NULL;
 }
 
 /* This function originally from Jean-Edouard Lachand-Robert, and
@@ -1208,14 +1238,14 @@ BitmapToRegion (HBITMAP hBmp)
        logpal.palPalEntry[1].peBlue = 0xFF;
       logpal.palPalEntry[1].peFlags = 0;
       if ((bwPalette = CreatePalette ((LOGPALETTE *) &logpal)) == NULL)
-       g_warning ("BitmapToRegion: CreatePalette failed");
+       WIN32_GDI_FAILED ("CreatePalette");
     }
 
   /* Create a memory DC inside which we will scan the bitmap content */
   hMemDC = CreateCompatibleDC (NULL);
   if (!hMemDC)
     {
-      g_warning ("BitmapToRegion: CreateCompatibleDC #1 failed");
+      WIN32_GDI_FAILED ("CreateCompatibleDC");
       return NULL;
     }
 
@@ -1258,7 +1288,7 @@ BitmapToRegion (HBITMAP hBmp)
 #endif
   if (!hbm8)
     {
-      g_warning ("BitmapToRegion: CreateDIBSection failed");
+      WIN32_GDI_FAILED ("CreateDIBSection");
       DeleteDC (hMemDC);
       return NULL;
     }
@@ -1269,7 +1299,7 @@ BitmapToRegion (HBITMAP hBmp)
   hDC = CreateCompatibleDC (hMemDC);
   if (!hDC)
     {
-      g_warning ("BitmapToRegion: CreateCompatibleDC #2 failed");
+      WIN32_GDI_FAILED ("CreateCompatibleDC");
       SelectObject (hMemDC, holdBmp);
       DeleteObject (hbm8);
       DeleteDC (hMemDC);
@@ -1293,7 +1323,7 @@ BitmapToRegion (HBITMAP hBmp)
 
   if (!BitBlt (hMemDC, 0, 0, bm.bmWidth, bm.bmHeight, hDC, 0, 0, SRCCOPY))
     {
-      g_warning ("BitmapToRegion: BitBlt failed");
+      WIN32_GDI_FAILED ("BitBlt");
       SelectObject (hDC, holdBmp2);
       SelectObject (hMemDC, holdBmp);
       DeleteObject (hbm8);