comparison src/xdisp.c @ 54068:4dcd34f2c3a7

(get_window_cursor_type, display_and_set_cursor): Fix last change.

54067:b8f2a214f98f

    }
  else
    cursor_type = get_specified_cursor_type (b->cursor_type, width);

  /* Use normal cursor if not blinked off.  */
  if (!w->cursor_off_p && glyph != NULL)
    {
      if (glyph->type == IMAGE_GLYPH) {
	if (cursor_type == FILLED_BOX_CURSOR)
	  cursor_type = HOLLOW_BOX_CURSOR;
      }
      return cursor_type;
    }

{
  struct frame *f = XFRAME (w->frame);
  int new_cursor_type;
  int new_cursor_width;
  int active_cursor;
  struct glyph_matrix *current_glyphs;
  struct glyph_row *glyph_row;
  struct glyph *glyph;

  /* This is pointless on invisible frames, and dangerous on garbaged
     windows and frames; in the latter case, the frame or window may

  /* If cursor is off and we want it off, return quickly.  */
  if (!on && !w->phys_cursor_on_p)
    return;

  current_glyphs = w->current_matrix;
  glyph_row = MATRIX_ROW (current_glyphs, vpos);
  glyph = (glyph_row->cursor_in_fringe_p ? NULL
	   : glyph_row->glyphs[TEXT_AREA] + hpos);

  /* If cursor row is not enabled, we don't really know where to
     display the cursor.  */
  if (!glyph_row->enabled_p)
    {
      w->phys_cursor_on_p = 0;
      return;
    }

  xassert (interrupt_input_blocked);

  /* Set new_cursor_type to the cursor we want to be displayed.  */
  new_cursor_type = get_window_cursor_type (w, glyph,

54068:4dcd34f2c3a7

    }
  else
    cursor_type = get_specified_cursor_type (b->cursor_type, width);

  /* Use normal cursor if not blinked off.  */
  if (!w->cursor_off_p)
    {
      if (glyph != NULL && glyph->type == IMAGE_GLYPH) {
	if (cursor_type == FILLED_BOX_CURSOR)
	  cursor_type = HOLLOW_BOX_CURSOR;
      }
      return cursor_type;
    }

{
  struct frame *f = XFRAME (w->frame);
  int new_cursor_type;
  int new_cursor_width;
  int active_cursor;
  struct glyph_row *glyph_row;
  struct glyph *glyph;

  /* This is pointless on invisible frames, and dangerous on garbaged
     windows and frames; in the latter case, the frame or window may

  /* If cursor is off and we want it off, return quickly.  */
  if (!on && !w->phys_cursor_on_p)
    return;

  glyph_row = MATRIX_ROW (w->current_matrix, vpos);
  /* If cursor row is not enabled, we don't really know where to
     display the cursor.  */
  if (!glyph_row->enabled_p)
    {
      w->phys_cursor_on_p = 0;
      return;
    }

  glyph = NULL;
  if (!glyph_row->exact_window_width_line_p
      || hpos < glyph_row->used[TEXT_AREA])
    glyph = glyph_row->glyphs[TEXT_AREA] + hpos;

  xassert (interrupt_input_blocked);

  /* Set new_cursor_type to the cursor we want to be displayed.  */
  new_cursor_type = get_window_cursor_type (w, glyph,