comparison src/dispnew.c @ 83019:82c3b4da43ca

Merged in changes from CVS HEAD Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-33 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-34 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-35 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-36 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-37 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-38 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-39 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-40 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-41 Make fringe-drawing stuff compile without a window-system * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-42 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-43 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-44 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-45 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-46 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-47 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-48 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-49 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-50 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-59

83018:1465425fe2d3

/* Updating of data structures for redisplay.
   Copyright (C) 1985,86,87,88,93,94,95,97,98,1999,2000,01,02,2003
       Free Software Foundation, Inc.

This file is part of GNU Emacs.

GNU Emacs is free software; you can redistribute it and/or modify

	  if (a_glyph != a_end)
	    return 0;
	}

      if (a->truncated_on_left_p != b->truncated_on_left_p
	  || a->fill_line_p != b->fill_line_p
	  || a->truncated_on_right_p != b->truncated_on_right_p
	  || a->overlay_arrow_p != b->overlay_arrow_p
	  || a->continued_p != b->continued_p
	  || a->indicate_empty_line_p != b->indicate_empty_line_p
	  || a->overlapped_p != b->overlapped_p
	  || (MATRIX_ROW_CONTINUATION_LINE_P (a)
	      != MATRIX_ROW_CONTINUATION_LINE_P (b))
	  /* Different partially visible characters on left margin.  */
	  || a->x != b->x

      || !NILP (echo_area_buffer[1])
      || (glyph_row = MATRIX_ROW (w->current_matrix, w->cursor.vpos),
	  /* Can't do it in a continued line because continuation
	     lines would change.  */
	  (glyph_row->continued_p
	   /* Can't use this method if the line overlaps others or is
	      overlapped by others because these other lines would
	      have to be redisplayed.  */
	   || glyph_row->overlapping_p
	   || glyph_row->overlapped_p))

	      ? XFASTINT (w->left_margin_cols)
	      : 0));
      y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos);
      cursor_to (y, x);
    }

  if (FRAME_RIF (f))
    FRAME_RIF (f)->update_window_end_hook (w, 1, 0);
  update_end (f);
  updated_row = NULL;

	}

#if GLYPH_DEBUG
      /* Remember the redisplay method used to display the matrix.  */
      strcpy (w->current_matrix->method, w->desired_matrix->method);
#endif

      /* End the update of window W.  Don't set the cursor if we
         paused updating the display because in this case,
         set_window_cursor_after_update hasn't been called, and

      /* Draw truncation marks etc.  */
      if (!current_row->enabled_p
	  || desired_row->y != current_row->y
	  || desired_row->visible_height != current_row->visible_height
	  || desired_row->overlay_arrow_p != current_row->overlay_arrow_p
	  || desired_row->truncated_on_left_p != current_row->truncated_on_left_p
	  || desired_row->truncated_on_right_p != current_row->truncated_on_right_p
	  || desired_row->continued_p != current_row->continued_p
	  || desired_row->mode_line_p != current_row->mode_line_p
	  || (desired_row->indicate_empty_line_p
	      != current_row->indicate_empty_line_p)
	  || (MATRIX_ROW_CONTINUATION_LINE_P (desired_row)
	      != MATRIX_ROW_CONTINUATION_LINE_P (current_row)))
	rif->after_update_window_line_hook (desired_row);
    }

      struct glyph_row *d = MATRIX_ROW (desired_matrix, i);
      struct glyph_row *c = MATRIX_ROW (current_matrix, i);

      if (c->enabled_p
	  && d->enabled_p
	  && c->y == d->y
	  && MATRIX_ROW_BOTTOM_Y (c) <= yb
	  && MATRIX_ROW_BOTTOM_Y (d) <= yb
	  && row_equal_p (w, c, d, 1))
	{

  while (i - 1 > first_new
         && j - 1 > first_old
         && MATRIX_ROW (current_matrix, i - 1)->enabled_p
	 && (MATRIX_ROW (current_matrix, i - 1)->y
	     == MATRIX_ROW (desired_matrix, j - 1)->y)
         && row_equal_p (w,
			 MATRIX_ROW (desired_matrix, i - 1),
                         MATRIX_ROW (current_matrix, j - 1), 1))
    --i, --j;
  last_new = i;

	    int to_overlapped_p;

	    to = MATRIX_ROW (current_matrix, r->desired_vpos + j);
	    from = MATRIX_ROW (desired_matrix, r->desired_vpos + j);
	    to_overlapped_p = to->overlapped_p;
	    assign_row (to, from);
	    to->enabled_p = 1, from->enabled_p = 0;
	    to->overlapped_p = to_overlapped_p;
	  }
      }

83019:82c3b4da43ca

