Fix two copy&paste errors.

1999-11-25  Tor Lillqvist  <tml@iki.fi>

* gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin):
Fix two copy&paste errors.

* gdk/makefile.cygwin: Also rebuild DLL when the static archive in
win32 has changed.

* gdk/win32/gdkprivate-win32.h: Don't need CPINFO in the
GdkWin32SingleFont struct.

* gdk/win32/gdkfont-win32.c: Some more debugging: Print Unicode
subranges of loaded fonts. Clear font signature first, in case
GetTextCharsetInfo fails. Pretend SYMBOL_CHARSET fonts have
ASCII+Basic Latin (i.e. 0x40--0xFF) as they are single-byte.

* gdk/win32/gdkgc-win32.c: Improved logging. (gdk_gc_postdraw):
Unoffset clip region.

diff --git a/ChangeLog b/ChangeLog
index a82226b070b3d3400c6f12b140a851cd055ec6e1..7f84fcd01832e30827968279df5cb6f244141595 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+1999-11-25  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): 
+       Fix two copy&paste errors.
+
+       * gdk/makefile.cygwin: Also rebuild DLL when the static archive in
+       win32 has changed.
+
+       * gdk/win32/gdkprivate-win32.h: Don't need CPINFO in the
+       GdkWin32SingleFont struct.
+
+       * gdk/win32/gdkfont-win32.c: Some more debugging: Print Unicode
+       subranges of loaded fonts. Clear font signature first, in case
+       GetTextCharsetInfo fails. Pretend SYMBOL_CHARSET fonts have
+       ASCII+Basic Latin (i.e. 0x40--0xFF) as they are single-byte.
+
+       * gdk/win32/gdkgc-win32.c: Improved logging. (gdk_gc_postdraw):
+       Unoffset clip region.
+
 1999-11-23  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (gdk_event_translate): set

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a82226b070b3d3400c6f12b140a851cd055ec6e1..7f84fcd01832e30827968279df5cb6f244141595 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,22 @@
+1999-11-25  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): 
+       Fix two copy&paste errors.
+
+       * gdk/makefile.cygwin: Also rebuild DLL when the static archive in
+       win32 has changed.
+
+       * gdk/win32/gdkprivate-win32.h: Don't need CPINFO in the
+       GdkWin32SingleFont struct.
+
+       * gdk/win32/gdkfont-win32.c: Some more debugging: Print Unicode
+       subranges of loaded fonts. Clear font signature first, in case
+       GetTextCharsetInfo fails. Pretend SYMBOL_CHARSET fonts have
+       ASCII+Basic Latin (i.e. 0x40--0xFF) as they are single-byte.
+
+       * gdk/win32/gdkgc-win32.c: Improved logging. (gdk_gc_postdraw):
+       Unoffset clip region.
+
 1999-11-23  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (gdk_event_translate): set

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a82226b070b3d3400c6f12b140a851cd055ec6e1..7f84fcd01832e30827968279df5cb6f244141595 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,22 @@
+1999-11-25  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): 
+       Fix two copy&paste errors.
+
+       * gdk/makefile.cygwin: Also rebuild DLL when the static archive in
+       win32 has changed.
+
+       * gdk/win32/gdkprivate-win32.h: Don't need CPINFO in the
+       GdkWin32SingleFont struct.
+
+       * gdk/win32/gdkfont-win32.c: Some more debugging: Print Unicode
+       subranges of loaded fonts. Clear font signature first, in case
+       GetTextCharsetInfo fails. Pretend SYMBOL_CHARSET fonts have
+       ASCII+Basic Latin (i.e. 0x40--0xFF) as they are single-byte.
+
+       * gdk/win32/gdkgc-win32.c: Improved logging. (gdk_gc_postdraw):
+       Unoffset clip region.
+
 1999-11-23  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (gdk_event_translate): set

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a82226b070b3d3400c6f12b140a851cd055ec6e1..7f84fcd01832e30827968279df5cb6f244141595 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,22 @@
+1999-11-25  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): 
+       Fix two copy&paste errors.
+
+       * gdk/makefile.cygwin: Also rebuild DLL when the static archive in
+       win32 has changed.
+
+       * gdk/win32/gdkprivate-win32.h: Don't need CPINFO in the
+       GdkWin32SingleFont struct.
+
+       * gdk/win32/gdkfont-win32.c: Some more debugging: Print Unicode
+       subranges of loaded fonts. Clear font signature first, in case
+       GetTextCharsetInfo fails. Pretend SYMBOL_CHARSET fonts have
+       ASCII+Basic Latin (i.e. 0x40--0xFF) as they are single-byte.
+
+       * gdk/win32/gdkgc-win32.c: Improved logging. (gdk_gc_postdraw):
+       Unoffset clip region.
+
 1999-11-23  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (gdk_event_translate): set

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a82226b070b3d3400c6f12b140a851cd055ec6e1..7f84fcd01832e30827968279df5cb6f244141595 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,22 @@
+1999-11-25  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): 
+       Fix two copy&paste errors.
+
+       * gdk/makefile.cygwin: Also rebuild DLL when the static archive in
+       win32 has changed.
+
+       * gdk/win32/gdkprivate-win32.h: Don't need CPINFO in the
+       GdkWin32SingleFont struct.
+
+       * gdk/win32/gdkfont-win32.c: Some more debugging: Print Unicode
+       subranges of loaded fonts. Clear font signature first, in case
+       GetTextCharsetInfo fails. Pretend SYMBOL_CHARSET fonts have
+       ASCII+Basic Latin (i.e. 0x40--0xFF) as they are single-byte.
+
+       * gdk/win32/gdkgc-win32.c: Improved logging. (gdk_gc_postdraw):
+       Unoffset clip region.
+
 1999-11-23  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (gdk_event_translate): set

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a82226b070b3d3400c6f12b140a851cd055ec6e1..7f84fcd01832e30827968279df5cb6f244141595 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,22 @@
+1999-11-25  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): 
+       Fix two copy&paste errors.
+
+       * gdk/makefile.cygwin: Also rebuild DLL when the static archive in
+       win32 has changed.
+
+       * gdk/win32/gdkprivate-win32.h: Don't need CPINFO in the
+       GdkWin32SingleFont struct.
+
+       * gdk/win32/gdkfont-win32.c: Some more debugging: Print Unicode
+       subranges of loaded fonts. Clear font signature first, in case
+       GetTextCharsetInfo fails. Pretend SYMBOL_CHARSET fonts have
+       ASCII+Basic Latin (i.e. 0x40--0xFF) as they are single-byte.
+
+       * gdk/win32/gdkgc-win32.c: Improved logging. (gdk_gc_postdraw):
+       Unoffset clip region.
+
 1999-11-23  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (gdk_event_translate): set

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a82226b070b3d3400c6f12b140a851cd055ec6e1..7f84fcd01832e30827968279df5cb6f244141595 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,22 @@
+1999-11-25  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): 
+       Fix two copy&paste errors.
+
+       * gdk/makefile.cygwin: Also rebuild DLL when the static archive in
+       win32 has changed.
+
+       * gdk/win32/gdkprivate-win32.h: Don't need CPINFO in the
+       GdkWin32SingleFont struct.
+
+       * gdk/win32/gdkfont-win32.c: Some more debugging: Print Unicode
+       subranges of loaded fonts. Clear font signature first, in case
+       GetTextCharsetInfo fails. Pretend SYMBOL_CHARSET fonts have
+       ASCII+Basic Latin (i.e. 0x40--0xFF) as they are single-byte.
+
+       * gdk/win32/gdkgc-win32.c: Improved logging. (gdk_gc_postdraw):
+       Unoffset clip region.
+
 1999-11-23  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (gdk_event_translate): set

diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c
index 05b7d96a530780ad3deca0aed421e01db9f659d1..557828251e5ae102cc2a0bb530d1ba1b9c34dbaf 100644 (file)
--- a/gdk/gdkgc.c
+++ b/gdk/gdkgc.c
@@ -211,7 +211,7 @@ gdk_gc_set_ts_origin (GdkGC *gc,
   g_return_if_fail (gc != NULL);
 
   values.ts_x_origin = x;
-  values.ts_x_origin = y;
+  values.ts_y_origin = y;
   
   gdk_gc_set_values (gc, &values,
                     GDK_GC_TS_X_ORIGIN | GDK_GC_TS_Y_ORIGIN);
@@ -227,7 +227,7 @@ gdk_gc_set_clip_origin (GdkGC *gc,
   g_return_if_fail (gc != NULL);
 
   values.clip_x_origin = x;
-  values.clip_x_origin = y;
+  values.clip_y_origin = y;
   
   gdk_gc_set_values (gc, &values,
                     GDK_GC_CLIP_X_ORIGIN | GDK_GC_CLIP_Y_ORIGIN);

diff --git a/gdk/makefile.cygwin b/gdk/makefile.cygwin
index fe4de922be405871ee8b4d8b4c7cfc59e558e1a7..3bb8f57856386bc93f2d40a4910ad162b996f1b6 100644 (file)
--- a/gdk/makefile.cygwin
+++ b/gdk/makefile.cygwin
@@ -47,7 +47,7 @@ gdk_OBJECTS = \
 gdkconfig.h : gdkconfig.h.win32
        $(CP) gdkconfig.h.win32 gdkconfig.h
 
-gdk-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def
+gdk-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def win32/libgdk-win32.a
        $(GLIB)/build-dll gdk $(GTK_VER) gdk.def $(gdk_OBJECTS) -L win32 -lgdk-win32 -lwntab32x -L $(GLIB) -lglib-$(GLIB_VER) -lgdi32 -luser32 -limm32 -lshell32 -lole32 -luuid $(LDFLAGS) win32/gdk-win32res.o 
 
 .SUFFIXES: .c .o .i

diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c
index 994ac9d8f39d1ac954d9716a1e84c39928359a1f..ca3d7b1074b90338ae8d235d276272df4e020fe3 100644 (file)
--- a/gdk/win32/gdkfont-win32.c
+++ b/gdk/win32/gdkfont-win32.c
@@ -438,6 +438,112 @@ gdk_font_list_free (gchar **font_list)
   g_strfreev (font_list);
 }
 
+/* This table classifies Unicode characters according to the Microsoft
+ * Unicode subset numbering. This is from the table in "Developing
+ * International Software for Windows 95 and Windows NT". This is almost,
+ * but not quite, the same as the official Unicode block table in
+ * Blocks.txt from ftp.unicode.org. The bit number field is the bitfield
+ * number as in the FONTSIGNATURE struct's fsUsb field.
+ */
+static struct {
+  wchar_t low, high;
+  guint bit; 
+  gchar *name;
+} utab[] =
+{
+  { 0x0000, 0x007E, 0, "Basic Latin" },
+  { 0x00A0, 0x00FF, 1, "Latin-1 Supplement" },
+  { 0x0100, 0x017F, 2, "Latin Extended-A" },
+  { 0x0180, 0x024F, 3, "Latin Extended-B" },
+  { 0x0250, 0x02AF, 4, "IPA Extensions" },
+  { 0x02B0, 0x02FF, 5, "Spacing Modifier Letters" },
+  { 0x0300, 0x036F, 6, "Combining Diacritical Marks" },
+  { 0x0370, 0x03CF, 7, "Basic Greek" },
+  { 0x03D0, 0x03FF, 8, "Greek Symbols and Coptic" },
+  { 0x0400, 0x04FF, 9, "Cyrillic" },
+  { 0x0530, 0x058F, 10, "Armenian" },
+  { 0x0590, 0x05CF, 12, "Hebrew Extended" },
+  { 0x05D0, 0x05FF, 11, "Basic Hebrew" },
+  { 0x0600, 0x0652, 13, "Basic Arabic" },
+  { 0x0653, 0x06FF, 14, "Arabic Extended" },
+  { 0x0900, 0x097F, 15, "Devanagari" },
+  { 0x0980, 0x09FF, 16, "Bengali" },
+  { 0x0A00, 0x0A7F, 17, "Gurmukhi" },
+  { 0x0A80, 0x0AFF, 18, "Gujarati" },
+  { 0x0B00, 0x0B7F, 19, "Oriya" },
+  { 0x0B80, 0x0BFF, 20, "Tamil" },
+  { 0x0C00, 0x0C7F, 21, "Telugu" },
+  { 0x0C80, 0x0CFF, 22, "Kannada" },
+  { 0x0D00, 0x0D7F, 23, "Malayalam" },
+  { 0x0E00, 0x0E7F, 24, "Thai" },
+  { 0x0E80, 0x0EFF, 25, "Lao" },
+  { 0x10A0, 0x10CF, 27, "Georgian Extended" },
+  { 0x10D0, 0x10FF, 26, "Basic Georgian" },
+  { 0x1100, 0x11FF, 28, "Hangul Jamo" },
+  { 0x1E00, 0x1EFF, 29, "Latin Extended Additional" },
+  { 0x1F00, 0x1FFF, 30, "Greek Extended" },
+  { 0x2000, 0x206F, 31, "General Punctuation" },
+  { 0x2070, 0x209F, 32, "Superscripts and Subscripts" },
+  { 0x20A0, 0x20CF, 33, "Currency Symbols" },
+  { 0x20D0, 0x20FF, 34, "Combining Diacritical Marks for Symbols" },
+  { 0x2100, 0x214F, 35, "Letterlike Symbols" },
+  { 0x2150, 0x218F, 36, "Number Forms" },
+  { 0x2190, 0x21FF, 37, "Arrows" },
+  { 0x2200, 0x22FF, 38, "Mathematical Operators" },
+  { 0x2300, 0x23FF, 39, "Miscellaneous Technical" },
+  { 0x2400, 0x243F, 40, "Control Pictures" },
+  { 0x2440, 0x245F, 41, "Optical Character Recognition" },
+  { 0x2460, 0x24FF, 42, "Enclosed Alphanumerics" },
+  { 0x2500, 0x257F, 43, "Box Drawing" },
+  { 0x2580, 0x259F, 44, "Block Elements" },
+  { 0x25A0, 0x25FF, 45, "Geometric Shapes" },
+  { 0x2600, 0x26FF, 46, "Miscellaneous Symbols" },
+  { 0x2700, 0x27BF, 47, "Dingbats" },
+  { 0x3000, 0x303F, 48, "CJK Symbols and Punctuation" },
+  { 0x3040, 0x309F, 49, "Hiragana" },
+  { 0x30A0, 0x30FF, 50, "Katakana" },
+  { 0x3100, 0x312F, 51, "Bopomofo" },
+  { 0x3130, 0x318F, 52, "Hangul Compatibility Jamo" },
+  { 0x3190, 0x319F, 53, "CJK Miscellaneous" },
+  { 0x3200, 0x32FF, 54, "Enclosed CJK" },
+  { 0x3300, 0x33FF, 55, "CJK Compatibility" },
+  { 0x3400, 0x3D2D, 56, "Hangul" },
+  { 0x3D2E, 0x44B7, 57, "Hangul Supplementary-A" },
+  { 0x44B8, 0x4DFF, 58, "Hangul Supplementary-B" },
+  { 0x4E00, 0x9FFF, 59, "CJK Unified Ideographs" },
+  { 0xE000, 0xF8FF, 60, "Private Use Area" },
+  { 0xF900, 0xFAFF, 61, "CJK Compatibility Ideographs" },
+  { 0xFB00, 0xFB4F, 62, "Alphabetic Presentation Forms" },
+  { 0xFB50, 0xFDFF, 63, "Arabic Presentation Forms-A" },
+  { 0xFE20, 0xFE2F, 64, "Combining Half Marks" },
+  { 0xFE30, 0xFE4F, 65, "CJK Compatibility Forms" },
+  { 0xFE50, 0xFE6F, 66, "Small Form Variants" },
+  { 0xFE70, 0xFEFE, 67, "Arabic Presentation Forms-B" },
+  { 0xFEFF, 0xFEFF, 69, "Specials" },
+  { 0xFF00, 0xFFEF, 68, "Halfwidth and Fullwidth Forms" },
+  { 0xFFF0, 0xFFFD, 69, "Specials" }
+};
+
+static void
+print_unicode_subranges (FONTSIGNATURE *fsp)
+{
+  int i;
+  gboolean checked[sizeof (utab) / sizeof (utab[0])];
+  gboolean need_comma = FALSE;
+
+  memset (checked, 0, sizeof (checked));
+
+  for (i = 0; i < sizeof (utab) / sizeof (utab[0]); i++)
+    if (!checked[i]
+       && (fsp->fsUsb[utab[i].bit/32] & (1 << (utab[i].bit % 32))))
+      {
+       g_print ("%s %s", (need_comma ? "," : ""), utab[i].name);
+       need_comma = TRUE;
+       checked[i] = TRUE;
+      }
+  g_print ("\n");
+}
+
 GdkWin32SingleFont*
 gdk_font_load_internal (const gchar *font_name)
 {
@@ -447,6 +553,7 @@ gdk_font_load_internal (const gchar *font_name)
   CHARSETINFO csi;
   DWORD fdwItalic, fdwUnderline, fdwStrikeOut, fdwCharSet,
     fdwOutputPrecision, fdwClipPrecision, fdwQuality, fdwPitchAndFamily;
+  HGDIOBJ oldfont;
   const char *lpszFace;
 
   int numfields, n1, n2, tries;
@@ -745,9 +852,20 @@ gdk_font_load_internal (const gchar *font_name)
   singlefont = g_new (GdkWin32SingleFont, 1);
   singlefont->xfont = hfont;
   GetObject (singlefont->xfont, sizeof (logfont), &logfont);
-  TranslateCharsetInfo ((DWORD *) singlefont->charset, &csi, TCI_SRCCHARSET);
-  singlefont->codepage = csi.ciACP;
-  GetCPInfo (singlefont->codepage, &singlefont->cpinfo);
+  if (TranslateCharsetInfo ((DWORD *) singlefont->charset, &csi,
+                           TCI_SRCCHARSET))
+    singlefont->codepage = csi.ciACP;
+  else
+    singlefont->codepage = 0;
+  oldfont = SelectObject (gdk_DC, singlefont->xfont);
+  memset (&singlefont->fs, 0, sizeof (singlefont->fs));
+  singlefont->charset = GetTextCharsetInfo (gdk_DC, &singlefont->fs, 0);
+  if (singlefont->charset == SYMBOL_CHARSET)
+    {
+      /* SYMBOL_CHARSET is single-byte, so let's pretend it's ASCII+Latin-1 */
+      singlefont->fs.fsUsb[0] = (1 << 0) | (1 << 1);
+    }
+  SelectObject (gdk_DC, oldfont);
 
   return singlefont;
 }
@@ -784,17 +902,18 @@ gdk_font_load (const gchar *font_name)
   font->type = GDK_FONT_FONTSET;
   oldfont = SelectObject (gdk_DC, singlefont->xfont);
   GetTextMetrics (gdk_DC, &textmetric);
-  singlefont->charset = GetTextCharsetInfo (gdk_DC, &singlefont->fs, 0);
   SelectObject (gdk_DC, oldfont);
   font->ascent = textmetric.tmAscent;
   font->descent = textmetric.tmDescent;
 
-  GDK_NOTE (MISC, g_print ("... = %#x charset %s codepage %d "
-                          "asc %d desc %d\n",
-                          singlefont->xfont,
-                          charset_name (singlefont->charset),
-                          singlefont->codepage,
-                          font->ascent, font->descent));
+  GDK_NOTE (MISC, (g_print ("... = %#x charset %s cp%d "
+                           "asc %d desc %d\n",
+                           singlefont->xfont,
+                           charset_name (singlefont->charset),
+                           singlefont->codepage,
+                           font->ascent, font->descent),
+                  g_print ("... Unicode subranges:"),
+                  print_unicode_subranges (&singlefont->fs)));
 
   gdk_font_hash_insert (GDK_FONT_FONTSET, font, font_name);
 
@@ -851,15 +970,15 @@ gdk_fontset_load (gchar *fontset_name)
       if (singlefont)
        {
          GDK_NOTE
-           (MISC, g_print ("... = %#x charset %s codepage %d\n",
-                           singlefont->xfont,
-                           charset_name (singlefont->charset),
-                           singlefont->codepage));
+           (MISC, (g_print ("... = %#x charset %s cp%d\n",
+                            singlefont->xfont,
+                            charset_name (singlefont->charset),
+                            singlefont->codepage),
+                   g_print (" ... Unicode subranges:"),
+                   print_unicode_subranges (&singlefont->fs)));
          private->fonts = g_slist_append (private->fonts, singlefont);
          oldfont = SelectObject (gdk_DC, singlefont->xfont);
          GetTextMetrics (gdk_DC, &textmetric);
-         singlefont->charset =
-           GetTextCharsetInfo (gdk_DC, &singlefont->fs, 0);
          SelectObject (gdk_DC, oldfont);
          font->ascent = MAX (font->ascent, textmetric.tmAscent);
          font->descent = MAX (font->descent, textmetric.tmDescent);
@@ -980,92 +1099,6 @@ gdk_font_equal (const GdkFont *fonta,
     return 0;
 }
 
-/* This table classifies Unicode characters according to the Microsoft
- * Unicode subset numbering. This is from the table in "Developing
- * International Software for Windows 95 and Windows NT". This is almost,
- * but not quite, the same as the official Unicode block table in
- * Blocks.txt from ftp.unicode.org. The bit number field is the bitfield
- * number as in the FONTSIGNATURE struct's fsUsb field.
- */
-static struct {
-  wchar_t low, high;
-  guint bit; 
-  gchar *name;
-} utab[] =
-{
-  { 0x0000, 0x007E, 0, "Basic Latin" },
-  { 0x00A0, 0x00FF, 1, "Latin-1 Supplement" },
-  { 0x0100, 0x017F, 2, "Latin Extended-A" },
-  { 0x0180, 0x024F, 3, "Latin Extended-B" },
-  { 0x0250, 0x02AF, 4, "IPA Extensions" },
-  { 0x02B0, 0x02FF, 5, "Spacing Modifier Letters" },
-  { 0x0300, 0x036F, 6, "Combining Diacritical Marks" },
-  { 0x0370, 0x03CF, 7, "Basic Greek" },
-  { 0x03D0, 0x03FF, 8, "Greek Symbols and Coptic" },
-  { 0x0400, 0x04FF, 9, "Cyrillic" },
-  { 0x0530, 0x058F, 10, "Armenian" },
-  { 0x0590, 0x05CF, 12, "Hebrew Extended" },
-  { 0x05D0, 0x05FF, 11, "Basic Hebrew" },
-  { 0x0600, 0x0652, 13, "Basic Arabic" },
-  { 0x0653, 0x06FF, 14, "Arabic Extended" },
-  { 0x0900, 0x097F, 15, "Devanagari" },
-  { 0x0980, 0x09FF, 16, "Bengali" },
-  { 0x0A00, 0x0A7F, 17, "Gurmukhi" },
-  { 0x0A80, 0x0AFF, 18, "Gujarati" },
-  { 0x0B00, 0x0B7F, 19, "Oriya" },
-  { 0x0B80, 0x0BFF, 20, "Tamil" },
-  { 0x0C00, 0x0C7F, 21, "Telugu" },
-  { 0x0C80, 0x0CFF, 22, "Kannada" },
-  { 0x0D00, 0x0D7F, 23, "Malayalam" },
-  { 0x0E00, 0x0E7F, 24, "Thai" },
-  { 0x0E80, 0x0EFF, 25, "Lao" },
-  { 0x10A0, 0x10CF, 27, "Georgian Extended" },
-  { 0x10D0, 0x10FF, 26, "Basic Georgian" },
-  { 0x1100, 0x11FF, 28, "Hangul Jamo" },
-  { 0x1E00, 0x1EFF, 29, "Latin Extended Additional" },
-  { 0x1F00, 0x1FFF, 30, "Greek Extended" },
-  { 0x2000, 0x206F, 31, "General Punctuation" },
-  { 0x2070, 0x209F, 32, "Superscripts and Subscripts" },
-  { 0x20A0, 0x20CF, 33, "Currency Symbols" },
-  { 0x20D0, 0x20FF, 34, "Combining Diacritical Marks for Symbols" },
-  { 0x2100, 0x214F, 35, "Letterlike Symbols" },
-  { 0x2150, 0x218F, 36, "Number Forms" },
-  { 0x2190, 0x21FF, 37, "Arrows" },
-  { 0x2200, 0x22FF, 38, "Mathematical Operators" },
-  { 0x2300, 0x23FF, 39, "Miscellaneous Technical" },
-  { 0x2400, 0x243F, 40, "Control Pictures" },
-  { 0x2440, 0x245F, 41, "Optical Character Recognition" },
-  { 0x2460, 0x24FF, 42, "Enclosed Alphanumerics" },
-  { 0x2500, 0x257F, 43, "Box Drawing" },
-  { 0x2580, 0x259F, 44, "Block Elements" },
-  { 0x25A0, 0x25FF, 45, "Geometric Shapes" },
-  { 0x2600, 0x26FF, 46, "Miscellaneous Symbols" },
-  { 0x2700, 0x27BF, 47, "Dingbats" },
-  { 0x3000, 0x303F, 48, "CJK Symbols and Punctuation" },
-  { 0x3040, 0x309F, 49, "Hiragana" },
-  { 0x30A0, 0x30FF, 50, "Katakana" },
-  { 0x3100, 0x312F, 51, "Bopomofo" },
-  { 0x3130, 0x318F, 52, "Hangul Compatibility Jamo" },
-  { 0x3190, 0x319F, 53, "CJK Miscellaneous" },
-  { 0x3200, 0x32FF, 54, "Enclosed CJK" },
-  { 0x3300, 0x33FF, 55, "CJK Compatibility" },
-  { 0x3400, 0x3D2D, 56, "Hangul" },
-  { 0x3D2E, 0x44B7, 57, "Hangul Supplementary-A" },
-  { 0x44B8, 0x4DFF, 58, "Hangul Supplementary-B" },
-  { 0x4E00, 0x9FFF, 59, "CJK Unified Ideographs" },
-  { 0xE000, 0xF8FF, 60, "Private Use Area" },
-  { 0xF900, 0xFAFF, 61, "CJK Compatibility Ideographs" },
-  { 0xFB00, 0xFB4F, 62, "Alphabetic Presentation Forms" },
-  { 0xFB50, 0xFDFF, 63, "Arabic Presentation Forms-A" },
-  { 0xFE20, 0xFE2F, 64, "Combining Half Marks" },
-  { 0xFE30, 0xFE4F, 65, "CJK Compatibility Forms" },
-  { 0xFE50, 0xFE6F, 66, "Small Form Variants" },
-  { 0xFE70, 0xFEFE, 67, "Arabic Presentation Forms-B" },
-  { 0xFEFF, 0xFEFF, 69, "Specials" },
-  { 0xFF00, 0xFFEF, 68, "Halfwidth and Fullwidth Forms" },
-  { 0xFFF0, 0xFFFD, 69, "Specials" }
-};
-
 /* Return the Unicode Subset bitfield number for a Unicode character */
 
 static int

diff --git a/gdk/win32/gdkgc-win32.c b/gdk/win32/gdkgc-win32.c
index 9521be9886303efe139fb331a181bf5e054ef114..3afda1b193feaf5ffb4da4efed36fda0a88fc4eb 100644 (file)
--- a/gdk/win32/gdkgc-win32.c
+++ b/gdk/win32/gdkgc-win32.c
@@ -551,11 +551,13 @@ gdk_win32_gc_set_values (GdkGC           *gc,
          data->clip_region =
            BitmapToRegion (GDK_DRAWABLE_XID (values->clip_mask));
          data->values_mask |= GDK_GC_CLIP_MASK;
+         GDK_NOTE (MISC, g_print (" clip=%#x", data->clip_region));
        }
       else
        {
          data->clip_region = NULL;
          data->values_mask &= ~GDK_GC_CLIP_MASK;
+         GDK_NOTE (MISC, g_print (" clip=NULL"));
        }
     }
 
@@ -568,24 +570,28 @@ gdk_win32_gc_set_values (GdkGC           *gc,
     {
       data->ts_x_origin = values->ts_x_origin;
       data->values_mask |= GDK_GC_TS_X_ORIGIN;
+      GDK_NOTE (MISC, g_print (" ts_x=%d", data->ts_x_origin));
     }
   
   if (values_mask & GDK_GC_TS_Y_ORIGIN)
     {
       data->ts_y_origin = values->ts_y_origin;
       data->values_mask |= GDK_GC_TS_Y_ORIGIN;
+      GDK_NOTE (MISC, g_print (" ts_y=%d", data->ts_y_origin));
     }
   
   if (values_mask & GDK_GC_CLIP_X_ORIGIN)
     {
       data->clip_x_origin = values->clip_x_origin;
       data->values_mask |= GDK_GC_CLIP_X_ORIGIN;
+      GDK_NOTE (MISC, g_print (" clip_x=%d", data->clip_x_origin));
     }
   
   if (values_mask & GDK_GC_CLIP_Y_ORIGIN)
     {
       data->clip_y_origin = values->clip_y_origin;
       data->values_mask |= GDK_GC_CLIP_Y_ORIGIN;
+      GDK_NOTE (MISC, g_print (" clip_y=%d", data->clip_y_origin));
     }
   
   if (values_mask & GDK_GC_EXPOSURES)
@@ -597,6 +603,7 @@ gdk_win32_gc_set_values (GdkGC           *gc,
     {
       data->pen_width = values->line_width;
       data->values_mask |= GDK_GC_LINE_WIDTH;
+      GDK_NOTE (MISC, g_print (" pen_width=%d", data->pen_width));
     }
 
   if (values_mask & GDK_GC_LINE_STYLE)
@@ -611,6 +618,8 @@ gdk_win32_gc_set_values (GdkGC           *gc,
          data->pen_style |= PS_DASH; break;
        }
       data->values_mask |= GDK_GC_LINE_STYLE;
+      GDK_NOTE (MISC, g_print (" line_style=%#x",
+                              (data->pen_style & PS_STYLE_MASK)));
     }
   
   if (values_mask & GDK_GC_CAP_STYLE)
@@ -629,6 +638,8 @@ gdk_win32_gc_set_values (GdkGC           *gc,
          data->pen_style |= PS_ENDCAP_SQUARE; break;
        }
       data->values_mask |= GDK_GC_CAP_STYLE;
+      GDK_NOTE (MISC, g_print (" cap_style=%#x",
+                              (data->pen_style & PS_ENDCAP_MASK)));
     }
 
   if (values_mask & GDK_GC_JOIN_STYLE)
@@ -645,7 +656,10 @@ gdk_win32_gc_set_values (GdkGC           *gc,
          data->pen_style |= PS_JOIN_BEVEL; break;
        }
       data->values_mask |= GDK_GC_JOIN_STYLE;
+      GDK_NOTE (MISC, g_print (" join_style=%#x",
+                              (data->pen_style & PS_JOIN_MASK)));
     }
