comparison src/xdisp.c @ 112434:9de5a68b57e1

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

112433:7b649f6eac4f

  if (trace_redisplay_p)
    fprintf (stderr, "%p (%s): %s\n",
	     w,
	     ((BUFFERP (w->buffer)
	       && STRINGP (XBUFFER (w->buffer)->name))
	      ? (char *) SDATA (XBUFFER (w->buffer)->name)
	      : "no buffer"),
	     buffer);
}

#endif /* GLYPH_DEBUG */

#endif

    case 'F':
      /* %F displays the frame name.  */
      if (!NILP (f->title))
	return (char *) SDATA (f->title);
      if (f->explicit_name || ! FRAME_WINDOW_P (f))
	return (char *) SDATA (f->name);
      return "Emacs";

    case 'f':
      obj = b->filename;
      break;

    }

  if (STRINGP (obj))
    {
      *string = obj;
      return (char *) SDATA (obj);
    }
  else
    return "";
}

      if (it->glyphless_method == GLYPHLESS_DISPLAY_ACRONYM)
	{
	  if (! STRINGP (acronym) && CHAR_TABLE_P (Vglyphless_char_display))
	    acronym = CHAR_TABLE_REF (Vglyphless_char_display, it->c);
	  str = STRINGP (acronym) ? (char *) SDATA (acronym) : "";
	}
      else
	{
	  xassert (it->glyphless_method == GLYPHLESS_DISPLAY_HEX_CODE);
	  sprintf (buf, "%0*X", it->c < 0x10000 ? 4 : 6, it->c);

	  if (metrics_upper.width >= metrics_lower.width)
	    lower_xoff = (width - metrics_lower.width) / 2;
	  else
	    upper_xoff = (width - metrics_upper.width) / 2;
	}
  
      /* +5 is for horizontal bars of a box plus 1-pixel spaces at
	 top, bottom, and between upper and lower strings.  */
      height = (metrics_upper.ascent + metrics_upper.descent
		+ metrics_lower.ascent + metrics_lower.descent) + 5;
      /* Center vertically.

  if (hourglass_shown_p)
    hide_hourglass ();
#endif
}
#endif /* ! WINDOWSNT  */

112434:9de5a68b57e1

  if (trace_redisplay_p)
    fprintf (stderr, "%p (%s): %s\n",
	     w,
	     ((BUFFERP (w->buffer)
	       && STRINGP (XBUFFER (w->buffer)->name))
	      ? SSDATA (XBUFFER (w->buffer)->name)
	      : "no buffer"),
	     buffer);
}

#endif /* GLYPH_DEBUG */

#endif

    case 'F':
      /* %F displays the frame name.  */
      if (!NILP (f->title))
	return SSDATA (f->title);
      if (f->explicit_name || ! FRAME_WINDOW_P (f))
	return SSDATA (f->name);
      return "Emacs";

    case 'f':
      obj = b->filename;
      break;

    }

  if (STRINGP (obj))
    {
      *string = obj;
      return SSDATA (obj);
    }
  else
    return "";
}

      if (it->glyphless_method == GLYPHLESS_DISPLAY_ACRONYM)
	{
	  if (! STRINGP (acronym) && CHAR_TABLE_P (Vglyphless_char_display))
	    acronym = CHAR_TABLE_REF (Vglyphless_char_display, it->c);
	  str = STRINGP (acronym) ? SSDATA (acronym) : "";
	}
      else
	{
	  xassert (it->glyphless_method == GLYPHLESS_DISPLAY_HEX_CODE);
	  sprintf (buf, "%0*X", it->c < 0x10000 ? 4 : 6, it->c);

	  if (metrics_upper.width >= metrics_lower.width)
	    lower_xoff = (width - metrics_lower.width) / 2;
	  else
	    upper_xoff = (width - metrics_upper.width) / 2;
	}

      /* +5 is for horizontal bars of a box plus 1-pixel spaces at
	 top, bottom, and between upper and lower strings.  */
      height = (metrics_upper.ascent + metrics_upper.descent
		+ metrics_lower.ascent + metrics_lower.descent) + 5;
      /* Center vertically.

  if (hourglass_shown_p)
    hide_hourglass ();
#endif
}
#endif /* ! WINDOWSNT  */