xemacs-beta: src/faces.c comparison

comparison src/faces.c @ 183:e121b013d1f0 r20-3b18

Import from CVS: tag r20-3b18

author	cvs
date	Mon, 13 Aug 2007 09:54:23 +0200
parents	bfd6434d15b3
children	3d6bfa290dbd

comparison

equal deleted inserted replaced

-:f07455f06202
+:e121b013d1f0
 struct Lisp_Face *f1 = XFACE (o1);
 struct Lisp_Face *f2 = XFACE (o2);
 depth++;
-if (!internal_equal (f1->foreground, f2->foreground, depth) ||
+return
-!internal_equal (f1->background, f2->background, depth) ||
+(internal_equal (f1->foreground,	     f2->foreground,	    depth) &&
-!internal_equal (f1->font, f2->font, depth) ||
+internal_equal (f1->background,	     f2->background,	    depth) &&
-!internal_equal (f1->display_table, f2->display_table, depth) ||
+internal_equal (f1->font,		     f2->font,		    depth) &&
-!internal_equal (f1->background_pixmap, f2->background_pixmap, depth) ||
+internal_equal (f1->display_table,	     f2->display_table,	    depth) &&
-!internal_equal (f1->underline, f2->underline, depth) ||
+internal_equal (f1->background_pixmap,  f2->background_pixmap, depth) &&
-!internal_equal (f1->strikethru, f2->strikethru, depth) ||
+internal_equal (f1->underline,	     f2->underline,	    depth) &&
-!internal_equal (f1->highlight, f2->highlight, depth) ||
+internal_equal (f1->strikethru,	     f2->strikethru,	    depth) &&
-!internal_equal (f1->dim, f2->dim, depth) ||
+internal_equal (f1->highlight,	     f2->highlight,	    depth) &&
-!internal_equal (f1->blinking, f2->blinking, depth) ||
+internal_equal (f1->dim,		     f2->dim,		    depth) &&
-!internal_equal (f1->reverse, f2->reverse, depth) ||
+internal_equal (f1->blinking,	     f2->blinking,	    depth) &&
-plists_differ (f1->plist, f2->plist, 0, 0, depth + 1))
+internal_equal (f1->reverse,	     f2->reverse,	    depth) &&
-return 0;
+! plists_differ (f1->plist, f2->plist, 0, 0, depth + 1));
-return 1;
 }
 static unsigned long
 face_hash (Lisp_Object obj, int depth)
 {
 /* No need to hash all of the elements; that would take too long.
 Just hash the most common ones. */
 return HASH3 (internal_hash (f->foreground, depth),
 		internal_hash (f->background, depth),
-		internal_hash (f->font, depth));
+		internal_hash (f->font,       depth));
 }
 static Lisp_Object
 face_getprop (Lisp_Object obj, Lisp_Object prop)
 {
 struct Lisp_Face *f = XFACE (obj);
-#define FROB(propprop) 							\
+return
-do {									\
+((EQ (prop, Qforeground))	     ? f->foreground	    :
-if (EQ (prop, Q##propprop))						\
+(EQ (prop, Qbackground))	     ? f->background	    :
-{									\
+(EQ (prop, Qfont))		     ? f->font		    :
-return f->propprop;						\
+(EQ (prop, Qdisplay_table))     ? f->display_table	    :
-}									\
+(EQ (prop, Qbackground_pixmap)) ? f->background_pixmap :
-} while (0)
+(EQ (prop, Qunderline))	     ? f->underline	    :
+(EQ (prop, Qstrikethru))	     ? f->strikethru	    :
-FROB (foreground);
+(EQ (prop, Qhighlight))	     ? f->highlight	    :
-FROB (background);
+(EQ (prop, Qdim))		     ? f->dim		    :
-FROB (font);
+(EQ (prop, Qblinking))	     ? f->blinking	    :
-FROB (display_table);
+(EQ (prop, Qreverse))	     ? f->reverse	    :
-FROB (background_pixmap);
+(EQ (prop, Qdoc_string))	     ? f->doc_string	    :
-FROB (underline);
+external_plist_get (&f->plist, prop, 0, ERROR_ME));
-FROB (strikethru);
-FROB (highlight);
-FROB (dim);
-FROB (blinking);
-FROB (reverse);
-FROB (doc_string);
-#undef FROB
-return external_plist_get (&f->plist, prop, 0, ERROR_ME);
 }
 static int
 face_putprop (Lisp_Object obj, Lisp_Object prop, Lisp_Object value)
 {
 struct Lisp_Face *f = XFACE (obj);
-#define FROB(propprop) 							\
+if (EQ (prop, Qforeground)        ||
-do {									\
+EQ (prop, Qbackground)        ||
-if (EQ (prop, Q##propprop))						\
+EQ (prop, Qfont)              ||
-return 0;								\
+EQ (prop, Qdisplay_table)     ||
-} while (0)
+EQ (prop, Qbackground_pixmap) ||
+EQ (prop, Qunderline)         ||
-FROB (foreground);
+EQ (prop, Qstrikethru)        ||
-FROB (background);
+EQ (prop, Qhighlight)         ||
-FROB (font);
+EQ (prop, Qdim)               ||
-FROB (display_table);
+EQ (prop, Qblinking)          ||
-FROB (background_pixmap);
+EQ (prop, Qreverse))
-FROB (underline);
+return 0;
-FROB (strikethru);
-FROB (highlight);
-FROB (dim);
-FROB (blinking);
-FROB (reverse);
-#undef FROB
 if (EQ (prop, Qdoc_string))
 {
 if (!NILP (value))
 	CHECK_STRING (value);
 static int
 face_remprop (Lisp_Object obj, Lisp_Object prop)
 {
 struct Lisp_Face *f = XFACE (obj);
-#define FROB(propprop) 							\
+if (EQ (prop, Qforeground)        ||
-do {									\
+EQ (prop, Qbackground)        ||
-if (EQ (prop, Q##propprop))						\
+EQ (prop, Qfont)              ||
-return -1;								\
+EQ (prop, Qdisplay_table)     ||
-} while (0)
+EQ (prop, Qbackground_pixmap) ||
+EQ (prop, Qunderline)         ||
-FROB (foreground);
+EQ (prop, Qstrikethru)        ||
-FROB (background);
+EQ (prop, Qhighlight)         ||
-FROB (font);
+EQ (prop, Qdim)               ||
-FROB (display_table);
+EQ (prop, Qblinking)          ||
-FROB (background_pixmap);
+EQ (prop, Qreverse))
-FROB (underline);
+return -1;
-FROB (strikethru);
-FROB (highlight);
-FROB (dim);
-FROB (blinking);
-FROB (reverse);
-#undef FROB
 if (EQ (prop, Qdoc_string))
 {
 f->doc_string = Qnil;
 return 1;
 face_plist (Lisp_Object obj)
 {
 struct Lisp_Face *f = XFACE (obj);
 Lisp_Object result = Qnil;
-#define FROB(propprop) 							\
+/* backwards order; we reverse it below */
-do {									\
+result = Fcons (f->foreground,        Fcons (Qforeground,        result));
-/* backwards order; we reverse it below */				\
+result = Fcons (f->background,        Fcons (Qbackground,        result));
-result = Fcons (f->propprop, Fcons (Q##propprop, result));		\
+result = Fcons (f->font,              Fcons (Qfont,              result));
-} while (0)
+result = Fcons (f->display_table,     Fcons (Qdisplay_table,     result));
+result = Fcons (f->background_pixmap, Fcons (Qbackground_pixmap, result));
-FROB (foreground);
+result = Fcons (f->underline,         Fcons (Qunderline,         result));
-FROB (background);
+result = Fcons (f->strikethru,        Fcons (Qstrikethru,        result));
-FROB (font);
+result = Fcons (f->highlight,         Fcons (Qhighlight,         result));
-FROB (display_table);
+result = Fcons (f->dim,               Fcons (Qdim,               result));
-FROB (background_pixmap);
+result = Fcons (f->blinking,          Fcons (Qblinking,          result));
-FROB (underline);
+result = Fcons (f->reverse,           Fcons (Qreverse,           result));
-FROB (strikethru);
-FROB (highlight);
-FROB (dim);
-FROB (blinking);
-FROB (reverse);
-#undef FROB
 return nconc2 (Fnreverse (result), f->plist);
 }
 /************************************************************************/
 for (elt = FACE_PROPERTY_SPEC_LIST (cur_face, property, Qall);
 !NILP (elt);
 elt = XCDR (elt))
 {
-Lisp_Object locale, values;
+Lisp_Object values = XCDR (XCAR (elt));
-locale = XCAR (XCAR (elt));
-values = XCDR (XCAR (elt));
 for (; !NILP (values); values = XCDR (values))
 	{
 	  Lisp_Object value = XCDR (XCAR (values));
 	  if (VECTORP (value) && XVECTOR_LENGTH (value))
 if (EQ (fcl->property, Qfont))
 {
 update_inheritance_mapper_internal (contents, fcl->face, Qfont);
 }
-else if (EQ (fcl->property, Qforeground)
+else if (EQ (fcl->property, Qforeground) ||
-	   || EQ (fcl->property, Qbackground))
+	   EQ (fcl->property, Qbackground))
 {
 update_inheritance_mapper_internal (contents, fcl->face, Qforeground);
 update_inheritance_mapper_internal (contents, fcl->face, Qbackground);
 }
-else if (EQ (fcl->property, Qunderline)
+else if (EQ (fcl->property, Qunderline)  ||
-	   || EQ (fcl->property, Qstrikethru)
+	   EQ (fcl->property, Qstrikethru) ||
-	   || EQ (fcl->property, Qhighlight)
+	   EQ (fcl->property, Qhighlight)  ||
-	   || EQ (fcl->property, Qdim)
+	   EQ (fcl->property, Qdim)        ||
-	   || EQ (fcl->property, Qblinking)
+	   EQ (fcl->property, Qblinking)   ||
-	   || EQ (fcl->property, Qreverse))
+	   EQ (fcl->property, Qreverse))
 {
 update_inheritance_mapper_internal (contents, fcl->face, Qunderline);
 update_inheritance_mapper_internal (contents, fcl->face, Qstrikethru);
 update_inheritance_mapper_internal (contents, fcl->face, Qhighlight);
 update_inheritance_mapper_internal (contents, fcl->face, Qdim);
 for (i = 0; i < NUM_LEADING_BYTES; i++)
 {
 if (charsets[i])
 	{
-	  Lisp_Object charset;
+	  Lisp_Object charset = CHARSET_BY_LEADING_BYTE (i + MIN_LEADING_BYTE);
-	  Lisp_Object font_instance;
+	  Lisp_Object font_instance = FACE_CACHEL_FONT (cachel, charset);
-	  struct Lisp_Font_Instance *fi;
+	  struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font_instance);
-	  charset = CHARSET_BY_LEADING_BYTE (i + MIN_LEADING_BYTE);
 	  assert (CHARSETP (charset));
-	  font_instance = FACE_CACHEL_FONT (cachel, charset);
 	  assert (FONT_INSTANCEP (font_instance));
-	  fi = XFONT_INSTANCE (font_instance);
-	  fm->ascent = max ((int) fi->ascent, (int) fm->ascent);
+	  if (fm->ascent  < (int) fi->ascent)  fm->ascent  = (int) fi->ascent;
-	  fm->descent = max ((int) fi->descent, (int) fm->descent);
+	  if (fm->descent < (int) fi->descent) fm->descent = (int) fi->descent;
 	  fm->height = fm->ascent + fm->descent;
 	  if (fi->proportional_p)
 	    fm->proportional_p = 1;
 	  if (EQ (charset, Vcharset_ascii))
 	    fm->width = fi->width;
 /* Setting the background clears the entire frame area
 including the toolbar so we force an immediate redraw of
 it. */
 if (EQ (name, Qbackground))
 	 MAYBE_DEVMETH (XDEVICE (frm->device), redraw_frame_toolbars, (frm));
-#endif
+#endif /* HAVE_TOOLBARS */
 /* The intent of this code is to cause the frame size in
 	  characters to remain the same when the font changes, at the
 	  expense of changing the frame size in pixels.  It's not
 	  totally clear that this is the right thing to do, but it's
 /* We GCPRO old_face because it might be temporary, and GCing could
 occur in various places below. */
 GCPRO4 (tag_set, locale, old_face, new_face);
 /* check validity of how_to_add now. */
-(void) decode_how_to_add_specification (how_to_add);
+decode_how_to_add_specification (how_to_add);
 /* and of tag_set. */
 tag_set = decode_specifier_tag_set (tag_set);
 /* and of locale. */
 locale = decode_locale_list (locale);
 /* #### We may want to have different fallback values if NeXTstep
 support is compiled in. */
 {
 Lisp_Object inst_list = Qnil;
 #ifdef HAVE_X_WINDOWS
-CONST char *fonts[30];
-int n = 0;
 /* The same gory list from x-faces.el.
 (#### Perhaps we should remove the stuff from x-faces.el
 and only depend on this stuff here?  That should work.)
 */
-fonts[n++] = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*";
+CONST char *fonts[] =
-fonts[n++] = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*";
+{
-fonts[n++] = "-*-courier-*-r-*-*-*-120-*-*-*-*-iso8859-*";
+"-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
-fonts[n++] = "-*-*-medium-r-*-*-*-120-*-*-m-*-iso8859-*";
+"-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*",
-fonts[n++] = "-*-*-medium-r-*-*-*-120-*-*-c-*-iso8859-*";
+"-*-courier-*-r-*-*-*-120-*-*-*-*-iso8859-*",
-fonts[n++] = "-*-*-*-r-*-*-*-120-*-*-m-*-iso8859-*";
+"-*-*-medium-r-*-*-*-120-*-*-m-*-iso8859-*",
-fonts[n++] = "-*-*-*-r-*-*-*-120-*-*-c-*-iso8859-*";
+"-*-*-medium-r-*-*-*-120-*-*-c-*-iso8859-*",
-fonts[n++] = "-*-*-*-r-*-*-*-120-*-*-*-*-iso8859-*";
+"-*-*-*-r-*-*-*-120-*-*-m-*-iso8859-*",
-fonts[n++] = "-*-*-medium-r-*-*-*-120-*-*-m-*-*-*";
+"-*-*-*-r-*-*-*-120-*-*-c-*-iso8859-*",
-fonts[n++] = "-*-*-medium-r-*-*-*-120-*-*-c-*-*-*";
+"-*-*-*-r-*-*-*-120-*-*-*-*-iso8859-*",
-fonts[n++] = "-*-*-*-r-*-*-*-120-*-*-m-*-*-*";
+"-*-*-medium-r-*-*-*-120-*-*-m-*-*-*",
-fonts[n++] = "-*-*-*-r-*-*-*-120-*-*-c-*-*-*";
+"-*-*-medium-r-*-*-*-120-*-*-c-*-*-*",
-fonts[n++] = "-*-*-*-r-*-*-*-120-*-*-*-*-*-*";
+"-*-*-*-r-*-*-*-120-*-*-m-*-*-*",
-fonts[n++] = "-*-*-*-*-*-*-*-120-*-*-*-*-*-*";
+"-*-*-*-r-*-*-*-120-*-*-c-*-*-*",
-fonts[n++] = "*";
+"-*-*-*-r-*-*-*-120-*-*-*-*-*-*",
+"-*-*-*-*-*-*-*-120-*-*-*-*-*-*",
-for (--n; n >= 0; --n)
+"*"
-inst_list = Fcons (Fcons (list1 (Qx), build_string (fonts[n])),
+};
+CONST char **fontptr;
+for (fontptr = fonts + countof(fonts) - 1; fontptr >= fonts; fontptr--)
+inst_list = Fcons (Fcons (list1 (Qx), build_string (*fontptr)),
 			 inst_list);
-#endif
+#endif /* HAVE_X_WINDOWS */
 #ifdef HAVE_TTY
 inst_list = Fcons (Fcons (list1 (Qtty), build_string ("normal")),
 		       inst_list);
-#endif
+#endif /* HAVE_TTY */
 set_specifier_fallback (Fget (Vdefault_face, Qfont, Qnil), inst_list);
 }
 set_specifier_fallback (Fget (Vdefault_face, Qunderline, Qnil),
 			 list1 (Fcons (Qnil, Qnil)));

Mercurial > hg > xemacs-beta

comparison src/faces.c @ 183:e121b013d1f0 r20-3b18