CVS update by aidan xemacs/src ...

[xemacs-cvs at xemacs.org]

  User: aidan   
  Date: 06/12/17 12:26:13

  Modified:    xemacs/src ChangeLog faces.c
Log:
Don't use the server-side fallbacks for XFT.

Revision  Changes    Path
1.779     +6 -0      XEmacs/xemacs/lisp/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.778
retrieving revision 1.779
diff -u -p -r1.778 -r1.779
--- ChangeLog	2006/12/11 12:39:55	1.778
+++ ChangeLog	2006/12/17 11:25:58	1.779
@@ -1,3 +1,9 @@
+2006-12-17  Aidan Kehoe  <kehoea at 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 at parhasard.net>
 
 	* mule/mule-cmds.el (create-variant-language-environment):



1.27      +13 -12    XEmacs/xemacs/lisp/x-faces.el

Index: x-faces.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/x-faces.el,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- x-faces.el	2006/11/05 22:31:32	1.26
+++ x-faces.el	2006/12/17 11:25:59	1.27
@@ -791,18 +791,19 @@ Otherwise, it returns the next larger ve
       ;; 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



1.1035    +5 -0      XEmacs/xemacs/src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1034
retrieving revision 1.1035
diff -u -p -r1.1034 -r1.1035
--- ChangeLog	2006/12/11 19:44:50	1.1034
+++ ChangeLog	2006/12/17 11:26:07	1.1035
@@ -1,3 +1,8 @@
+2006-12-17  Aidan Kehoe  <kehoea at 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 at oracle.com>
 
 	* config.h.in: New HAVE_U_INT*_T defines.



1.53      +9 -2      XEmacs/xemacs/src/faces.c

Index: faces.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/faces.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- faces.c	2006/11/28 21:20:37	1.52
+++ faces.c	2006/12/17 11:26:09	1.53
@@ -2307,16 +2307,21 @@ complex_vars_of_faces (void)
 
     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
@@ -2388,6 +2393,8 @@ complex_vars_of_faces (void)
        (list1 (device_symbol), 
 	build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")),
        inst_list);
+
+#endif /* !USE_XFT */
 
 #endif /* HAVE_X_WINDOWS || HAVE_GTK */