(bdffont): Add nchars.

2 files changed, 16 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f49ca95e947..81869c73512 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2000-10-29  Jason Rumney  <jasonr@gnu.org>
+
+        * w32term.h (FONT_DESCENT): Negate descent of BDF fonts.
+
+        * w32term.c (w32_bdf_per_char_metric): Negate descent.
+        (w32_cache_char_metrics): Handle possibility that 'x' does not
+        exist in a BDF font.
+        (W32_TEXTOUT): w32_BDF_TextOut wants number of bytes not chars.
+
+        * w32bdf.h (bdffont): Add nchars.
+
+        * w32bdf.c (set_bdf_font_info): Set it.
+        (w32_BDF_TextOut): Swap byte order of double byte characters.
+        (w32_load_bdf_font): Set double_byte_p based on bdf_font->nchars.
+
 2000-10-28  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * frame.c (Fframe_parameters): Fix the change from 2000-10-16:
diff --git a/src/w32bdf.h b/src/w32bdf.h
index 47f3067d290..df0976bb1fa 100644
--- a/src/w32bdf.h
+++ b/src/w32bdf.h
@@ -107,6 +107,7 @@ typedef struct
   int width;
   int height;
   int pixsz;
+  int nchars;
 } bdffont;
 
 #define BDF_FILE_SIZE_MAX 256*1024*1024 /* 256Mb */