New function. Guesstimate what Unicode subranges a font covers based on

1999-12-06  Tor Lillqvist  <tml@iki.fi>

* gdk/win32/gdkfont-win32.c (check_unicode_subranges): New
function. Guesstimate what Unicode subranges a font covers based
on the codepages. Windows tells us it covers. This will hopefully
help those Windows versions or fonts that don't give us any useful
Unicode subrange information with GetTextCharsetInfo. Call this
function in gdk_font_load_internal.

* gdk/win32/{gdkdnd,gdkimage,gdkpixmap,gdkprivate}-win32.c: Misc
minor changes.

ChangeLog

+1999-12-06  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkfont-win32.c (check_unicode_subranges): New
+	function. Guesstimate what Unicode subranges a font covers based
+	on the codepages. Windows tells us it covers. This will hopefully
+	help those Windows versions or fonts that don't give us any useful
+	Unicode subrange information with GetTextCharsetInfo. Call this
+	function in gdk_font_load_internal.
+
+	* gdk/win32/{gdkdnd,gdkimage,gdkpixmap,gdkprivate}-win32.c: Misc
+	minor changes.
+
 Fri Dec  3 14:09:50 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history):

ChangeLog.pre-2-0

+1999-12-06  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkfont-win32.c (check_unicode_subranges): New
+	function. Guesstimate what Unicode subranges a font covers based
+	on the codepages. Windows tells us it covers. This will hopefully
+	help those Windows versions or fonts that don't give us any useful
+	Unicode subrange information with GetTextCharsetInfo. Call this
+	function in gdk_font_load_internal.
+
+	* gdk/win32/{gdkdnd,gdkimage,gdkpixmap,gdkprivate}-win32.c: Misc
+	minor changes.
+
 Fri Dec  3 14:09:50 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history):

ChangeLog.pre-2-10

+1999-12-06  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkfont-win32.c (check_unicode_subranges): New
+	function. Guesstimate what Unicode subranges a font covers based
+	on the codepages. Windows tells us it covers. This will hopefully
+	help those Windows versions or fonts that don't give us any useful
+	Unicode subrange information with GetTextCharsetInfo. Call this
+	function in gdk_font_load_internal.
+
+	* gdk/win32/{gdkdnd,gdkimage,gdkpixmap,gdkprivate}-win32.c: Misc
+	minor changes.
+
 Fri Dec  3 14:09:50 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history):

ChangeLog.pre-2-2

+1999-12-06  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkfont-win32.c (check_unicode_subranges): New
+	function. Guesstimate what Unicode subranges a font covers based
+	on the codepages. Windows tells us it covers. This will hopefully
+	help those Windows versions or fonts that don't give us any useful
+	Unicode subrange information with GetTextCharsetInfo. Call this
+	function in gdk_font_load_internal.
+
+	* gdk/win32/{gdkdnd,gdkimage,gdkpixmap,gdkprivate}-win32.c: Misc
+	minor changes.
+
 Fri Dec  3 14:09:50 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history):

ChangeLog.pre-2-4

+1999-12-06  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkfont-win32.c (check_unicode_subranges): New
+	function. Guesstimate what Unicode subranges a font covers based
+	on the codepages. Windows tells us it covers. This will hopefully
+	help those Windows versions or fonts that don't give us any useful
+	Unicode subrange information with GetTextCharsetInfo. Call this
+	function in gdk_font_load_internal.
+
+	* gdk/win32/{gdkdnd,gdkimage,gdkpixmap,gdkprivate}-win32.c: Misc
+	minor changes.
+
 Fri Dec  3 14:09:50 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history):

ChangeLog.pre-2-6

+1999-12-06  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkfont-win32.c (check_unicode_subranges): New
+	function. Guesstimate what Unicode subranges a font covers based
+	on the codepages. Windows tells us it covers. This will hopefully
+	help those Windows versions or fonts that don't give us any useful
+	Unicode subrange information with GetTextCharsetInfo. Call this
+	function in gdk_font_load_internal.
+
+	* gdk/win32/{gdkdnd,gdkimage,gdkpixmap,gdkprivate}-win32.c: Misc
+	minor changes.
+
 Fri Dec  3 14:09:50 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history):

