Changeset 3053

Timestamp:

03/09/03 07:31:31 (6 years ago)

Author:

himi

Message:

(Vmw32_windows_font_charset_database): Removed.
(mw32_windows_set_logical_font_from_char): Now it takes a Emacs char
not a charset of Windows LOGFONT.
(mw32_set_windows_logical_font): It takes a Emacs char as well, and
pass it to mw32_windows_set_logical_font_from_char.
(mw32_load_lf_from_lisp_object): Likewise, but pass it to
mw32_set_windows_logical_font.
(mw32_default_logical_font_loader): Ditto.
(mw32_convert_lface_to_LOGFONT): Use XCAR() and XCDR(), and if the
data is invalid, return 0.
(mw32_strict_logical_font_loader): Pass "c" to
mw32_load_lf_from_lisp_object.
(mw32_elisp_logical_font_loader): Ditto.
(syms_of_mw32font): Remove Vmw32_windows_font_charset_database.

Files:

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

work/cvs2svn/src/mw32font.c

@@ -119 +119 @@
-} mw32_windows_font;
-
-Lisp_Object Vmw32_windows_font_charset_database;
-
-static void
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  if (!mw32_valid_encoding_p (slot)) return;
@@ -351 +359 @@
-static int
-mw32_set_windows_logical_font (struct frame *f, MW32LogicalFont *plf,
-
+, int c
-{
-  mw32_windows_font *pwf;
@@ -400 +408 @@
-      plf->overhang = tm.tmOverhang;
-      plf->fixed_pitch = !(tm.tmPitchAndFamily & TMPF_FIXED_PITCH);
-set(plf, tm.tmCharSet
+(plf, c
-      plf->relative_compose = 0;
-      plf->default_ascent = 0;
@@ -1646 +1654 @@
-                              MW32FontRequest *pfr,
-                              Lisp_Object llf,
-
+
+
-{
-  MW32LogicalFont *plf;
@@ -1669 +1678 @@
-      lf = lisp_object_to_logfont(llf);
-      plf = mw32_add_logical_font(pfr);
-
+, c
-        {
-          mw32_delete_logical_font(plf);
@@ -1694 +1703 @@
-      slot = assq_no_quit(CHARSET_SYMBOL(CHAR_CHARSET(c)),
-                          Vmw32_charset_windows_font_info_alist);
-
-
+
+
+
+
-      if (!NUMBERP(lcnum)) return 0;
-      cnum = XINT (lcnum);
@@ -1785 +1796 @@
-  plf = mw32_add_logical_font(pfr);
-  if ((!mw32_convert_lface_to_LOGFONT(f, attrs, &lf, c))
-
+, c
-    {
-      mw32_delete_logical_font(plf);
@@ -1940 +1951 @@
-
-      if (!mw32_fr_spec_match_p (spec, attrs, c)) continue;
-
+, c
-      if (plf) return plf;
-    }
@@ -2001 +2012 @@
-  if ((!NILP (option)) && (!CONSP (option))) return NULL;
-
-
+, c
-
-  return plf;
@@ -2706 +2717 @@
-  Vmw32_charset_windows_font_info_alist = Qunbound;
-
-  DEFVAR_LISP ("mw32-windows-font-charset-database",
-               &Vmw32_windows_font_charset_database,
-               "Windows font charset database.\n\
-This is a 256-length vector, and each slot must be a nil or <encoding>.");
-  Vmw32_windows_font_charset_database = Fmake_vector (make_number(256), Qnil);
-  
-
-  Vmw32_font_request_table = Fmake_vector (make_number (0), Qnil);
-  staticpro (&Vmw32_font_request_table);