emacs: src/xfaces.c comparison

comparison src/xfaces.c @ 95128:9c4d21df23ff

Include font.h unconditionally. (merge_face_ref, merge_face_vectors) (Finternal_set_lisp_face_attribute): Cancel the previous change.

author	Kenichi Handa <handa@m17n.org>
date	Tue, 20 May 2008 06:33:40 +0000
parents	f4fac6175e87
children	4eed3c1f3e86

comparison

equal deleted inserted replaced

-:e2d4be6d5115
+:9c4d21df23ff
 #include "blockinput.h"
 #include "window.h"
 #include "intervals.h"
 #include "termchar.h"
+#include "font.h"
 #ifdef HAVE_WINDOW_SYSTEM
-#include "font.h"
 #include "fontset.h"
 #endif /* HAVE_WINDOW_SYSTEM */
 #ifdef HAVE_X_WINDOWS
 other code uses `unspecified' as a generic value for face attributes. */
 if (!UNSPECIFIEDP (from[LFACE_INHERIT_INDEX])
 && !NILP (from[LFACE_INHERIT_INDEX]))
 merge_face_ref (f, from[LFACE_INHERIT_INDEX], to, 0, named_merge_points);
-#ifdef HAVE_WINDOW_SYSTEM
 i = LFACE_FONT_INDEX;
 if (!UNSPECIFIEDP (from[i]))
 {
 if (!UNSPECIFIEDP (to[i]))
 	to[i] = Fmerge_font_spec (from[i], to[i]);
 else
 	to[i] = Fcopy_font_spec (from[i]);
 ASET (to[i], FONT_SIZE_INDEX, Qnil);
 }
-#endif
 for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
 if (!UNSPECIFIEDP (from[i]))
 {
 	if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i]))
 	  {
 	    to[i] = merge_face_heights (from[i], to[i], to[i]);
-#ifdef HAVE_WINDOW_SYSTEM
 	    font_clear_prop (to, FONT_SIZE_INDEX);
-#endif
 	  }
-#ifdef HAVE_WINDOW_SYSTEM
 	else if (i != LFACE_FONT_INDEX)
 	  {
 	    to[i] = from[i];
 	    if (i >= LFACE_FAMILY_INDEX && i <=LFACE_SLANT_INDEX)
 	      font_clear_prop (to,
 				: i == LFACE_SWIDTH_INDEX ? FONT_WIDTH_INDEX
 				: i == LFACE_HEIGHT_INDEX ? FONT_SIZE_INDEX
 				: i == LFACE_WEIGHT_INDEX ? FONT_WEIGHT_INDEX
 				: FONT_SLANT_INDEX));
 	  }
-#endif
 }
 /* If `font' attribute is specified, reflect the font properties in
 it to the other attributes.  */
 if (0 && !UNSPECIFIEDP (to[LFACE_FONT_INDEX]))
 	      else if (EQ (keyword, QCfamily))
 		{
 		  if (STRINGP (value))
 		    {
 		      to[LFACE_FAMILY_INDEX] = value;
-#ifdef HAVE_WINDOW_SYSTEM
 		      font_clear_prop (to, FONT_FAMILY_INDEX);
-#endif
 		    }
 		  else
 		    err = 1;
 		}
 	      else if (EQ (keyword, QCheight))
 		    merge_face_heights (value, to[LFACE_HEIGHT_INDEX], Qnil);
 		  if (! NILP (new_height))
 		    {
 		      to[LFACE_HEIGHT_INDEX] = new_height;
-#ifdef HAVE_WINDOW_SYSTEM
 		      font_clear_prop (to, FONT_SIZE_INDEX);
-#endif
 		    }
 		  else
 		    err = 1;
 		}
 	      else if (EQ (keyword, QCweight))
 		{
 		  if (SYMBOLP (value) && FONT_WEIGHT_NAME_NUMERIC (value) >= 0)
 		    {
 		      to[LFACE_WEIGHT_INDEX] = value;
-#ifdef HAVE_WINDOW_SYSTEM
 		      font_clear_prop (to, FONT_WEIGHT_INDEX);
-#endif
 		    }
 		  else
 		    err = 1;
 		}
 	      else if (EQ (keyword, QCslant))
 		{
 		  if (SYMBOLP (value) && FONT_SLANT_NAME_NUMERIC (value) >= 0)
 		    {
 		      to[LFACE_SLANT_INDEX] = value;
-#ifdef HAVE_WINDOW_SYSTEM
 		      font_clear_prop (to, FONT_SLANT_INDEX);
-#endif
 		    }
 		  else
 		    err = 1;
 		}
 	      else if (EQ (keyword, QCunderline))
 	      else if (EQ (keyword, QCwidth))
 		{
 		  if (SYMBOLP (value) && FONT_WIDTH_NAME_NUMERIC (value) >= 0)
 		    {
 		      to[LFACE_SWIDTH_INDEX] = value;
-#ifdef HAVE_WINDOW_SYSTEM
 		      font_clear_prop (to, FONT_WIDTH_INDEX);
-#endif
 		    }
 		  else
 		    err = 1;
 		}
 	      else if (EQ (keyword, QCinherit))
 (face, attr, value, frame)
 Lisp_Object face, attr, value, frame;
 {
 Lisp_Object lface;
 Lisp_Object old_value = Qnil;
-#ifdef HAVE_WINDOW_SYSTEM
 /* Set one of enum font_property_index (> 0) if ATTR is one of
 font-related attributes other than QCfont and QCfontset.  */
 enum font_property_index prop_index = 0;
-#endif
 CHECK_SYMBOL (face);
 CHECK_SYMBOL (attr);
 face = resolve_face_name (face, 1);
 	  if (SCHARS (value) == 0)
 	    signal_error ("Invalid face family", value);
 	}
 old_value = LFACE_FAMILY (lface);
 LFACE_FAMILY (lface) = value;