ChangeLog.pre-2-8

+1999-12-06  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkfont-win32.c (check_unicode_subranges): New
+	function. Guesstimate what Unicode subranges a font covers based
+	on the codepages. Windows tells us it covers. This will hopefully
+	help those Windows versions or fonts that don't give us any useful
+	Unicode subrange information with GetTextCharsetInfo. Call this
+	function in gdk_font_load_internal.
+
+	* gdk/win32/{gdkdnd,gdkimage,gdkpixmap,gdkprivate}-win32.c: Misc
+	minor changes.
+
 Fri Dec  3 14:09:50 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history):

gdk/win32/gdkdnd-win32.c

@@ -44,7 +44,7 @@
 #include <objbase.h>
 #endif
 
-#ifdef _MSC_VER			/* These aren't in mingw32 */
+#ifdef _MSC_VER
 #include <shlobj.h>
 #include <shlguid.h>
 #endif

gdk/win32/gdkimage-win32.c

@@ -747,7 +747,6 @@ gdk_image_put (GdkImage    *image,
 	  gdk_gc_postdraw (drawable, gc_private);
 	  return;
 	}
-
       if (!BitBlt (hdc, xdest, ydest, width, height,
 		   memdc, xsrc, ysrc, SRCCOPY))
 	g_warning ("gdk_image_put: BitBlt failed");

gdk/win32/gdkpixmap-win32.c

@@ -52,7 +52,7 @@ typedef struct
 static void
 gdk_win32_pixmap_destroy (GdkPixmap *pixmap)
 {
-  GdkDrawablePrivate *private = (GdkDrawablePrivate *)pixmap;
+  GdkDrawablePrivate *private = (GdkDrawablePrivate *) pixmap;
 
   GDK_NOTE (MISC, g_print ("gdk_win32_pixmap_destroy: %#x\n",
 			   GDK_DRAWABLE_XID (pixmap)));
@@ -172,7 +172,7 @@ gdk_pixmap_new (GdkWindow *window,
 
       bmi.u.bmiColors[1].rgbBlue =
 	bmi.u.bmiColors[1].rgbGreen =
-      bmi.u.bmiColors[1].rgbRed = 0xFF;
+	bmi.u.bmiColors[1].rgbRed = 0xFF;
       bmi.u.bmiColors[1].rgbReserved = 0x00;
       private->colormap = NULL;
     }
@@ -766,14 +766,14 @@ _gdk_pixmap_create_from_xpm (GdkWindow   *window,
 	  strncpy (pixel_str, &buffer[n], cpp);
 	  pixel_str[cpp] = 0;
 	  ns = 0;
-	
+	  
 	  color = g_hash_table_lookup (color_hash, pixel_str);
-	
+	  
 	  if (!color) /* screwed up XPM file */
 	    color = fallbackcolor;
-	
+	  
 	  gdk_image_put_pixel (image, xcnt, ycnt, color->color.pixel);
-	
+	  
 	  if (mask && color->transparent)
 	    {
 	      if (cnt < xcnt)

gdk/win32/gdkprivate-win32.h

@@ -51,6 +51,10 @@
 #define VIETNAMESE_CHARSET 163
 #endif
 
+#ifndef FS_VIETNAMESE
+#define FS_VIETNAMESE 0x100
+#endif
+
 #ifndef VM_OEM_PLUS
 #define VK_OEM_PLUS 0xBB
 #endif
@@ -219,7 +223,7 @@ struct _GdkCursorPrivate
 struct _GdkWin32SingleFont
 {
   HFONT xfont;
-  DWORD charset;
+  UINT charset;
   UINT codepage;
   FONTSIGNATURE fs;
 };