/* Updating of data structures for redisplay.
   Copyright (C) 1985,86,87,88,93,94,95,97,98,1999,2000,01,02,03,04
       Free Software Foundation, Inc.

This file is part of GNU Emacs.

GNU Emacs is free software; you can redistribute it and/or modify

	  if (a_glyph != a_end)
	    return 0;
	}

      if (a->fill_line_p != b->fill_line_p
	  || a->cursor_in_fringe_p != b->cursor_in_fringe_p
	  || a->left_fringe_bitmap != b->left_fringe_bitmap
	  || a->right_fringe_bitmap != b->right_fringe_bitmap
	  || a->exact_window_width_line_p != b->exact_window_width_line_p
	  || a->overlapped_p != b->overlapped_p
	  || (MATRIX_ROW_CONTINUATION_LINE_P (a)
	      != MATRIX_ROW_CONTINUATION_LINE_P (b))
	  /* Different partially visible characters on left margin.  */
	  || a->x != b->x

      || !NILP (echo_area_buffer[1])
      || (glyph_row = MATRIX_ROW (w->current_matrix, w->cursor.vpos),
	  /* Can't do it in a continued line because continuation
	     lines would change.  */
	  (glyph_row->continued_p
	   || glyph_row->exact_window_width_line_p
	   /* Can't use this method if the line overlaps others or is
	      overlapped by others because these other lines would
	      have to be redisplayed.  */
	   || glyph_row->overlapping_p
	   || glyph_row->overlapped_p))

	      ? XFASTINT (w->left_margin_cols)
	      : 0));
      y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos);
      cursor_to (y, x);
    }

#ifdef HAVE_WINDOW_SYSTEM
  update_window_fringes (w, 0);
#endif

  if (FRAME_RIF (f))
    FRAME_RIF (f)->update_window_end_hook (w, 1, 0);
  update_end (f);
  updated_row = NULL;

	}

#if GLYPH_DEBUG
      /* Remember the redisplay method used to display the matrix.  */
      strcpy (w->current_matrix->method, w->desired_matrix->method);
#endif

#ifdef HAVE_WINDOW_SYSTEM
      update_window_fringes (w, 0);
#endif

      /* End the update of window W.  Don't set the cursor if we
         paused updating the display because in this case,
         set_window_cursor_after_update hasn't been called, and

      /* Draw truncation marks etc.  */
      if (!current_row->enabled_p
	  || desired_row->y != current_row->y
	  || desired_row->visible_height != current_row->visible_height
	  || desired_row->cursor_in_fringe_p != current_row->cursor_in_fringe_p
	  || current_row->redraw_fringe_bitmaps_p
	  || desired_row->mode_line_p != current_row->mode_line_p
	  || desired_row->exact_window_width_line_p != current_row->exact_window_width_line_p
	  || (MATRIX_ROW_CONTINUATION_LINE_P (desired_row)
	      != MATRIX_ROW_CONTINUATION_LINE_P (current_row)))
	rif->after_update_window_line_hook (desired_row);
    }

      struct glyph_row *d = MATRIX_ROW (desired_matrix, i);
      struct glyph_row *c = MATRIX_ROW (current_matrix, i);

      if (c->enabled_p
	  && d->enabled_p
	  && !d->redraw_fringe_bitmaps_p
	  && c->y == d->y
	  && MATRIX_ROW_BOTTOM_Y (c) <= yb
	  && MATRIX_ROW_BOTTOM_Y (d) <= yb
	  && row_equal_p (w, c, d, 1))
	{

  while (i - 1 > first_new
         && j - 1 > first_old
         && MATRIX_ROW (current_matrix, i - 1)->enabled_p
	 && (MATRIX_ROW (current_matrix, i - 1)->y
	     == MATRIX_ROW (desired_matrix, j - 1)->y)
	 && !MATRIX_ROW (desired_matrix, j - 1)->redraw_fringe_bitmaps_p
         && row_equal_p (w,
			 MATRIX_ROW (desired_matrix, i - 1),
                         MATRIX_ROW (current_matrix, j - 1), 1))
    --i, --j;
  last_new = i;

	    int to_overlapped_p;

	    to = MATRIX_ROW (current_matrix, r->desired_vpos + j);
	    from = MATRIX_ROW (desired_matrix, r->desired_vpos + j);
	    to_overlapped_p = to->overlapped_p;
	    if (!from->mode_line_p && !w->pseudo_window_p
		&& (to->left_fringe_bitmap != from->left_fringe_bitmap
		    || to->right_fringe_bitmap != from->right_fringe_bitmap))
	      from->redraw_fringe_bitmaps_p = 1;
	    assign_row (to, from);
	    to->enabled_p = 1, from->enabled_p = 0;
	    to->overlapped_p = to_overlapped_p;
	  }
      }