comparison src/xdisp.c @ 57558:97a5853254e0

(overlay_arrow_at_row): Return overlay string rather than bitmap if there is not left fringe. (get_overlay_arrow_glyph_row): Also used on windows system. (display_line): Display overlay string if no left fringe.

57557:13225583da0d

	}
    }
}


/* Return overlay arrow string at row, or nil.  */

static Lisp_Object
overlay_arrow_at_row (f, row, pbitmap)
     struct frame *f;
     struct glyph_row *row;
     int *pbitmap;
{
  Lisp_Object vlist;

      if (MARKERP (val)
	  && current_buffer == XMARKER (val)->buffer
	  && (MATRIX_ROW_START_CHARPOS (row) == marker_position (val)))
	{
	  val = overlay_arrow_string_or_property (var, pbitmap);
	  if (FRAME_WINDOW_P (f))
	    return Qt;
	  else if (STRINGP (val))
	    return val;
	  break;
	}
    }


/***********************************************************************
		     Building Desired Matrix Rows
 ***********************************************************************/

/* Return a temporary glyph row holding the glyphs of an overlay
   arrow.  Only used for non-window-redisplay windows.  */

static struct glyph_row *
get_overlay_arrow_glyph_row (w, overlay_arrow_string)
     struct window *w;
     Lisp_Object overlay_arrow_string;

     mark this glyph row as the one containing the overlay arrow.
     This is clearly a mess with variable size fonts.  It would be
     better to let it be displayed like cursors under X.  */
  if (! overlay_arrow_seen
      && (overlay_arrow_string
	    = overlay_arrow_at_row (it->f, row, &overlay_arrow_bitmap),
	  !NILP (overlay_arrow_string)))
    {
      /* Overlay arrow in window redisplay is a fringe bitmap.  */
      if (!FRAME_WINDOW_P (it->f))
	{
	  struct glyph_row *arrow_row
	    = get_overlay_arrow_glyph_row (it->w, overlay_arrow_string);
	  struct glyph *glyph = arrow_row->glyphs[TEXT_AREA];
	  struct glyph *arrow_end = glyph + arrow_row->used[TEXT_AREA];

	      while (p2 < end)
		*p++ = *p2++;
	      row->used[TEXT_AREA] = p2 - row->glyphs[TEXT_AREA];
	    }
	}

      overlay_arrow_seen = 1;
      it->w->overlay_arrow_bitmap = overlay_arrow_bitmap;
      row->overlay_arrow_p = 1;
    }

  /* Compute pixel dimensions of this line.  */
  compute_line_metrics (it);

57558:97a5853254e0

	}
    }
}


/* Return overlay arrow string to display at row.
   Return t if display as bitmap in left fringe.
   Return nil if no overlay arrow.  */

static Lisp_Object
overlay_arrow_at_row (it, row, pbitmap)
     struct it *it;
     struct glyph_row *row;
     int *pbitmap;
{
  Lisp_Object vlist;

      if (MARKERP (val)
	  && current_buffer == XMARKER (val)->buffer
	  && (MATRIX_ROW_START_CHARPOS (row) == marker_position (val)))
	{
	  val = overlay_arrow_string_or_property (var, pbitmap);
	  if (FRAME_WINDOW_P (it->f)
	      && WINDOW_LEFT_FRINGE_WIDTH (it->w) > 0)
	    return Qt;
	  if (STRINGP (val))
	    return val;
	  break;
	}
    }


/***********************************************************************
		     Building Desired Matrix Rows
 ***********************************************************************/

/* Return a temporary glyph row holding the glyphs of an overlay arrow.
   Used for non-window-redisplay windows, and for windows w/o left fringe.  */

static struct glyph_row *
get_overlay_arrow_glyph_row (w, overlay_arrow_string)
     struct window *w;
     Lisp_Object overlay_arrow_string;

     mark this glyph row as the one containing the overlay arrow.
     This is clearly a mess with variable size fonts.  It would be
     better to let it be displayed like cursors under X.  */
  if (! overlay_arrow_seen
      && (overlay_arrow_string
	    = overlay_arrow_at_row (it, row, &overlay_arrow_bitmap),
	  !NILP (overlay_arrow_string)))
    {
      /* Overlay arrow in window redisplay is a fringe bitmap.  */
      if (STRINGP (overlay_arrow_string))
	{
	  struct glyph_row *arrow_row
	    = get_overlay_arrow_glyph_row (it->w, overlay_arrow_string);
	  struct glyph *glyph = arrow_row->glyphs[TEXT_AREA];
	  struct glyph *arrow_end = glyph + arrow_row->used[TEXT_AREA];

	      while (p2 < end)
		*p++ = *p2++;
	      row->used[TEXT_AREA] = p2 - row->glyphs[TEXT_AREA];
	    }
	}
      else
	{
	  it->w->overlay_arrow_bitmap = overlay_arrow_bitmap;
	  row->overlay_arrow_p = 1;
	}
      overlay_arrow_seen = 1;
    }

  /* Compute pixel dimensions of this line.  */
  compute_line_metrics (it);