+  GDK_NOTE (MISC, g_print ("}\n"));
 }
 
 static void
@@ -697,7 +711,7 @@ gdk_gc_set_clip_rectangle (GdkGC    *gc,
       data->clip_region = NULL;
       data->values_mask &= ~GDK_GC_CLIP_MASK;
     }
-    data->values_mask &= ~(GDK_GC_CLIP_X_ORIGIN |GDK_GC_CLIP_Y_ORIGIN);
+    data->values_mask &= ~(GDK_GC_CLIP_X_ORIGIN | GDK_GC_CLIP_Y_ORIGIN);
 } 
 
 void
@@ -998,6 +1012,11 @@ gdk_gc_postdraw (GdkDrawable  *drawable,
     if (!DeleteObject (hbr))
       g_warning ("gdk_gc_postdraw: DeleteObject #2 failed");
 
+  if (data->values_mask & GDK_GC_CLIP_MASK
+      && data->clip_region != NULL
+      && (data->values_mask & (GDK_GC_CLIP_X_ORIGIN | GDK_GC_CLIP_Y_ORIGIN)))
+    OffsetRgn (data->clip_region,
+              -data->clip_x_origin, -data->clip_y_origin);
   data->xgc = NULL;
 }
 

diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index f85efa73b80b62285c453a5b937629c728460c27..7e0fb389f94788f440455214b90c862579b7aaba 100644 (file)
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -126,6 +126,7 @@ typedef struct _GdkDrawableWin32Data    GdkDrawableWin32Data;
 typedef struct _GdkWindowWin32Data      GdkWindowWin32Data;
 typedef struct _GdkColormapPrivateWin32 GdkColormapPrivateWin32;
 typedef struct _GdkCursorPrivate        GdkCursorPrivate;
