comparison src/xdisp.c @ 89971:cce1c0ee76ee

Revision: [e-mail]--gnu-2004/emacs--unicode--0--patch-36 Merge from emacs--cvs-trunk--0, emacs--gnus--5.10, gnus--rel--5.10 Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-523 Merge from emacs--gnus--5.10, gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-524 - [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-534 Update from CVS * [e-mail]--gnu-2004/emacs--gnus--5.10--base-0 tag of [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-464 * [e-mail]--gnu-2004/emacs--gnus--5.10--patch-1 Import from CVS branch gnus-5_10-branch * [e-mail]--gnu-2004/emacs--gnus--5.10--patch-2 Merge from [e-mail]--2004/emacs--multi-tty--0, emacs--cvs-trunk--0 * [e-mail]--gnu-2004/emacs--gnus--5.10--patch-3 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--gnus--5.10--patch-4 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-18 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-19 Remove autoconf-generated files from archive * [e-mail]--gnu-2004/gnus--rel--5.10--patch-20 Update from CVS

89970:a849e5779b8c

  int last_pos = MATRIX_ROW_START_CHARPOS (row) + delta;
  /* The last known character position before string_start.  */
  int string_before_pos;
  int x = row->x;
  int cursor_x = x;
  int pt_old = PT - delta;

  /* Skip over glyphs not having an object at the start of the row.
     These are special glyphs like truncation marks on terminal
     frames.  */

      if (! STRINGP (glyph->object))
	{
	  string_start = NULL;
	  x += glyph->pixel_width;
	  ++glyph;
	}
      else
	{
	  string_before_pos = last_pos;
	  string_start = glyph;
	  string_start_x = x;
	  /* Skip all glyphs from string.  */
	  do
	    {
	      if ((cursor == NULL || glyph > cursor)
		  && !NILP (Fget_char_property (make_number ((glyph)->charpos),
						Qcursor, (glyph)->object)))
		{
		  cursor = glyph;
		  cursor_x = x;
		}
	      x += glyph->pixel_width;
	      ++glyph;

  return n;
}


DEFUN ("format-mode-line", Fformat_mode_line, Sformat_mode_line,
       0, 3, 0,
       doc: /* Return the mode-line of selected window as a string.
First optional arg FORMAT specifies a different format string (see
`mode-line-format' for details) to use.  If FORMAT is t, return
the buffer's header-line.  Second optional arg WINDOW specifies a
different window to use as the context for the formatting.
If third optional arg NO-PROPS is non-nil, string is not propertized.  */)
     (format, window, no_props)
     Lisp_Object format, window, no_props;
{
  struct it it;
  int len;
  struct window *w;
  struct buffer *old_buffer = NULL;

  if (NILP (window))
    window = selected_window;
  CHECK_WINDOW (window);
  w = XWINDOW (window);
  CHECK_BUFFER (w->buffer);

  if (XBUFFER (w->buffer) != current_buffer)
    {
      old_buffer = current_buffer;
      set_buffer_internal_1 (XBUFFER (w->buffer));
    }

  if (NILP (format) || EQ (format, Qt))
    {
      face_id = (NILP (format)

89971:cce1c0ee76ee

  int last_pos = MATRIX_ROW_START_CHARPOS (row) + delta;
  /* The last known character position before string_start.  */
  int string_before_pos;
  int x = row->x;
  int cursor_x = x;
  int cursor_from_overlay_pos = 0;
  int pt_old = PT - delta;

  /* Skip over glyphs not having an object at the start of the row.
     These are special glyphs like truncation marks on terminal
     frames.  */

      if (! STRINGP (glyph->object))
	{
	  string_start = NULL;
	  x += glyph->pixel_width;
	  ++glyph;
	  if (cursor_from_overlay_pos
	      && last_pos > cursor_from_overlay_pos)
	    {
	      cursor_from_overlay_pos = 0;
	      cursor = 0;
	    }
	}
      else
	{
	  string_before_pos = last_pos;
	  string_start = glyph;
	  string_start_x = x;
	  /* Skip all glyphs from string.  */
	  do
	    {
	      int pos;
	      if ((cursor == NULL || glyph > cursor)
		  && !NILP (Fget_char_property (make_number ((glyph)->charpos),
						Qcursor, (glyph)->object))
		  && (pos = string_buffer_position (w, glyph->object,
						    string_before_pos),
		      (pos == 0	  /* From overlay */
		       || pos == pt_old)))
		{
		  /* Estimate overlay buffer position from the buffer
		     positions of the glyphs before and after the overlay.
		     Add 1 to last_pos so that if point corresponds to the
		     glyph right after the overlay, we still use a 'cursor'
		     property found in that overlay.  */
		  cursor_from_overlay_pos = pos == 0 ? last_pos+1 : 0;
		  cursor = glyph;
		  cursor_x = x;
		}
	      x += glyph->pixel_width;
	      ++glyph;

  return n;
}


DEFUN ("format-mode-line", Fformat_mode_line, Sformat_mode_line,
       0, 4, 0,
       doc: /* Return the mode-line of selected window as a string.
First optional arg FORMAT specifies a different format string (see
`mode-line-format' for details) to use.  If FORMAT is t, return
the buffer's header-line.  Second optional arg WINDOW specifies a
different window to use as the context for the formatting.
If third optional arg NO-PROPS is non-nil, string is not propertized.
Fourth optional arg BUFFER specifies which buffer to use.  */)
  (format, window, no_props, buffer)
     Lisp_Object format, window, no_props, buffer;
{
  struct it it;
  int len;
  struct window *w;
  struct buffer *old_buffer = NULL;

  if (NILP (window))
    window = selected_window;
  CHECK_WINDOW (window);
  w = XWINDOW (window);

  if (NILP (buffer))
    buffer = w->buffer;

  CHECK_BUFFER (buffer);

  if (XBUFFER (buffer) != current_buffer)
    {
      old_buffer = current_buffer;
      set_buffer_internal_1 (XBUFFER (buffer));
    }

  if (NILP (format) || EQ (format, Qt))
    {
      face_id = (NILP (format)