emacs: src/xfaces.c comparison

comparison src/xfaces.c @ 46370:40db0673e6f0

Most uses of XSTRING combined with STRING_BYTES or indirection changed to SCHARS, SBYTES, STRING_INTERVALS, SREF, SDATA; explicit size_byte references left unchanged for now.

author	Ken Raeburn <raeburn@raeburn.org>
date	Mon, 15 Jul 2002 00:00:41 +0000
parents	1fb8f75062c6
children	d6b51ec01987

comparison

equal deleted inserted replaced

-:dd1d3b1d0053
+:40db0673e6f0
 #define STRDUPA(S) strcpy ((char *) alloca (strlen ((S)) + 1), (S))
 /* Make a copy of the contents of Lisp string S on the stack using
 alloca.  Value is a pointer to the copy.  */
-#define LSTRDUPA(S) STRDUPA (XSTRING ((S))->data)
+#define LSTRDUPA(S) STRDUPA (SDATA ((S)))
 /* Size of hash table of realized faces in face caches (should be a
 prime number).  */
 #define FACE_CACHE_BUCKETS_SIZE 1001
 if (NATNUMP (width) && NATNUMP (height) && STRINGP (data))
 	{
 	  int bytes_per_row = ((XFASTINT (width) + BITS_PER_CHAR - 1)
 			       / BITS_PER_CHAR);
-	  if (STRING_BYTES (XSTRING (data)) >= bytes_per_row * XINT (height))
+	  if (SBYTES (data) >= bytes_per_row * XINT (height))
 	    pixmap_p = 1;
 	}
 }
 return pixmap_p ? Qt : Qnil;
 w = XINT (Fcar (name));
 h = XINT (Fcar (Fcdr (name)));
 bits = Fcar (Fcdr (Fcdr (name)));
-bitmap_id = x_create_bitmap_from_data (f, XSTRING (bits)->data,
+bitmap_id = x_create_bitmap_from_data (f, SDATA (bits),
 					     w, h);
 }
 else
 {
 /* It must be a string -- a file name.  */
 struct frame *f;
 CHECK_FRAME (frame);
 CHECK_STRING (color);
 f = XFRAME (frame);
-return face_color_gray_p (f, XSTRING (color)->data) ? Qt : Qnil;
+return face_color_gray_p (f, SDATA (color)) ? Qt : Qnil;
 }
 DEFUN ("color-supported-p", Fcolor_supported_p,
 Scolor_supported_p, 2, 3, 0,
 struct frame *f;
 CHECK_FRAME (frame);
 CHECK_STRING (color);
 f = XFRAME (frame);
-if (face_color_supported_p (f, XSTRING (color)->data, !NILP (background_p)))
+if (face_color_supported_p (f, SDATA (color), !NILP (background_p)))
 return Qt;
 return Qnil;
 }
 	   || target_index == LFACE_STRIKE_THROUGH_INDEX
 	   || target_index == LFACE_BOX_INDEX);
 /* if the color map is full, defined_color will return a best match
 to the values in an existing cell. */
