Changeset 3041

Timestamp:

03/08/03 14:38:30 (6 years ago)

Author:

himi

Message:

(Qencoding_type, Qencoder, Qdim): Removed.
(Qencoding, Qfont_unit_byte, Q1_byte_set_msb)
(Q2_byte_set_msb, Qunicode, Qshift_jis): New symbols.
(mw32_windows_set_logical_font_from_charset): Call mw32_set_encoding_to_lf()
to initialize MW32Encoding.
(mw32_glyph_metric): Don't examine dim. Check font_unit_byte instead.
(mw32_bdffont_textout): Use font_unit_byte instead of dim.
(mw32_set_bdf_font): Do nothing with dim, encoding_type, nor ccl_method.
(set_font_info): When setting font_encoder, use MW32FontEncoding instead of
encoding_type and ccl_method.
(mw32_find_ccl_program): Likewise.
(free_font_info): Removed.
(mw32_valid_encoding_p): New function.
(mw32_set_encoding_to_lf): New function.
(mw32_set_encoding_byte_from_charset): New function.
(mw32_default_hash_function): Don't use the removed members, encoding_type,
ccl_method, nor dim.
(mw32_lf_equal): Ditto.
(mw32_load_lf): Finally canonicalize encoding info. by calling
mw32_set_encoding_byte_from_charset.
(mw32_delete_logical_font): Free ccl_method if possible.
(mw32_set_option_alist_to_logical_font): Set encoding. Remove the codes on
encoding_type, ccl_method, and dim.
(mw32_check_font_request_alist): Check a value on Qencoding, and don't
check Qencoding_type, Qencoder, nor Qdim.
(syms_of_mw32font): Init Qencoding, Qfont_unit_byte, Q1_byte_set_msb,
Q2_byte_set_msb, Qunicode, and Qshift_jis. Remove the codes on Qencoding_type,
Qencoder, nor Qdim.

Files:

• work/cvs2svn/src/mw32font.c (modified) (26 diffs)

work/cvs2svn/src/mw32font.c

