xemacs-beta: src/faces.c comparison

comparison src/faces.c @ 3094:ad2f4ae9895b

[xemacs-hg @ 2005-11-26 11:45:47 by stephent] Xft merge. <87k6ev4p8q.fsf@tleepslib.sk.tsukuba.ac.jp>

author	stephent
date	Sat, 26 Nov 2005 11:46:25 +0000
parents	1e7cc382eb16
children	98af8a976fc3

comparison

equal deleted inserted replaced

-:769dc945b085
+:ad2f4ae9895b
 mark_object (cachel->background_pixmap);
 }
 }
 /* ensure that the given cachel contains an updated font value for
-the given charset.  Return the updated font value. */
+the given charset.  Return the updated font value (which can be
+Qunbound, so this value must not be passed unchecked to Lisp).
+#### Xft: This function will need to be updated for new font model. */
 Lisp_Object
 ensure_face_cachel_contains_charset (struct face_cachel *cachel,
 				     Lisp_Object domain, Lisp_Object charset)
 {
 cachel->updated = 1;
 }
 /* Initialize a cachel. */
+/* #### Xft: this function will need to be changed for new font model. */
 void
 reset_face_cachel (struct face_cachel *cachel)
 {
 xzero (*cachel);
 for (elt = 0; elt < Dynarr_length (w->face_cachels); elt++)
 Dynarr_atp (w->face_cachels, elt)->dirty = 0;
 }
+/* #### Xft: this function will need to be changed for new font model. */
 void
 mark_face_cachels_as_not_updated (struct window *w)
 {
 int elt;
 	  Dynarr_free (cachel.merged_faces);
 	  cachel.merged_faces = 0;
 	}
 return findex;
 }
+}
+/* Return a cache index for window W from merging the faces in FACE_LIST.
+COUNT is the number of faces in the list.
+The default face should not be included in the list, as it is always
+implicitly merged into the cachel.
+WARNING: this interface may change. */
+face_index
+merge_face_list_to_cache_index (struct window *w,
+				Lisp_Object *face_list, int count)
+{
+int i;
+face_index findex = 0;
+struct face_cachel cachel;
+reset_face_cachel (&cachel);
+for (i = 0; i < count; i++)
+{
+Lisp_Object face = face_list[i];
+if (!NILP (face))
+	{
+	  CHECK_FACE(face);	/* #### presumably unnecessary */
+	  findex = get_builtin_face_cache_index (w, face);
+	  merge_face_cachel_data (w, findex, &cachel);
+	}
+}
+/* Now finally merge in the default face. */
+findex = get_builtin_face_cache_index (w, Vdefault_face);
+merge_face_cachel_data (w, findex, &cachel);
+return get_merged_face_cache_index (w, &cachel);
 }
 /*****************************************************************************
 interface functions
 #if defined (HAVE_X_WINDOWS) || defined (HAVE_GTK)
 const Ascbyte *fonts[] =
 {
+#ifdef USE_XFT
+/************** Xft fonts *************/
+/* Note that fontconfig can search for several font families in one
+	 call.  We should use this facility. */
+"monospace-12",		/* Western #### add encoding info? */
+/* do we need to worry about non-Latin characters for monospace?
+No, at least in Debian's implementation of Xft.
+	 We should recommend that "gothic" and "mincho" aliases be created? */
+"Sazanami Mincho-12",	/* Japanese #### add encoding info? */
+				/* Arphic for Chinese? */
+				/* Korean */
+#else
 /************** ISO-8859 fonts *************/
 "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
+/* under USE_XFT, we always succeed, so let's not waste the effort */
 "-*-fixed-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
 "-*-courier-*-r-*-*-*-120-*-*-*-*-iso8859-*",
 "-*-fixed-*-r-*-*-*-120-*-*-*-*-iso8859-*",
 /* Next try for any "medium" charcell or monospaced iso8859 font. */
 "-*-*-medium-r-*-*-*-120-*-*-m-*-iso8859-*",
 	 an appropriate Unicode font after all the charset-specific fonts
 	 have been checked.  This should look at the per-char font info and
 	 check whether we have support for some of the chars in the
 	 charset. (#### Bogus, but that's the way it currently works)
+	 sjt sez: With Xft/fontconfig that information is available as a
+	 language support property.   The character set (actually a bit
+vector) is also available.  So what we need to do is to map charset
+	 -> language (Mule redesign Phase 1) and eventually use language
+	 information in the buffer, then map to charsets (Phase 2) at font
+	 instantiation time.
 	 (2) Record in the font instance a flag indicating when we're
 	 dealing with a Unicode font.
 	 (3) Notice this flag in separate_textual_runs() and translate the
 	 text into Unicode if so.
 /* Hello?  Please? */
 "-*-*-*-r-*-*-*-120-*-*-*-*-*-*",
 "-*-*-*-*-*-*-*-120-*-*-*-*-*-*",
 "-*-*-*-*-*-*-*-*-*-*-*-*-*-*",
 "*"
+#endif
 };
 const Ascbyte **fontptr;
 #ifdef HAVE_X_WINDOWS
 for (fontptr = fonts + countof(fonts) - 1; fontptr >= fonts; fontptr--)
 /* Provide some last-resort fallbacks for gui-element face which
 mustn't default to default. */
 {
 Lisp_Object fg_fb = Qnil, bg_fb = Qnil;
+/* #### gui-element face doesn't have a font property?
+But it gets referred to later! */
 #ifdef HAVE_GTK
 /* We need to put something in there, or error checking gets
 #%!@#ed up before the styles are set, which override the
 fallbacks. */
 fg_fb = acons (list1 (Qgtk), build_string ("black"), fg_fb);
 /* widget is another gui element */
 Vwidget_face = Fmake_face (Qwidget,
 			     build_msg_string ("widget face"),
 			     Qnil);
+/* #### weird ... the gui-element face doesn't have its own font yet */
 set_specifier_fallback (Fget (Vwidget_face, Qfont, Qunbound),
 			  Fget (Vgui_element_face, Qfont, Qunbound));
 set_specifier_fallback (Fget (Vwidget_face, Qforeground, Qunbound),
 			  Fget (Vgui_element_face, Qforeground, Qunbound));
 set_specifier_fallback (Fget (Vwidget_face, Qbackground, Qunbound),

Mercurial > hg > xemacs-beta

comparison src/faces.c @ 3094:ad2f4ae9895b