comparison src/dispnew.c @ 83037:03a73693678e

Merged in changes from CVS HEAD Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-71 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-72 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-73 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-74 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-75 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-76 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-77 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-78 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-79 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-80 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-81 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-82 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-83 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-84 Add lisp/emacs-lisp/macroexp.el * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-85 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-86 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-87 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-88 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-89 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-90 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-91 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-92 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-93 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-94 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-95 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-96 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-97 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-77

83036:fc638739c70f

	}

      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.  */

      /* Update windows.  */
      paused_p = update_window_tree (root_window, force_p);
      update_end (f);

#if 0 /* This flush is a performance bottleneck under X,
	 and it doesn't seem to be necessary anyway.  */
      FRAME_RIF (f)->flush_display (f);
#endif
    }
  else
    {
      /* We are working on frame matrix basis.  Set the frame on whose
	 frame matrix we operate.  */

      /* 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)))

	    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;
	  }

83037:03a73693678e

	}

      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->left_fringe_face_id != b->left_fringe_face_id
	  || a->right_fringe_bitmap != b->right_fringe_bitmap
	  || a->right_fringe_face_id != b->right_fringe_face_id
	  || a->overlay_arrow_p != b->overlay_arrow_p
	  || 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.  */

      /* Update windows.  */
      paused_p = update_window_tree (root_window, force_p);
      update_end (f);

      /* This flush is a performance bottleneck under X,
 	 and it doesn't seem to be necessary anyway (in general).
         It is necessary when resizing the window with the mouse, or
 	 at least the fringes are not redrawn in a timely manner.  ++kfs */
      if (f->force_flush_display_p)
 	{
     	  FRAME_RIF (f)->flush_display (f);
 	  f->force_flush_display_p = 0;
 	}
    }
  else
    {
      /* We are working on frame matrix basis.  Set the frame on whose
	 frame matrix we operate.  */

      /* 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
	  || desired_row->overlay_arrow_p != current_row->overlay_arrow_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)))

	    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
		    || to->left_fringe_face_id != from->left_fringe_face_id
		    || to->right_fringe_face_id != from->right_fringe_face_id
		    || to->overlay_arrow_p != from->overlay_arrow_p))
	      from->redraw_fringe_bitmaps_p = 1;
	    assign_row (to, from);
	    to->enabled_p = 1, from->enabled_p = 0;
	    to->overlapped_p = to_overlapped_p;
	  }