xemacs-beta: src/faces.c comparison

comparison src/faces.c @ 4187:26dccfc8fa60

[xemacs-hg @ 2007-09-26 13:27:59 by didierv] More fixes about face indexes

author	didierv
date	Wed, 26 Sep 2007 13:28:01 +0000
parents	049dc907c17a
children	e820df1cb11a

comparison

equal deleted inserted replaced

-:05dd0ed58262
+:26dccfc8fa60
 #ifdef DEBUG_XEMACS
 Fixnum debug_x_faces;
 #endif
 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901)
 #ifdef DEBUG_XEMACS
 # define DEBUG_FACES(FORMAT, ...)  \
 do { if (debug_x_faces) stderr_out(FORMAT, __VA_ARGS__); } while (0)
 #else  /* DEBUG_XEMACS */
 Lisp_Object retval;
 Lisp_Object matchspec = Qunbound;
 struct gcpro gcpro1;
 if (!NILP (charset))
 matchspec = noseeum_cons (charset,
 			      stage == initial ? Qinitial : Qfinal);
 GCPRO1 (matchspec);
 retval = specifier_instance_no_quit (Fget (face, property, Qnil), matchspec,
 				       domain, errb, no_fallback, depth);
 struct window *w = NULL;
 if (noninteractive)
 {
 if (ascent)
-*ascent = 1;
+	*ascent = 1;
 if (descent)
-*descent = 0;
+	*descent = 0;
 if (height)
-*height = 1;
+	*height = 1;
 if (width)
-*width = 1;
+	*width = 1;
 if (proportional_p)
-*proportional_p = 0;
+	*proportional_p = 0;
 return;
 }
 /* We use ASCII here.  This is reasonable because the people calling this
 function are using the resulting values to come up with overall sizes
 for windows and frames.
 It's possible for this function to get called when the face cachels
 have not been initialized--put a call to debug-print in
 init-locale-at-early-startup to see it happen. */
 if (WINDOWP (domain) && (w = XWINDOW (domain)) && w->face_cachels)
 {
 if (!Dynarr_length (w->face_cachels))
-reset_face_cachels (w);
+	reset_face_cachels (w);
 cachel = WINDOW_FACE_CACHEL (w, DEFAULT_INDEX);
 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii);
 }
 else
 {
 {
 Lisp_Object tframe = wrap_frame (frm);
 /* DO NOT change the selected frame here.  If the debugger goes off
-it will try and display on the frame being created, but it is not
+	 it will try and display on the frame being created, but it is not
-ready for that yet and a horrible death will occur.  Any random
+	 ready for that yet and a horrible death will occur.  Any random
-code depending on the selected-frame as an implicit arg should be
+	 code depending on the selected-frame as an implicit arg should be
-tracked down and shot.  For the benefit of the one known,
+	 tracked down and shot.  For the benefit of the one known,
-xpm-color-symbols, make-frame sets the variable
+	 xpm-color-symbols, make-frame sets the variable
-Vframe_being_created to the frame it is making and sets it to nil
+	 Vframe_being_created to the frame it is making and sets it to nil
-when done.  Internal functions that this could trigger which are
+	 when done.  Internal functions that this could trigger which are
-currently depending on selected-frame should use this instead.  It
+	 currently depending on selected-frame should use this instead.  It
-is not currently visible at the lisp level. */
+	 is not currently visible at the lisp level. */
 call_critical_lisp_code (XDEVICE (FRAME_DEVICE (frm)),
 			       Qinit_frame_faces, tframe);
 }
 }
 Lisp_Object new_val;
 Lisp_Object face = cachel->face;
 int bound = 1, final_stage = 0;
 int offs = XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE;
 if (!UNBOUNDP (cachel->font[offs]) &&
 bit_vector_bit(FACE_CACHEL_FONT_UPDATED (cachel), offs))
 return cachel->font[offs];
 if (UNBOUNDP (face))
 {
 	  if (bit_vector_bit(FACE_CACHEL_FONT_SPECIFIED(oth), offs))
 	    {
 	      new_val = oth->font[offs];
 	      set_bit_vector_bit(FACE_CACHEL_FONT_SPECIFIED(cachel), offs, 1);
 	      set_bit_vector_bit
 		(FACE_CACHEL_FONT_FINAL_STAGE(cachel), offs,
 		 bit_vector_bit(FACE_CACHEL_FONT_FINAL_STAGE(oth), offs));
 	      break;
 	    }
 	}
 	  ensure_face_cachel_contains_charset (oth, domain, charset);
 	  new_val = oth->font[offs];
 	}
 if (!UNBOUNDP (cachel->font[offs]) &&
 	  !EQ (cachel->font[offs], new_val))
 	cachel->dirty = 1;
 set_bit_vector_bit(FACE_CACHEL_FONT_UPDATED(cachel), offs, 1);
 cachel->font[offs] = new_val;
 DEBUG_FACES("just recursed on the unbound face, returning "
 					       /* ERROR_ME_DEBUG_WARN is
 						  fine here.  */
 					       ERROR_ME_DEBUG_WARN, 1, Qzero,
 					       initial);
 DEBUG_FACES("just called f_p_m_i on face %s, charset %s, initial, "
 		"result was something %s\n",
 		XSTRING_DATA(XSYMBOL_NAME(XFACE(cachel->face)->name)),
 		XSTRING_DATA(XSYMBOL_NAME(XCHARSET_NAME(charset))),
 		UNBOUNDP(new_val) ? "not bound" : "bound");
 if (!UNBOUNDP (new_val)) break;
 which is preferable to translating to ISO10646-1 and using the
 fixed-width fallback.  */
 new_val = face_property_matching_instance (face, Qfont,
 					       charset, domain,
 					       ERROR_ME_DEBUG_WARN, 0,
 					       Qzero,
 					       initial);
 DEBUG_FACES("just called f_p_m_i on face %s, charset %s, initial, "
 		"allow fallback, result was something %s\n",
 		XSTRING_DATA(XSYMBOL_NAME(XFACE(cachel->face)->name)),
 		XSTRING_DATA(XSYMBOL_NAME(XCHARSET_NAME(charset))),
 		UNBOUNDP(new_val) ? "not bound" : "bound");
 if (!UNBOUNDP(new_val))
 {
 bound = 1;
 /* Try the face itself with the final-stage specifiers. */
 new_val = face_property_matching_instance (face, Qfont,
 					       charset, domain,
 					       ERROR_ME_DEBUG_WARN, 1,
 					       Qzero,
 					       final);
 DEBUG_FACES("just called f_p_m_i on face %s, charset %s, final, "
 		"result was something %s\n",
 		XSTRING_DATA(XSYMBOL_NAME(XFACE(cachel->face)->name)),
 		XSTRING_DATA(XSYMBOL_NAME(XCHARSET_NAME(charset))),
 		UNBOUNDP(new_val) ? "not bound" : "bound");
 /* Tell X11 redisplay that it should translate to iso10646-1. */
 if (!UNBOUNDP(new_val))
 {
 /* Lookup the face again, this time both allowing the fallback and
 allowing its final stage to be used.  */
 new_val = face_property_matching_instance (face, Qfont,
 					       charset, domain,
 					       ERROR_ME_DEBUG_WARN, 0,
 					       Qzero,
 					       final);
 DEBUG_FACES("just called f_p_m_i on face %s, charset %s, initial, "
 		"allow fallback, result was something %s\n",
 		XSTRING_DATA(XSYMBOL_NAME(XFACE(cachel->face)->name)),
 		XSTRING_DATA(XSYMBOL_NAME(XCHARSET_NAME(charset))),
 		UNBOUNDP(new_val) ? "not bound" : "bound");
 if (!UNBOUNDP(new_val))
 {
 	/* Tell X11 redisplay that it should translate to iso10646-1. */
 cachel->dirty = 1;
 set_bit_vector_bit(FACE_CACHEL_FONT_UPDATED(cachel), offs, 1);
 set_bit_vector_bit(FACE_CACHEL_FONT_FINAL_STAGE(cachel), offs,
 		     final_stage);
 set_bit_vector_bit(FACE_CACHEL_FONT_SPECIFIED(cachel), offs,
 		     (bound || EQ (face, Vdefault_face)));
 cachel->font[offs] = new_val;
 return new_val;
 }
 {
 int default_face = EQ (face, Vdefault_face);
 cachel->face = face;
 /* We normally only set the _specified flags if the value was
-actually bound.  The exception is for the default face where
+	 actually bound.  The exception is for the default face where
-we always set it since it is the ultimate fallback. */
+	 we always set it since it is the ultimate fallback. */
 FROB (foreground);
 FROB (background);
 FROB (display_table);
 	{
 	  cachel->font[offs] = FINDEX_FIELD (font[offs]);
 	  set_bit_vector_bit(FACE_CACHEL_FONT_SPECIFIED(cachel), offs, 1);
 	  /* Also propagate whether we're translating to Unicode for the
 	     given face.  */
 	  set_bit_vector_bit(FACE_CACHEL_FONT_FINAL_STAGE(cachel), offs,
 			     bit_vector_bit(FACE_CACHEL_FONT_FINAL_STAGE
 					    (Dynarr_atp(w->face_cachels,
 							findex)), offs));
 	  cachel->dirty = 1;
 	}
 	  struct face_cachel *cachel = Dynarr_atp (w->face_cachels, i);
 	  if (cachel->merged_faces)
 	    Dynarr_free (cachel->merged_faces);
 	}
 Dynarr_reset (w->face_cachels);
+/* #### NOTE: be careful with the order !
+	 The cpp macros DEFAULT_INDEX and MODELINE_INDEX defined in
+	 redisplay.h depend on the code below, which is really clumsy.
+	 -- dvl */
 get_builtin_face_cache_index (w, Vdefault_face);
 get_builtin_face_cache_index (w, Vmodeline_face);
 XFRAME (w->frame)->window_face_cache_reset = 1;
 }
 }
 for (elt = 0; elt < Dynarr_length (w->face_cachels); elt++)
 {
 struct face_cachel *cachel = Dynarr_atp (w->face_cachels, elt);
 cachel->updated = 0;
 memset(FACE_CACHEL_FONT_UPDATED(cachel)->bits, 0,
 	     BIT_VECTOR_LONG_STORAGE (NUM_LEADING_BYTES));
 }
 }
 #ifdef MEMORY_USAGE_STATS
 fold = XFACE (old_face);
 fnew = XFACE (new_face);
 #define COPY_PROPERTY(property) \
 Fcopy_specifier (fold->property, fnew->property, \
-locale, tag_set, exact_p, how_to_add);
+		   locale, tag_set, exact_p, how_to_add);
 COPY_PROPERTY (foreground);
 COPY_PROPERTY (background);
 COPY_PROPERTY (font);
 COPY_PROPERTY (display_table);
 #ifdef MULE
 Lisp_Object Qone_dimensional, Qtwo_dimensional, Qx_coverage_instantiator;
 DEFUN ("specifier-tag-one-dimensional-p",
 Fspecifier_tag_one_dimensional_p,
 2, 2, 0, /*
 Return non-nil if (charset-dimension CHARSET) is 1.
 Used by the X11 platform font code; see `define-specifier-tag'.  You
 shouldn't ever need to call this yourself.
 {
 CHECK_CHARSET(charset);
 return (1 == XCHARSET_DIMENSION(charset)) ? Qt : Qnil;
 }
 DEFUN ("specifier-tag-two-dimensional-p",
 Fspecifier_tag_two_dimensional_p,
 2, 2, 0, /*
 Return non-nil if (charset-dimension CHARSET) is 2.
 Used by the X11 platform font code; see `define-specifier-tag'.  You
 shouldn't ever need to call this yourself.
 {
 CHECK_CHARSET(charset);
 return (2 == XCHARSET_DIMENSION(charset)) ? Qt : Qnil;
 }
 DEFUN ("specifier-tag-final-stage-p",
 Fspecifier_tag_final_stage_p,
 2, 2, 0, /*
 Return non-nil if STAGE is 'final.
 Used by the X11 platform font code for giving fallbacks; see
 `define-specifier-tag'.  You shouldn't ever need to call this.
 */
 (UNUSED(charset), stage))
 {
 return EQ(stage, Qfinal) ? Qt : Qnil;
 }
 DEFUN ("specifier-tag-initial-stage-p",
 Fspecifier_tag_initial_stage_p,
 2, 2, 0, /*
 Return non-nil if STAGE is 'initial.
 Used by the X11 platform font code for giving fallbacks; see
 `define-specifier-tag'.  You shouldn't ever need to call this.
 */
 (UNUSED(charset), stage))
 {
 return EQ(stage, Qinitial) ? Qt : Qnil;
 }
 DEFUN ("specifier-tag-encode-as-utf-8-p",
 Fspecifier_tag_encode_as_utf_8_p,
 2, 2, 0, /*
 Return t if and only if (charset-property CHARSET 'encode-as-utf-8)).
 Used by the X11 platform font code; see `define-specifier-tag'.  You
 shouldn't ever need to call this.
 /* Note that fontconfig can search for several font families in one
 	 call.  We should use this facility. */
 "Monospace-12",
 /* do we need to worry about non-Latin characters for monospace?
-No, at least in Debian's implementation of Xft.
+	 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
 /* The default Japanese fonts installed with XFree86 4.0 use this
 	 point size, and the -misc-fixed fonts (which look really bad with
 	 Han characters) don't. We need to prefer the former. */
 "-*-*-medium-r-*-*-*-150-*-*-c-*-*-*",
 			 intern ("specifier-tag-two-dimensional-p"));
 define_specifier_tag(Qone_dimensional, Qnil,
 			 intern ("specifier-tag-one-dimensional-p"));
 define_specifier_tag(Qinitial, Qnil,
 			 intern ("specifier-tag-initial-stage-p"));
 define_specifier_tag(Qfinal, Qnil,
 			 intern ("specifier-tag-final-stage-p"));
 define_specifier_tag (Qencode_as_utf_8, Qnil,
 			  intern("specifier-tag-encode-as-utf-8-p"));
 				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
 be distinct from that for alphabetic scripts, because the font
 specified below is distractingly ugly when used for Han characters
 (this is slightly less so) and because its coverage isn't up to
 handling them (well, chiefly, it's not up to handling Ethiopic--we do
 have charset-specific fallbacks for the East Asian charsets.) */
 inst_list =
 Fcons
 (Fcons
 (list4(device_symbol, Qtwo_dimensional, Qfinal, Qx_coverage_instantiator),
 	build_string
 	("-misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1")),
 inst_list);
 /* Use Markus Kuhn's version of misc-fixed as the font for the font for
 when a given charset's registries can't be found and redisplay for
 that charset falls back to iso10646-1. */
 inst_list =
 Fcons
 (Fcons
 (list4(device_symbol, Qone_dimensional, Qfinal, Qx_coverage_instantiator),
 	build_string
 	("-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1")),
 inst_list);
 for (fontptr = fonts + countof(fonts) - 1; fontptr >= fonts; fontptr--)
 inst_list = Fcons (Fcons (list3 (device_symbol,
 				       Qtwo_dimensional, Qinitial),
 				build_string (*fontptr)),
 			 inst_list);
 /* We need to set the font for the JIT-ucs-charsets separately from the
 final stage, since otherwise it picks up the two-dimensional
 specification (see specifier-tag-two-dimensional-initial-stage-p
 above). They also use Markus Kuhn's ISO 10646-1 fixed fonts for
 redisplay. */
 inst_list =
 Fcons
 (Fcons
 (list4(device_symbol, Qencode_as_utf_8, Qinitial, Qx_coverage_instantiator),
 	build_string
 	("-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1")),
 inst_list);
 #endif /* MULE */
 /* Needed to make sure that charsets with non-specified fonts don't
 use bold and oblique first if medium and regular are available. */
 inst_list =
 Fcons
 (Fcons
 (list1 (device_symbol),
 	build_string ("-*-*-medium-r-*-*-*-120-*-*-c-*-*-*")),
 inst_list);
 /* With a Cygwin XFree86 install, this returns the best (clearest,
 most readable) font I can find when scaling of bitmap fonts is
 turned on, as it is by default. (WHO IN THE NAME OF CHRIST THOUGHT
 THAT WAS A GOOD IDEA?!?!) The other fonts that used to be specified
 here gave horrendous results. */
 inst_list =
 Fcons
 (Fcons
 (list1 (device_symbol),
 	build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")),
 inst_list);
 #endif /* !USE_XFT */
 #endif /* HAVE_TTY */
 #ifdef HAVE_MS_WINDOWS
 {
 const Ascbyte *mswfonts[] =
 	    {
 	      "Courier New:Regular:10::",
 	      "Courier:Regular:10::",
 	      ":Regular:10::"
 	    };
 const Ascbyte **mswfontptr;
 for (mswfontptr = mswfonts + countof (mswfonts) - 1;
 	    mswfontptr >= mswfonts; mswfontptr--)
 	{
 	  /* display device */
 	  inst_list = Fcons (Fcons (list1 (Qmswindows),
 				    build_string (*mswfontptr)),
 			     inst_list);
 	  /* printer device */
 	  inst_list = Fcons (Fcons (list1 (Qmsprinter),
 				    build_string (*mswfontptr)),
 			     inst_list);
 	}
 /* Use Lucida Console rather than Courier New if it exists -- the
-line spacing is much less, so many more lines fit with the same
+	  line spacing is much less, so many more lines fit with the same
-size font. (And it's specifically designed for screens.) */
+	  size font. (And it's specifically designed for screens.) */
 inst_list = Fcons (Fcons (list1 (Qmswindows),
 				 build_string ("Lucida Console:Regular:10::")),
 			  inst_list);
 }
 #endif /* HAVE_MS_WINDOWS */

Mercurial > hg > xemacs-beta

comparison src/faces.c @ 4187:26dccfc8fa60