@@ -44 +44 @@
-Lisp_Object Qany, Qstrict_spec;
-Lisp_Object Qoverhang, Qrelative_compose, Qdefault_ascent;
-
-
+
+
+
-
-Lisp_Object Qbase, Qweight, Qfixed, Qitalic;
@@ -75 +76 @@
-
-static Lisp_Object mw32_get_font_request_parameter(Lisp_Object, Lisp_Object);
+
+static int mw32_valid_encoding_p (Lisp_Object encoding);
+static void mw32_set_encoding_to_lf (MW32LogicalFont *plf, Lisp_Object encoding);
+static void mw32_set_encoding_byte_from_charset (MW32LogicalFont *plf, int c);
-
-
@@ -122 +127 @@
-  Lisp_Object slot, obj;
-
-  /* default value. */
-  plf->dim = 1;
-  plf->encoding_type = 0;
-  INITIALIZE_CCL_ID(plf->ccl_method);
-
-  /* Don't know such charset!.  */
-  if ((charset > 255)
@@ -132 +132 @@
-    return;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-}
-
@@ -200 +183 @@
-    }
-#endif
-dim
+encoding.font_unit_byte
-    {
-      if (cp > 255)
@@ -261 +244 @@
-    SelectObject(hdc, hold);
-  }
-dim
+encoding.font_unit_byte
-    pwf->cmcache[cp] = pwf->cur_cm;
-  
@@ -468 +451 @@
-      DeleteObject(bk);
-    }
-
+
+
-                   getDeviceWidth(hdc, plf->character_spacing));
-}
@@ -550 +534 @@
-      plf->character_spacing = 0;
-      plf->fixed_pitch = TRUE;
-      plf->dim = 1;
-      plf->encoding_type = 0;
-      plf->centering = 0;
-      INITIALIZE_CCL_ID(plf->ccl_method);
-    }
-  else
@@ -593 +574 @@
-
-static int
-
+ 
-{
-  extern Lisp_Object Vccl_program_table;
@@ -623 +604 @@
-    }
-#else
-
+ 
-      (SYMBOLP (encoding = Fget (encoding, Qccl_program))) &&
-      (setup_ccl_program(encoder, encoding) >= 0))
@@ -675 +656 @@
-    {
-      int i;
-      struct ccl_program ccl_prog;
-
-      fontp->charset = CHAR_CHARSET(c);
-
-       
-else
+
+      
+if (plf->encoding.type == ENCODING_EXTERNAL)
-        {
-
-
-
+
+
+
+
+
+
+
-        }
-_
+.
-      for (i = MIN_CHARSET_OFFICIAL_DIMENSION1; i <= MAX_CHARSET; i++)
-_
+.
-    }
-  else
-    {
-      fontp->charset = CHARSET_ASCII;
-_
+.
-    }
-  if (plf->centering
@@ -700 +684 @@
-              (Vvertical_centering_font_regexp, fontp->full_name) >= 0)))
-    fontp->vertical_centering = 1;
-}
-
-static void
-free_font_info(MW32LogicalFont *plf)
-{
-  struct font_info *fontp;
-  fontp = plf->fontip;
-
-  xfree(fontp->name);
-  xfree(fontp->full_name);
-  if ((plf->ccl_method.data) && (fontp->font_encoder))
-    {
-      /* Caution!!!! */
-      if (!set_ccl_method(plf->ccl_method, fontp->font_encoder))
-        {
-          xfree(fontp->font_encoder);
-          fontp->font_encoder = NULL;
-        }
-    }
-}
-
@@ -771 +736 @@
-{
-  MW32LogicalFont *plf;
-  Lisp_Object encoding;
-  struct ccl_program ccl_prog;
-
-  plf = (MW32LogicalFont*) fontp->font;
-  if (!plf) return;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-  return;
-}
@@ -1053 +1020 @@
-}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  else
-    {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1287 +1323 @@
-  hashval = (hashval << 3) ^ plf->descent;
-  hashval = (hashval << 2) ^ plf->overhang;
-
+
+
-  hashval = (hashval << 2) ^ plf->relative_compose;
-  hashval = (hashval << 2) ^ plf->character_spacing;
-  hashval = (hashval << 2) ^ plf->default_ascent;
-  hashval = (hashval << 1) ^ plf->fixed_pitch;
-  hashval = (hashval << 1) ^ plf->dim;
-  hashval = (hashval << 1) ^ plf->centering;
-  if (hashval > HASHMAXVAL) hashval %= HASHMAXVAL;
-  hashval = hashval ^ mw32_hash_ccl_method(plf->ccl_method);
-  hashval = hashval ^ ((int)plf->hash);
-  hashval = hashval ^ ((int)plf->textout);
@@ -1323 +1358 @@
-          && LF_EQUAL_ELEM (descent)
-          && LF_EQUAL_ELEM (overhang)
-
+
+
-          && LF_EQUAL_ELEM (relative_compose)
-          && LF_EQUAL_ELEM (character_spacing)
-          && LF_EQUAL_ELEM (default_ascent)
-          && LF_EQUAL_ELEM (fixed_pitch)
-          && LF_EQUAL_ELEM (dim)
-          && LF_EQUAL_ELEM (centering)
-          && LF_EQUAL_ELEM (hash)
@@ -1335 +1370 @@
-          && LF_EQUAL_ELEM (set_layout)
-          && LF_EQUAL_ELEM (free)
-
-
+
-#undef LF_EQUAL_ELEM
-}
@@ -1414 +1448 @@
-        {
-          plf = (*proc)(pfr, f, face, c);
-
+
+
+
+
+
-        }
-    }
+
-  return NULL;
-}
@@ -1557 +1596 @@
-  pfr = plf->pfr;
-
+  if (plf->encoding.e.ccl_method.data)
+    xfree (plf->encoding.e.ccl_method.data);
+
-  for (i = 0;i < pfr->loaded_LF_num;i++)
-    {
@@ -1580 +1622 @@
-  Lisp_Object val;
-
-
-
-
-
+
+
-  val = mw32_get_font_request_parameter (Qrelative_compose, option);
-  if (INTEGERP (val)) plf->relative_compose = XINT (val);
@@ -1590 +1630 @@
-  val = mw32_get_font_request_parameter (Qspacing, option);
-  if (INTEGERP (val)) plf->character_spacing = XINT (val);
-  val = mw32_get_font_request_parameter (Qdim, option);
-  if (INTEGERP (val)) plf->dim = XINT (val);
-  val = mw32_get_font_request_parameter (Qcentering, option);
-  if (!NILP (val)) plf->centering = 1;
@@ -2124 +2162 @@
-mw32_check_font_request_alist(Lisp_Object alist)
-{
-_type
+
-  Lisp_Object relative_compose, default_ascent, encoder;
-  Lisp_Object spacing, dim, centering;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -2623 +2656 @@
-  staticpro (&Qscalable);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  Qrelative_compose = intern ("relative-compose");
@@ -2634 +2676 @@
-  Qspacing = intern ("spacing");
-  staticpro (&Qspacing);
-  Qdim = intern ("dim");
-  staticpro (&Qdim);
-  Qcentering = intern ("centering");
-  staticpro (&Qcentering);
@@ -2652 +2692 @@
-               &Vmw32_charset_windows_font_info_alist,
-               "It holds correspondences between Mule's charset and Windows logfont info.\n\
--type
+
-and <option-alist>.");
-  Vmw32_charset_windows_font_info_alist = Qunbound;
@@ -2659 +2699 @@
-               &Vmw32_windows_font_charset_database,
-               "Windows font charset database.\n\
-
-
-
+
-  Vmw32_windows_font_charset_database = Fmake_vector (make_number(256), Qnil);
-