Mercurial > hg > xemacs-beta

changeset 3747:c13b89ba4796

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2006-12-17 11:25:58 by aidan] Don't use the server-side fallbacks for XFT.
author aidan
date Sun, 17 Dec 2006 11:26:09 +0000
parents 8052943fe6a7
children ed9fdfb69780
files lisp/ChangeLog lisp/x-faces.el src/ChangeLog src/faces.c
diffstat 4 files changed, 33 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat Dec 16 22:51:14 2006 +0000
+++ b/lisp/ChangeLog	Sun Dec 17 11:26:09 2006 +0000
@@ -1,3 +1,9 @@
+2006-12-17  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* x-faces.el (x-init-face-from-resources):
+	Only retain the fallbacks for the default face if we're not
+	running on XFT. 
+
 2006-12-11  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* mule/mule-cmds.el (create-variant-language-environment):
--- a/lisp/x-faces.el	Sat Dec 16 22:51:14 2006 +0000
+++ b/lisp/x-faces.el	Sun Dec 17 11:26:09 2006 +0000
@@ -791,18 +791,19 @@
       ;; since we don't want to try andale-mono's ISO-10646-1 encoding for
       ;; Amharic or Thai. This is fragile; it depends on the code in
       ;; faces.c.
-      (dolist (assocked '((x encode-as-utf-8 initial)
-			  (x two-dimensional initial)
-			  (x one-dimensional final)
-			  (x two-dimensional final)))
-	(when (and (specifierp (face-font face))
-		   (consp (specifier-fallback (face-font face)))
-		   (setq assocked 
-			 (assoc assocked 
-				(specifier-fallback
-				 (face-font face)))))
-	  (set-face-font face (cdr assocked) locale
-			 (nreverse (car assocked)) append))))
+      (unless (featurep 'xft-fonts)
+        (dolist (assocked '((x encode-as-utf-8 initial)
+                            (x two-dimensional initial)
+                            (x one-dimensional final)
+                            (x two-dimensional final)))
+          (when (and (specifierp (face-font face))
+                     (consp (specifier-fallback (face-font face)))
+                     (setq assocked 
+                           (assoc assocked 
+                                  (specifier-fallback
+                                   (face-font face)))))
+            (set-face-font face (cdr assocked) locale
+                           (nreverse (car assocked)) append)))))
 		     
     ;; Kludge-o-rooni.  Set the foreground and background resources for
     ;; X devices only -- otherwise things tend to get all messed up
--- a/src/ChangeLog	Sat Dec 16 22:51:14 2006 +0000
+++ b/src/ChangeLog	Sun Dec 17 11:26:09 2006 +0000
@@ -1,3 +1,8 @@
+2006-12-17  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* faces.c (complex_vars_of_faces):
+	Don't use server-side fallbacks when building with XFT support. 
+
 2006-12-06  Dr. Volker Zell  <Dr.Volker.Zell@oracle.com>
 
 	* config.h.in: New HAVE_U_INT*_T defines.
--- a/src/faces.c	Sat Dec 16 22:51:14 2006 +0000
+++ b/src/faces.c	Sun Dec 17 11:26:09 2006 +0000
@@ -2307,16 +2307,21 @@
 
     define_specifier_tag (Qencode_as_utf_8, Qnil,
 			  intern("specifier-tag-encode-as-utf-8-p"));
-
 #endif /* MULE */
 
+#ifdef USE_XFT
+    for (fontptr = fonts + countof(fonts) - 1; fontptr >= fonts; fontptr--)
+      inst_list = Fcons (Fcons (list1 (device_symbol),
+				build_string (*fontptr)),
+			 inst_list);
+
+#else /* !USE_XFT */
     inst_list =
       Fcons 
       (Fcons
        (list1 (device_symbol), 
 	build_string ("*")),
        inst_list);
-
 #ifdef MULE 
 
     /* For Han characters and Ethiopic, we want the misc-fixed font used to
@@ -2389,6 +2394,8 @@
 	build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")),
        inst_list);
 
+#endif /* !USE_XFT */
+
 #endif /* HAVE_X_WINDOWS || HAVE_GTK */
 
 #ifdef HAVE_TTY