comparison src/xterm.c @ 44774:f2158eb57017

(x_draw_hollow_cursor, x_draw_bar_cursor) (x_draw_phys_cursor_glyph): Set phys_cursor_width here. (x_display_and_set_cursor): Don't set phys_cursor_width here for bar cursors only, to make phys_cursor_width contain what its name suggests. (notice_overwritten_cursor): Consider the cursor image erased if the output area intersects the cursor image in y-direction.

44773:bec675961fde

notice_overwritten_cursor (w, area, x0, x1, y0, y1)
     struct window *w;
     enum glyph_row_area area;
     int x0, y0, x1, y1;
{
  if (area == TEXT_AREA
      && w->phys_cursor_on_p
      && y0 <= w->phys_cursor.y
      && y1 >= w->phys_cursor.y + w->phys_cursor_height
      && x0 <= w->phys_cursor.x
      && (x1 < 0 || x1 > w->phys_cursor.x))
    w->phys_cursor_on_p = 0;
}


/* Set clipping for output in glyph row ROW.  W is the window in which
   we operate.  GC is the graphics context to set clipping in.

     width instead.  */
  wd = cursor_glyph->pixel_width - 1;
  if (cursor_glyph->type == STRETCH_GLYPH
      && !x_stretch_cursor_p)
    wd = min (CANON_X_UNIT (f), wd);
  
  /* The foreground of cursor_gc is typically the same as the normal
     background color, which can cause the cursor box to be invisible.  */
  xgcv.foreground = f->output_data.x->cursor_pixel;
  if (dpyinfo->scratch_cursor_gc)

  
      if (width < 0)
	width = f->output_data.x->cursor_width;
      width = min (cursor_glyph->pixel_width, width);
  
      x_clip_to_row (w, row, gc, 0);
      if (kind == BAR_CURSOR)
	  XFillRectangle (dpy, window, gc,
			  WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x),
			  WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y),
			  width, row->height);

      x_draw_glyphs (w, w->phys_cursor.x, row, TEXT_AREA,
		     w->phys_cursor.hpos, w->phys_cursor.hpos + 1,
		     hl, 0);
      w->phys_cursor_on_p = on_p;

      /* When we erase the cursor, and ROW is overlapped by other
	 rows, make sure that these overlapping parts of other rows
	 are redrawn.  */
      if (hl == DRAW_NORMAL_TEXT && row->overlapped_p)
	{
	  if (row > w->current_matrix->rows
	      && MATRIX_ROW_OVERLAPS_SUCC_P (row - 1))
	    x_fix_overlapping_area (w, row - 1, TEXT_AREA);

      w->phys_cursor.x = x;
      w->phys_cursor.y = glyph_row->y;
      w->phys_cursor.hpos = hpos;
      w->phys_cursor.vpos = vpos;
      w->phys_cursor_type = new_cursor_type;
      w->phys_cursor_width = new_cursor_width;
      w->phys_cursor_on_p = 1;

      switch (new_cursor_type)
	{
	case HOLLOW_BOX_CURSOR:

	case BAR_CURSOR:
	  x_draw_bar_cursor (w, glyph_row, new_cursor_width, BAR_CURSOR);
	  break;

	case HBAR_CURSOR:
	    x_draw_bar_cursor (w, glyph_row, new_cursor_width, HBAR_CURSOR);
	  break;

	case NO_CURSOR:
	  break;

44774:f2158eb57017

notice_overwritten_cursor (w, area, x0, x1, y0, y1)
     struct window *w;
     enum glyph_row_area area;
     int x0, y0, x1, y1;
{
  if (area == TEXT_AREA && w->phys_cursor_on_p)
    {
      int cx0 = w->phys_cursor.x;
      int cx1 = cx0 + w->phys_cursor_width;
      int cy0 = w->phys_cursor.y;
      int cy1 = cy0 + w->phys_cursor_height;

      if (x0 <= cx0 && (x1 < 0 || x1 >= cx1))
	{
	  /* The cursor image will be completely removed from the
	     screen if the output area intersects the cursor area in
	     y-direction.  When we draw in [y0 y1[, and some part of
	     the cursor is at y < y0, that part must have been drawn
	     before.  When scrolling, the cursor is erased before
	     actually scrolling, so we don't come here.  When not
	     scrolling, the rows above the old cursor row must have
	     changed, and in this case these rows must have written
	     over the cursor image.  Likewise if part of the cursor is
	     below y1.  */
	  if ((y0 >= cy0 && y0 < cy1) || (y1 >= cy0 && y1 < cy1))
	    w->phys_cursor_on_p = 0;
	}
    }
}


/* Set clipping for output in glyph row ROW.  W is the window in which
   we operate.  GC is the graphics context to set clipping in.

     width instead.  */
  wd = cursor_glyph->pixel_width - 1;
  if (cursor_glyph->type == STRETCH_GLYPH
      && !x_stretch_cursor_p)
    wd = min (CANON_X_UNIT (f), wd);
  w->phys_cursor_width = wd;
  
  /* The foreground of cursor_gc is typically the same as the normal
     background color, which can cause the cursor box to be invisible.  */
  xgcv.foreground = f->output_data.x->cursor_pixel;
  if (dpyinfo->scratch_cursor_gc)

  
      if (width < 0)
	width = f->output_data.x->cursor_width;
      width = min (cursor_glyph->pixel_width, width);
  
      w->phys_cursor_width = width;
      x_clip_to_row (w, row, gc, 0);
      
      if (kind == BAR_CURSOR)
	  XFillRectangle (dpy, window, gc,
			  WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x),
			  WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y),
			  width, row->height);

      x_draw_glyphs (w, w->phys_cursor.x, row, TEXT_AREA,
		     w->phys_cursor.hpos, w->phys_cursor.hpos + 1,
		     hl, 0);
      w->phys_cursor_on_p = on_p;

      if (hl == DRAW_CURSOR)
	{
	  struct glyph *cursor_glyph = get_phys_cursor_glyph (w);
	  if (cursor_glyph)
	    w->phys_cursor_width = cursor_glyph->pixel_width;
	}

      /* When we erase the cursor, and ROW is overlapped by other
	 rows, make sure that these overlapping parts of other rows
	 are redrawn.  */
      else if (hl == DRAW_NORMAL_TEXT && row->overlapped_p)
	{
	  if (row > w->current_matrix->rows
	      && MATRIX_ROW_OVERLAPS_SUCC_P (row - 1))
	    x_fix_overlapping_area (w, row - 1, TEXT_AREA);

      w->phys_cursor.x = x;
      w->phys_cursor.y = glyph_row->y;
      w->phys_cursor.hpos = hpos;
      w->phys_cursor.vpos = vpos;
      w->phys_cursor_type = new_cursor_type;
      w->phys_cursor_on_p = 1;

      switch (new_cursor_type)
	{
	case HOLLOW_BOX_CURSOR:

	case BAR_CURSOR:
	  x_draw_bar_cursor (w, glyph_row, new_cursor_width, BAR_CURSOR);
	  break;

	case HBAR_CURSOR:
	  x_draw_bar_cursor (w, glyph_row, new_cursor_width, HBAR_CURSOR);
	  break;

	case NO_CURSOR:
	  break;