-#ifdef HAVE_WINDOW_SYSTEM
 prop_index = FONT_FAMILY_INDEX;
-#endif
 }
 else if (EQ (attr, QCheight))
 {
 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
 	{
 	    signal_error ("Invalid face height", value);
 	}
 old_value = LFACE_HEIGHT (lface);
 LFACE_HEIGHT (lface) = value;
-#ifdef HAVE_WINDOW_SYSTEM
 prop_index = FONT_SIZE_INDEX;
-#endif
 }
 else if (EQ (attr, QCweight))
 {
 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
 	{
 	  if (FONT_WEIGHT_NAME_NUMERIC (value) < 0)
 	    signal_error ("Invalid face weight", value);
 	}
 old_value = LFACE_WEIGHT (lface);
 LFACE_WEIGHT (lface) = value;
-#ifdef HAVE_WINDOW_SYSTEM
 prop_index = FONT_WEIGHT_INDEX;
-#endif
 }
 else if (EQ (attr, QCslant))
 {
 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
 	{
 	  if (FONT_SLANT_NAME_NUMERIC (value) < 0)
 	    signal_error ("Invalid face slant", value);
 	}
 old_value = LFACE_SLANT (lface);
 LFACE_SLANT (lface) = value;
-#ifdef HAVE_WINDOW_SYSTEM
 prop_index = FONT_SLANT_INDEX;
-#endif
 }
 else if (EQ (attr, QCunderline))
 {
 if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
 	if ((SYMBOLP (value)
 	  if (FONT_WIDTH_NAME_NUMERIC (value) < 0)
 	    signal_error ("Invalid face width", value);
 	}
 old_value = LFACE_SWIDTH (lface);
 LFACE_SWIDTH (lface) = value;
-#ifdef HAVE_WINDOW_SYSTEM
 prop_index = FONT_WIDTH_INDEX;
-#endif
 }
 else if (EQ (attr, QCfont))
 {
 #ifdef HAVE_WINDOW_SYSTEM
 if (EQ (frame, Qt) || FRAME_WINDOW_P (XFRAME (frame)))
 }
 else if (EQ (attr, QCbold))
 {
 old_value = LFACE_WEIGHT (lface);
 LFACE_WEIGHT (lface) = NILP (value) ? Qnormal : Qbold;
-#ifdef HAVE_WINDOW_SYSTEM
 prop_index = FONT_WEIGHT_INDEX;
-#endif
 }
 else if (EQ (attr, QCitalic))
 {
 attr = QCslant;
 old_value = LFACE_SLANT (lface);
 LFACE_SLANT (lface) = NILP (value) ? Qnormal : Qitalic;
-#ifdef HAVE_WINDOW_SYSTEM
 prop_index = FONT_SLANT_INDEX;
-#endif
 }
 else
 signal_error ("Invalid face attribute name", attr);
-#ifdef HAVE_WINDOW_SYSTEM
 if (prop_index)
 /* If a font-related attribute other than QCfont and QCfontset is
 specified, and if the original QCfont attribute has a font
 (font-spec or font-object), set the corresponding property in
 the font to nil so that the font selector doesn't think that
 the attribute is mandatory.  */
 font_clear_prop (XVECTOR (lface)->contents, prop_index);
-#endif
 /* Changing a named face means that all realized faces depending on
 that face are invalid.  Since we cannot tell which realized faces
 depend on the face, make sure they are all removed.  This is done
 by incrementing face_change_count.  The next call to

Mercurial > emacs

comparison src/xfaces.c @ 95128:9c4d21df23ff