emacs: src/fontset.c comparison

comparison src/fontset.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	39cdf9669519
children	dd231f1390d2

comparison

equal deleted inserted replaced

-:dd1d3b1d0053
+:40db0673e6f0
 font_family_registry (fontname, force)
 Lisp_Object fontname;
 int force;
 {
 Lisp_Object family, registry;
-char *p = XSTRING (fontname)->data;
+char *p = SDATA (fontname);
 char *sep[15];
 int i = 0;
 while (*p && i < 15)
 if (*p++ == '-')
 exception is a font for single byte characters.  In that case, we
 return a cons of FAMILY and REGISTRY extracted from the opened
 font name.  */
 elt = XCDR (elt);
 xassert (STRINGP (elt));
-fontp = FS_LOAD_FONT (f, c, XSTRING (elt)->data, -1);
+fontp = FS_LOAD_FONT (f, c, SDATA (elt), -1);
 if (!fontp)
 return Qnil;
 return font_family_registry (build_string (fontp->full_name),
 			       SINGLE_BYTE_CHAR_P (c));
 	}
 if (!fontname && charset == CHARSET_ASCII)
 	{
 	  elt = FONTSET_ASCII (fontset);
-	  fontname = XSTRING (XCDR (elt))->data;
+	  fontname = SDATA (XCDR (elt));
 	}
 }
 if (!fontname)
 /* No way to get fontname.  */
 /* Cache data used by fontset_pattern_regexp.  The car part is a
 pattern string containing at least one wild card, the cdr part is
 the corresponding regular expression.  */
 static Lisp_Object Vcached_fontset_data;
-#define CACHED_FONTSET_NAME (XSTRING (XCAR (Vcached_fontset_data))->data)
+#define CACHED_FONTSET_NAME (SDATA (XCAR (Vcached_fontset_data)))
 #define CACHED_FONTSET_REGEX (XCDR (Vcached_fontset_data))
 /* If fontset name PATTERN contains any wild card, return regular
 expression corresponding to PATTERN.  */
 static Lisp_Object
 fontset_pattern_regexp (pattern)
 Lisp_Object pattern;
 {
-if (!index (XSTRING (pattern)->data, '*')
+if (!index (SDATA (pattern), '*')
-&& !index (XSTRING (pattern)->data, '?'))
+&& !index (SDATA (pattern), '?'))
 /* PATTERN does not contain any wild cards.  */
 return Qnil;
 if (!CONSP (Vcached_fontset_data)
-|| strcmp (XSTRING (pattern)->data, CACHED_FONTSET_NAME))
+|| strcmp (SDATA (pattern), CACHED_FONTSET_NAME))
 {
 /* We must at first update the cached data.  */
-char *regex = (char *) alloca (XSTRING (pattern)->size * 2 + 3);
+char *regex = (char *) alloca (SCHARS (pattern) * 2 + 3);
 char *p0, *p1 = regex;
 /* Convert "*" to ".*", "?" to ".".  */
 *p1++ = '^';
-for (p0 = (char *) XSTRING (pattern)->data; *p0; p0++)
+for (p0 = (char *) SDATA (pattern); *p0; p0++)
 	{
 	  if (*p0 == '*')
 	    {
 	      *p1++ = '.';
 	      *p1++ = '*';
 	    *p1++ = *p0;
 	}
 *p1++ = '$';
 *p1++ = 0;
-Vcached_fontset_data = Fcons (build_string (XSTRING (pattern)->data),
+Vcached_fontset_data = Fcons (build_string (SDATA (pattern)),
 				    build_string (regex));
 }
 return CACHED_FONTSET_REGEX;
 }
 fontset = FONTSET_FROM_ID (i);
 if (NILP (fontset)
 	  || !BASE_FONTSET_P (fontset))
 	continue;
-this_name = XSTRING (FONTSET_NAME (fontset))->data;
+this_name = SDATA (FONTSET_NAME (fontset));
 if (regexpp
 	  ? fast_c_string_match_ignore_case (name, this_name) >= 0
-	  : !strcmp (XSTRING (name)->data, this_name))
+	  : !strcmp (SDATA (name), this_name))
 	return i;
 }
 return -1;
 }
 (*check_window_system_func) ();
 CHECK_STRING (pattern);
-if (XSTRING (pattern)->size == 0)
+if (SCHARS (pattern) == 0)
 return Qnil;
 id = fs_query_fontset (pattern, !NILP (regexpp));
 if (id < 0)
 return Qnil;
 fontset = FONTSET_FROM_ID (id);
 if (NILP (fontset)
 	  || !BASE_FONTSET_P (fontset)
 	  || !EQ (frame, FONTSET_FRAME (fontset)))
 	continue;
-name = XSTRING (FONTSET_NAME (fontset))->data;
+name = SDATA (FONTSET_NAME (fontset));
 if (!NILP (regexp)
 	  ? (fast_c_string_match_ignore_case (regexp, name) < 0)
-	  : strcmp (XSTRING (pattern)->data, name))
+	  : strcmp (SDATA (pattern), name))
 	continue;
 if (size)
 	{
 	  struct font_info *fontp;
 name = Fdowncase (name);
 tem = Fquery_fontset (name, Qnil);
 if (!NILP (tem))
 error ("Fontset `%s' matches the existing fontset `%s'",
-	   XSTRING (name)->data, XSTRING (tem)->data);
+	   SDATA (name), SDATA (tem));
 /* Check the validity of FONTLIST while creating a template for
 fontset elements.  */
 elements = ascii_font = Qnil;
 for (tail = fontlist; CONSP (tail); tail = XCDR (tail))
 return Vdefault_fontset;
 CHECK_STRING (name);
 id = fs_query_fontset (name, 0);
 if (id < 0)
-error ("Fontset `%s' does not exist", XSTRING (name)->data);
+error ("Fontset `%s' does not exist", SDATA (name));
 return FONTSET_FROM_ID (id);
 }
 DEFUN ("set-fontset-font", Fset_fontset_font, Sset_fontset_font, 3, 4, 0,
 doc: /* Modify fontset NAME to use FONTNAME for CHARACTER.
 f = XFRAME (frame);
 if (!query_font_func)
 error ("Font query function is not supported");
-fontp = (*query_font_func) (f, XSTRING (name)->data);
+fontp = (*query_font_func) (f, SDATA (name));
 if (!fontp)
 return Qnil;
 info = Fmake_vector (make_number (7), Qnil);
 elt = Fcdr (Fcdr (Fassq (CHARSET_SYMBOL (CHARSET_ASCII), val)));
 if (CONSP (elt))
 {
 elt = XCAR (elt);
-fontp = (*query_font_func) (f, XSTRING (elt)->data);
+fontp = (*query_font_func) (f, SDATA (elt));
 }
 val = Fmake_vector (make_number (3), val);
 AREF (val, 0) = fontp ? make_number (fontp->size) : make_number (0);
 AREF (val, 1) = fontp ? make_number (fontp->height) : make_number (0);
 return val;

Mercurial > emacs

comparison src/fontset.c @ 46370:40db0673e6f0