Changeset 4152

Timestamp:

2006年08月29日 21時55分51秒 (2 years ago)

Author:

miyoshi

Message:

* xfaces.c (clear_font_table): Call w32_unload_font().
(set_font_frame_param): Activate invalidated function.

* mw32font.c (w32_unload_font): New function.
(set_font_frame_param): Moved to xfaces.c.

* dispextern.h (struct glyph_string): Don't use MW32LogicalFont.

Files:

• trunk/src/ChangeLog.Meadow (modified) (1 diff)
• trunk/src/dispextern.h (modified) (1 diff)
• trunk/src/mw32font.c (modified) (2 diffs)
• trunk/src/xfaces.c (modified) (7 diffs)

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2006-08-29  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * xfaces.c (clear_font_table): Call w32_unload_font().
+        (set_font_frame_param): Activate invalidated function.
+
+        * mw32font.c (w32_unload_font): New function.
+        (set_font_frame_param): Moved to xfaces.c.
+
+        * dispextern.h (struct glyph_string): Don't use MW32LogicalFont.
+
-2006-08-26  YAMAZAKI Katsuhiro  <yamazaki-k@mwe.biglobe.ne.jp>
-

trunk/src/dispextern.h

@@ -1165 +1165 @@
-
-  /* Font in which this string is to be drawn.  */
-#ifdef MEADOW
-  MW32LogicalFont *font;
-#else
-  XFontStruct *font;
-#endif
-
-  /* Font info for this string.  */

trunk/src/mw32font.c

@@ -728 +728 @@
-}
-
-#if 0
-void
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-static void
@@ -2226 +2212 @@
-}
-
-/* Set the `font' frame parameter of FRAME determined from `default'
-   face attributes LFACE.  If a face or fontset name is explicitely
-   specfied in LFACE, use it as is.  Otherwise, determine a font name
-   from the other font-related atrributes of LFACE.  In that case, if
-   there's no matching font, signals an error.  */
-/* For MW32 implementation, we don't call choose_face_font () to obtain
-   the default font name.  */
-
-void set_font_frame_param (Lisp_Object frame, Lisp_Object lface)
-{
-  struct frame *f = XFRAME (frame);
-
-  if (FRAME_WINDOW_P (f))
-    {
-      Lisp_Object font_name;
-      char *font;
-
-      if (STRINGP (LFACE_FONT (lface)))
-        {
-          font_name = LFACE_FONT (lface);
-          f->default_face_done_p = 0;
-          Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, font_name),
-                                                  Qnil));
-        }
-    }
-}
-
-
-/***********************************************************************

trunk/src/xfaces.c

@@ -487 +487 @@
-static Lisp_Object resolve_face_name P_ ((Lisp_Object, int));
-static int may_use_scalable_font_p P_ ((const char *));
-#ifndef MEADOW
-static void set_font_frame_param P_ ((Lisp_Object, Lisp_Object));
-#endif
-static int better_font_p P_ ((int *, struct font_name *, struct font_name *,
-                              int, int));
@@ -597 +595 @@
-extern Lisp_Object mw32_list_fonts P_ ((struct frame *, Lisp_Object, int,
-                                        int));
-
-
+
-                                               Lisp_Object, Lisp_Object,
-                                               Lisp_Object));
@@ -1103 +1100 @@
-      XFreeFont (dpyinfo->display, font_info->font);
-#endif
-#ifdef MEADOW
-      {
-        MW32LogicalFont *plf = (MW32LogicalFont*) font_info->font;
-        mw32_delete_logical_font (plf);
-      }
-#else
-#ifdef WINDOWSNT
-      w32_unload_font (dpyinfo, font_info->font);
-#endif
-#endif
-#ifdef MAC_OS
@@ -4523 +4513 @@
-#ifdef HAVE_WINDOW_SYSTEM
-
-#ifndef MEADOW
-/* Set the `font' frame parameter of FRAME determined from `default'
-   face attributes LFACE.  If a face or fontset name is explicitely
@@ -4545 +4534 @@
-      else
-        {
+#ifdef MEADOW
+          return;
+#else /* not MEADOW */
-          /* Choose a font name that reflects LFACE's attributes and has
-             the registry and encoding pattern specified in the default
@@ -4553 +4545 @@
-          font_name = build_string (font);
-          xfree (font);
+#endif /* not MEADOW */
-        }
-
@@ -4559 +4552 @@
-    }
-}
-#endif /* not MEADOW */
-
-/* Update the corresponding face when frame parameter PARAM on frame F