-if (!defined_color (f, XSTRING (name)->data, &color, 1))
+if (!defined_color (f, SDATA (name), &color, 1))
 {
 add_to_log ("Unable to load color \"%s\"", name, Qnil);
 switch (target_index)
 	{
 /* Check for support for foreground, not for background because
 face_color_supported_p is smart enough to know that grays are
 "supported" as background because we are supposed to use stipple
 for them.  */
-if (!face_color_supported_p (f, XSTRING (bg)->data, 0)
+if (!face_color_supported_p (f, SDATA (bg), 0)
 && !NILP (Fbitmap_spec_p (Vface_default_stipple)))
 {
 x_destroy_bitmap (f, face->stipple);
 face->stipple = load_pixmap (f, Vface_default_stipple,
 				   &face->pixmap_w, &face->pixmap_h);
 split them into fields.  */
 n = nignored = 0;
 for (tem = lfonts; CONSP (tem) && n < nfonts; tem = XCDR (tem))
 {
 Lisp_Object elt, tail;
-char *name = XSTRING (XCAR (tem))->data;
+char *name = SDATA (XCAR (tem));
 /* Ignore fonts matching a pattern from face-ignored-fonts.  */
 for (tail = Vface_ignored_fonts; CONSP (tail); tail = XCDR (tail))
 	{
 	  elt = XCAR (tail);
 while (CONSP (list))
 	{
 	  Lisp_Object entry = XCAR (list);
 	  if (CONSP (entry)
 	      && STRINGP (XCAR (entry))
-	      && strcmp (XSTRING (XCAR (entry))->data, pattern) == 0)
+	      && strcmp (SDATA (XCAR (entry)), pattern) == 0)
 	    break;
 	  list = XCDR (list);
 	}
 if (CONSP (list))
 		 /* If list is screwed up, give up.  */
 		 && (name = XCAR (patterns),
 		     STRINGP (name))
 		 /* Ignore patterns equal to PATTERN because we tried that
 		    already with no success.  */
-		 && (strcmp (XSTRING (name)->data, pattern) == 0
+		 && (strcmp (SDATA (name), pattern) == 0
-		     || (n = x_face_list_fonts (f, XSTRING (name)->data,
+		     || (n = x_face_list_fonts (f, SDATA (name),
 						fonts, nfonts, 0),
 			 n == 0)))
 	    patterns = XCDR (patterns);
 	}
 }
 {
 char *pattern_str, *family_str, *registry_str;
 if (NILP (pattern))
 {
-family_str = (NILP (family) ? "*" : (char *) XSTRING (family)->data);
+family_str = (NILP (family) ? "*" : (char *) SDATA (family));
-registry_str = (NILP (registry) ? "*" : (char *) XSTRING (registry)->data);
+registry_str = (NILP (registry) ? "*" : (char *) SDATA (registry));
 pattern_str = (char *) alloca (strlen (family_str)
 				     + strlen (registry_str)
 				     + 10);
 strcpy (pattern_str, index (family_str, '-') ? "-" : "-*-");
 	  else
 	    strcat (pattern_str, "*-*");
 	}
 }
 else
-pattern_str = (char *) XSTRING (pattern)->data;
+pattern_str = (char *) SDATA (pattern);
 return sorted_font_list (f, pattern_str, cmp_font_names, fonts);
 }
 Lisp_Object face_name;
 {
 Lisp_Object aliased;
 if (STRINGP (face_name))
-face_name = intern (XSTRING (face_name)->data);
+face_name = intern (SDATA (face_name));
 while (SYMBOLP (face_name))
 {
 aliased = Fget (face_name, Qface_alias);
 if (NILP (aliased))
 struct font_name font;
 char *buffer;
 int pt;
 int have_xlfd_p;
 int fontset;
-char *font_name = XSTRING (fontname)->data;
+char *font_name = SDATA (fontname);
 struct font_info *font_info;
 /* If FONTNAME is actually a fontset name, get ASCII font name of it.  */
 fontset = fs_query_fontset (fontname, 0);
 if (fontset >= 0)
-font_name = XSTRING (fontset_ascii (fontset))->data;
+font_name = SDATA (fontset_ascii (fontset));
 /* Check if FONT_NAME is surely available on the system.  Usually
 FONT_NAME is already cached for the frame F and FS_LOAD_FONT
 returns quickly.  But, even if FONT_NAME is not yet cached,
 caching it now is not futail because we anyway load the font
 	    }
 	  else
 	    add_to_log ("Invalid face color", color_name, Qnil);
 	}
 else if (SYMBOLP (first)
-	       && *XSTRING (SYMBOL_NAME (first))->data == ':')
+	       && *SDATA (SYMBOL_NAME (first)) == ':')
 	{
 	  /* Assume this is the property list form.  */
 	  while (CONSP (prop) && CONSP (XCDR (prop)))
 	    {
 	      Lisp_Object keyword = XCAR (prop);
 if (EQ (attr, QCfamily))
 {
 if (!UNSPECIFIEDP (value))
 	{
 	  CHECK_STRING (value);
-	  if (XSTRING (value)->size == 0)
+	  if (SCHARS (value) == 0)
 	    signal_error ("Invalid face family", value);
 	}
 old_value = LFACE_FAMILY (lface);
 LFACE_FAMILY (lface) = value;
 font_related_attr_p = 1;
 	if ((SYMBOLP (value)
 	     && !EQ (value, Qt)
 	     && !EQ (value, Qnil))
 	    /* Underline color.  */
 	    || (STRINGP (value)
-		&& XSTRING (value)->size == 0))
+		&& SCHARS (value) == 0))
 	  signal_error ("Invalid face underline", value);
 old_value = LFACE_UNDERLINE (lface);
 LFACE_UNDERLINE (lface) = value;
 }
 	if ((SYMBOLP (value)
 	     && !EQ (value, Qt)
 	     && !EQ (value, Qnil))
 	    /* Overline color.  */
 	    || (STRINGP (value)
-		&& XSTRING (value)->size == 0))
+		&& SCHARS (value) == 0))
 	  signal_error ("Invalid face overline", value);
 old_value = LFACE_OVERLINE (lface);
 LFACE_OVERLINE (lface) = value;
 }
 	if ((SYMBOLP (value)
 	     && !EQ (value, Qt)
 	     && !EQ (value, Qnil))
 	    /* Strike-through color.  */
 	    || (STRINGP (value)
-		&& XSTRING (value)->size == 0))
+		&& SCHARS (value) == 0))
 	  signal_error ("Invalid face strike-through", value);
 old_value = LFACE_STRIKE_THROUGH (lface);
 LFACE_STRIKE_THROUGH (lface) = value;
 }
 else if (NILP (value))
 	valid_p = 1;
 else if (INTEGERP (value))
 	valid_p = XINT (value) != 0;
 else if (STRINGP (value))