+typedef struct _GdkWin32SingleFont      GdkWin32SingleFont;
 typedef struct _GdkFontPrivateWin32     GdkFontPrivateWin32;
 typedef struct _GdkImagePrivateWin32    GdkImagePrivateWin32;
 typedef struct _GdkVisualPrivate        GdkVisualPrivate;
@@ -215,19 +216,18 @@ struct _GdkCursorPrivate
   HCURSOR xcursor;
 };
 
-typedef struct
+struct _GdkWin32SingleFont
 {
   HFONT xfont;
   DWORD charset;
   UINT codepage;
-  CPINFO cpinfo;
   FONTSIGNATURE fs;
-} GdkWin32SingleFont;
+};
 
 struct _GdkFontPrivateWin32
 {
   GdkFontPrivate base;
-  GSList *fonts;               /* Points to a list of GdkWin32SingleFonts */
+  GSList *fonts;               /* List of GdkWin32SingleFonts */
   GSList *names;
 };
 
@@ -305,6 +305,7 @@ void gdk_wchar_text_handle       (GdkFont       *font,
                                  void          *arg);
 
 char *gdk_color_to_string        (const GdkColor *);
+void print_bitmap                (GdkBitmap *bm);
 
 extern LRESULT CALLBACK gdk_WindowProc (HWND, UINT, WPARAM, LPARAM);