emacs: src/font.c comparison

comparison src/font.c @ 112434:9de5a68b57e1

Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.

author	Paul Eggert <eggert@cs.ucla.edu>
date	Sat, 22 Jan 2011 18:56:06 -0800
parents	42e22c4f06b7
children

comparison

equal deleted inserted replaced

-:7b649f6eac4f
+:9de5a68b57e1
 else
 	{
 	  if (SYMBOLP (val))
 	    val = SYMBOL_NAME (val);
 	  if (j == XLFD_REGISTRY_INDEX
-	      && ! strchr ((char *) SDATA (val), '-'))
+	      && ! strchr (SSDATA (val), '-'))
 	    {
 	      /* Change "jisx0208*" and "jisx0208" to "jisx0208*-*".  */
 	      if (SDATA (val)[SBYTES (val) - 1] == '*')
 		{
 		  f[j] = alloca (SBYTES (val) + 3);
 		  sprintf (f[j], "%s*-*", SDATA (val));
 		  len += SBYTES (val) + 4;
 		}
 	    }
 	  else
-	    f[j] = (char *) SDATA (val), len += SBYTES (val) + 1;
+	    f[j] = SSDATA (val), len += SBYTES (val) + 1;
 	}
 }
 for (i = FONT_WEIGHT_INDEX, j = XLFD_WEIGHT_INDEX; i <= FONT_WIDTH_INDEX;
 i++, j++)
 if (NILP (val))
 	f[j] = "*", len += 2;
 else
 	{
 	  val = SYMBOL_NAME (val);
-	  f[j] = (char *) SDATA (val), len += SBYTES (val) + 1;
+	  f[j] = SSDATA (val), len += SBYTES (val) + 1;
 	}
 }
 val = AREF (font, FONT_SIZE_INDEX);
 font_assert (NUMBERP (val) || NILP (val));
 if (! NILP (family)
 && NILP (AREF (font_spec, FONT_FAMILY_INDEX)))
 {
 CHECK_STRING (family);
 len = SBYTES (family);
-p0 = (char *) SDATA (family);
+p0 = SSDATA (family);
 p1 = strchr (p0, '-');
 if (p1)
 	{
 	  if ((*p0 != '*' && p1 - p0 > 0)
 	      && NILP (AREF (font_spec, FONT_FOUNDRY_INDEX)))
 if (! NILP (registry))
 {
 /* Convert "XXX" and "XXX*" to "XXX*-*".  */
 CHECK_STRING (registry);
 len = SBYTES (registry);
-p0 = (char *) SDATA (registry);
+p0 = SSDATA (registry);
 p1 = strchr (p0, '-');
 if (! p1)
 	{
 	  if (SDATA (registry)[len - 1] == '*')
 	    registry = concat2 (registry, build_string ("-*"));
 if (! NILP (val))
 otf = XSAVE_VALUE (XCDR (val))->pointer;
 else
 {
-otf = STRINGP (file) ? OTF_open ((char *) SDATA (file)) : NULL;
+otf = STRINGP (file) ? OTF_open (SSDATA (file)) : NULL;
 val = make_save_value (otf, 0);
 otf_list = Fcons (Fcons (file, val), otf_list);
 }
 return otf;
 }
 font_spec_from_name (Lisp_Object font_name)
 {
 Lisp_Object spec = Ffont_spec (0, NULL);
 CHECK_STRING (font_name);
-if (font_parse_name ((char *) SDATA (font_name), spec) == -1)
+if (font_parse_name (SSDATA (font_name), spec) == -1)
 return Qnil;
 font_put_extra (spec, QCname, font_name);
 font_put_extra (spec, QCuser_spec, font_name);
 return spec;
 }
 if (! NILP (foundry[0]))
 foundry[1] = null_vector;
 else if (STRINGP (attrs[LFACE_FOUNDRY_INDEX]))
 {
 val = attrs[LFACE_FOUNDRY_INDEX];
-foundry[0] = font_intern_prop ((char *) SDATA (val), SBYTES (val), 1);
+foundry[0] = font_intern_prop (SSDATA (val), SBYTES (val), 1);
 foundry[1] = Qnil;
 foundry[2] = null_vector;
 }
 else
 foundry[0] = Qnil, foundry[1] = null_vector;
 val = AREF (work, FONT_FAMILY_INDEX);
 if (NILP (val) && STRINGP (attrs[LFACE_FAMILY_INDEX]))
 {
 val = attrs[LFACE_FAMILY_INDEX];
-val = font_intern_prop ((char *) SDATA (val), SBYTES (val), 1);
+val = font_intern_prop (SSDATA (val), SBYTES (val), 1);
 }
 if (NILP (val))
 {
 family = alloca ((sizeof family[0]) * 2);
 family[0] = Qnil;
 char *keystr = SDATA (SYMBOL_NAME (key));
 if (strcmp (boolean_properties[i], keystr) == 0)
 {
 const char *str = INTEGERP (val) ? (XINT (val) ? "true" : "false")
-	      : SYMBOLP (val) ? (const char *) SDATA (SYMBOL_NAME (val))
+	      : SYMBOLP (val) ? SSDATA (SYMBOL_NAME (val))
 	      : "true";
 if (strcmp ("false", str) == 0 || strcmp ("False", str) == 0
 || strcmp ("FALSE", str) == 0 || strcmp ("FcFalse", str) == 0
 || strcmp ("off", str) == 0 || strcmp ("OFF", str) == 0
 val = args[i + 1];
 if (EQ (key, QCname))
 	{
 	  CHECK_STRING (val);
-	  font_parse_name ((char *) SDATA (val), spec);
+	  font_parse_name (SSDATA (val), spec);
 	  font_put_extra (spec, key, val);
 	}
 else
 	{
 	  int idx = get_font_prop_index (key);
 if (STRINGP (font_name)
 	  && SDATA (font_name)[0] == '-')
 	{
 	  if (NILP (fold_wildcards))
 	    return font_name;
-	  strcpy (name, (char *) SDATA (font_name));
+	  strcpy (name, SSDATA (font_name));
 	  goto done;
 	}
 pixel_size = XFONT_OBJECT (font)->pixel_size;
 }
 if (font_unparse_xlfd (font, pixel_size, name, 256) < 0)
 {
 int fontset = fs_query_fontset (name, 0);
 if (fontset >= 0)
 	name = fontset_ascii (fontset);
-font_object = font_open_by_name (f, (char *) SDATA (name));
+font_object = font_open_by_name (f, SSDATA (name));
 }
 else if (FONT_OBJECT_P (name))
 font_object = name;
 else if (FONT_ENTITY_P (name))
 font_object = font_open_entity (f, name, 0);
 if (EQ (Vfont_log, Qt))
 return;
 if (STRINGP (AREF (Vfont_log_deferred, 0)))
 {
-char *str = (char *) SDATA (AREF (Vfont_log_deferred, 0));
+char *str = SSDATA (AREF (Vfont_log_deferred, 0));
 ASET (Vfont_log_deferred, 0, Qnil);
 font_add_log (str, AREF (Vfont_log_deferred, 1),
 		    AREF (Vfont_log_deferred, 2));
 }
 void
 init_font (void)
 {
 Vfont_log = egetenv ("EMACS_FONT_LOG") ? Qnil : Qt;
 }

Mercurial > emacs

comparison src/font.c @ 112434:9de5a68b57e1