-	valid_p = XSTRING (value)->size > 0;
+	valid_p = SCHARS (value) > 0;
 else if (CONSP (value))
 	{
 	  Lisp_Object tem;
 	  tem = value;
 		  if (!INTEGERP (v) || XINT (v) == 0)
 		    break;
 		}
 	      else if (EQ (k, QCcolor))
 		{
-		  if (!STRINGP (v) || XSTRING (v)->size == 0)
+		  if (!STRINGP (v) || SCHARS (v) == 0)
 		    break;
 		}
 	      else if (EQ (k, QCstyle))
 		{
 		  if (!EQ (v, Qpressed_button) && !EQ (v, Qreleased_button))
 	{
 	  /* Don't check for valid color names here because it depends
 	     on the frame (display) whether the color will be valid
 	     when the face is realized.  */
 	  CHECK_STRING (value);
-	  if (XSTRING (value)->size == 0)
+	  if (SCHARS (value) == 0)
 	    signal_error ("Empty foreground color value", value);
 	}
 old_value = LFACE_FOREGROUND (lface);
 LFACE_FOREGROUND (lface) = value;
 }
 	{
 	  /* Don't check for valid color names here because it depends
 	     on the frame (display) whether the color will be valid
 	     when the face is realized.  */
 	  CHECK_STRING (value);
-	  if (XSTRING (value)->size == 0)
+	  if (SCHARS (value) == 0)
 	    signal_error ("Empty background color value", value);
 	}
 old_value = LFACE_BACKGROUND (lface);
 LFACE_BACKGROUND (lface) = value;
 }
 {
 Lisp_Object result = make_number (0);
 xassert (STRINGP (value));
-if (xstricmp (XSTRING (value)->data, "on") == 0
+if (xstricmp (SDATA (value), "on") == 0
-|| xstricmp (XSTRING (value)->data, "true") == 0)
+|| xstricmp (SDATA (value), "true") == 0)
 result = Qt;
-else if (xstricmp (XSTRING (value)->data, "off") == 0
+else if (xstricmp (SDATA (value), "off") == 0
-	   || xstricmp (XSTRING (value)->data, "false") == 0)
+	   || xstricmp (SDATA (value), "false") == 0)
 result = Qnil;
-else if (xstricmp (XSTRING (value)->data, "unspecified") == 0)
+else if (xstricmp (SDATA (value), "unspecified") == 0)
 result = Qunspecified;
 else if (signal_p)
 signal_error ("Invalid face attribute value from X resource", value);
 return result;
 {
 CHECK_SYMBOL (face);
 CHECK_SYMBOL (attr);
 CHECK_STRING (value);
-if (xstricmp (XSTRING (value)->data, "unspecified") == 0)
+if (xstricmp (SDATA (value), "unspecified") == 0)
 value = Qunspecified;
 else if (EQ (attr, QCheight))
 {
 value = Fstring_to_number (value, make_number (10));
 if (XINT (value) <= 0)
 	signal_error ("Invalid face height from X resource", value);
 }
 else if (EQ (attr, QCbold) || EQ (attr, QCitalic))
 value = face_boolean_x_resource_value (value, 1);
 else if (EQ (attr, QCweight) || EQ (attr, QCslant) || EQ (attr, QCwidth))
-value = intern (XSTRING (value)->data);
+value = intern (SDATA (value));
 else if (EQ (attr, QCreverse_video) || EQ (attr, QCinverse_video))
 value = face_boolean_x_resource_value (value, 1);
 else if (EQ (attr, QCunderline)
 	   || EQ (attr, QCoverline)
 	   || EQ (attr, QCstrike_through))
 	  rdb != NULL))
 {
 char line[512];
 Lisp_Object lface = lface_from_face_name (f, Qmenu, 1);
 struct face *face = FACE_FROM_ID (f, MENU_FACE_ID);
-char *myname = XSTRING (Vx_resource_name)->data;
+char *myname = SDATA (Vx_resource_name);
 int changed_p = 0;
 #ifdef USE_MOTIF
 const char *popup_path = "popup_menu";
 #else
 const char *popup_path = "menu.popup";
 if (STRINGP (LFACE_FOREGROUND (lface)))
 	{
 	  sprintf (line, "%s.%s*foreground: %s",
 		   myname, popup_path,
-		   XSTRING (LFACE_FOREGROUND (lface))->data);
+		   SDATA (LFACE_FOREGROUND (lface)));
 	  XrmPutLineResource (&rdb, line);
 	  sprintf (line, "%s.pane.menubar*foreground: %s",
-		   myname, XSTRING (LFACE_FOREGROUND (lface))->data);
+		   myname, SDATA (LFACE_FOREGROUND (lface)));
 	  XrmPutLineResource (&rdb, line);
 	  changed_p = 1;
 	}
 if (STRINGP (LFACE_BACKGROUND (lface)))
 	{
 	  sprintf (line, "%s.%s*background: %s",
 		   myname, popup_path,
-		   XSTRING (LFACE_BACKGROUND (lface))->data);
+		   SDATA (LFACE_BACKGROUND (lface)));
 	  XrmPutLineResource (&rdb, line);
 	  sprintf (line, "%s.pane.menubar*background: %s",
-		   myname, XSTRING (LFACE_BACKGROUND (lface))->data);
+		   myname, SDATA (LFACE_BACKGROUND (lface)));
 	  XrmPutLineResource (&rdb, line);
 	  changed_p = 1;
 	}
 if (face->font_name
 if (!EQ (a, b))
 	{
 	  switch (XTYPE (a))
 	    {
 	    case Lisp_String:
-	      equal_p = ((STRING_BYTES (XSTRING (a))
+	      equal_p = ((SBYTES (a)
-			  == STRING_BYTES (XSTRING (b)))
+			  == SBYTES (b))
-			 && bcmp (XSTRING (a)->data, XSTRING (b)->data,
+			 && bcmp (SDATA (a), SDATA (b),
-				  STRING_BYTES (XSTRING (a))) == 0);
+				  SBYTES (a)) == 0);
 	      break;
 	    case Lisp_Int:
 	    case Lisp_Symbol:
 	      equal_p = 0;
 Lisp_Object string;
 {
 unsigned char *s;
 unsigned hash = 0;
 xassert (STRINGP (string));
-for (s = XSTRING (string)->data; *s; ++s)
+for (s = SDATA (string); *s; ++s)
 hash = (hash << 1) ^ tolower (*s);
 return hash;
 }
 lface_same_font_attributes_p (lface1, lface2)
 Lisp_Object *lface1, *lface2;
 {
 xassert (lface_fully_specified_p (lface1)
 	   && lface_fully_specified_p (lface2));
-return (xstricmp (XSTRING (lface1[LFACE_FAMILY_INDEX])->data,
+return (xstricmp (SDATA (lface1[LFACE_FAMILY_INDEX]),
-		    XSTRING (lface2[LFACE_FAMILY_INDEX])->data) == 0
+		    SDATA (lface2[LFACE_FAMILY_INDEX])) == 0
 	  && EQ (lface1[LFACE_HEIGHT_INDEX], lface2[LFACE_HEIGHT_INDEX])
 	  && EQ (lface1[LFACE_SWIDTH_INDEX], lface2[LFACE_SWIDTH_INDEX])
 	  && EQ (lface1[LFACE_AVGWIDTH_INDEX], lface2[LFACE_AVGWIDTH_INDEX])
 	  && EQ (lface1[LFACE_WEIGHT_INDEX], lface2[LFACE_WEIGHT_INDEX])
 	  && EQ (lface1[LFACE_SLANT_INDEX], lface2[LFACE_SLANT_INDEX])
 	  && (EQ (lface1[LFACE_FONT_INDEX], lface2[LFACE_FONT_INDEX])
 	      || (STRINGP (lface1[LFACE_FONT_INDEX])
 		  && STRINGP (lface2[LFACE_FONT_INDEX])
-		  && xstricmp (XSTRING (lface1[LFACE_FONT_INDEX])->data,
+		  && xstricmp (SDATA (lface1[LFACE_FONT_INDEX]),
-			       XSTRING (lface2[LFACE_FONT_INDEX])->data))));
+			       SDATA (lface2[LFACE_FONT_INDEX])))));
 }
 /***********************************************************************
 CHECK_LIVE_FRAME (frame);
 f = XFRAME (frame);
 if ((CONSP (color1) && !parse_rgb_list (color1, &cdef1))
 || !STRINGP (color1)
-|| !defined_color (f, XSTRING (color1)->data, &cdef1, 0))
+|| !defined_color (f, SDATA (color1), &cdef1, 0))
 signal_error ("Invalid color", color1);
 if ((CONSP (color2) && !parse_rgb_list (color2, &cdef2))
 || !STRINGP (color2)
-|| !defined_color (f, XSTRING (color2)->data, &cdef2, 0))
+|| !defined_color (f, SDATA (color2), &cdef2, 0))
 signal_error ("Invalid color", color2);
 return make_number (color_distance (&cdef1, &cdef2));
 }
 exactly, Emacs looks for ones with the same registry as the
 default font.  On the Mac, this is mac-roman, which does not work
 if the family is -etl-fixed, e.g.  The following widens the
 choices and fixes that problem.  */
 if (nfonts == 0 && STRINGP (face_family) && STRINGP (registry)
-&& xstricmp (XSTRING (registry)->data, "mac-roman") == 0)
+&& xstricmp (SDATA (registry), "mac-roman") == 0)
 nfonts = try_alternative_families (f, face_family, Qnil, fonts);
 #endif
 if (nfonts == 0 && !NILP (family))
 nfonts = try_alternative_families (f, family, registry, fonts);
 return NULL;
 }
 /* If what we got is a name pattern, return it.  */
 if (STRINGP (pattern))
-return xstrdup (XSTRING (pattern)->data);
+return xstrdup (SDATA (pattern));
 /* Get a list of fonts matching that pattern and choose the
 best match for the specified face attributes from it.  */
 nfonts = try_font_list (f, attrs, XCAR (pattern), XCDR (pattern), &fonts);
 width_ratio = (SINGLE_BYTE_CHAR_P (c)
 XSETFRAME (frame, f);
 color = face->lface[idx];
 if (STRINGP (color)
-&& XSTRING (color)->size
+&& SCHARS (color)
 && CONSP (Vtty_defined_color_alist)
 && (def = assq_no_quit (color, call1 (Qtty_color_alist, frame)),
 	  CONSP (def)))
 {
 /* Associations in tty-defined-color-alist are of the form
 is nil if face is constant all the way to the end of the string.
 Otherwise it is a string position where to check faces next.
 Limit is the maximum position up to which to check for property
 changes in Fnext_single_property_change.  Strings are usually
 short, so set the limit to the end of the string.  */
-XSETFASTINT (limit, XSTRING (string)->size);
+XSETFASTINT (limit, SCHARS (string));
 end = Fnext_single_property_change (position, prop_name, string, limit);
 if (INTEGERP (end))
 *endptr = XFASTINT (end);
 else
 *endptr = -1;
 #ifdef HAVE_X_WINDOWS
 fprintf (stderr, "gc: %d\n", (int) face->gc);
 #endif
 fprintf (stderr, "foreground: 0x%lx (%s)\n",
 	   face->foreground,
-	   XSTRING (face->lface[LFACE_FOREGROUND_INDEX])->data);
+	   SDATA (face->lface[LFACE_FOREGROUND_INDEX]));
 fprintf (stderr, "background: 0x%lx (%s)\n",
 	   face->background,
-	   XSTRING (face->lface[LFACE_BACKGROUND_INDEX])->data);
+	   SDATA (face->lface[LFACE_BACKGROUND_INDEX]));
 fprintf (stderr, "font_name: %s (%s)\n",
 	   face->font_name,
-	   XSTRING (face->lface[LFACE_FAMILY_INDEX])->data);
+	   SDATA (face->lface[LFACE_FAMILY_INDEX]));
 #ifdef HAVE_X_WINDOWS
 fprintf (stderr, "font = %p\n", face->font);
 #endif
 fprintf (stderr, "font_info_id = %d\n", face->font_info_id);
 fprintf (stderr, "fontset: %d\n", face->fontset);
 fprintf (stderr, "underline: %d (%s)\n",
 	   face->underline_p,
-	   XSTRING (Fsymbol_name (face->lface[LFACE_UNDERLINE_INDEX]))->data);
+	   SDATA (Fsymbol_name (face->lface[LFACE_UNDERLINE_INDEX])));
 fprintf (stderr, "hash: %d\n", face->hash);
 fprintf (stderr, "charset: %d\n", face->charset);
 }

Mercurial > emacs

comparison src/xfaces.c @ 46370:40db0673e6f0