comparison src/dispnew.c @ 109390:f1045a53471c

Merge from mainline.
author Katsumi Yamaoka <katsumi@flagship2>
date Wed, 14 Jul 2010 13:03:03 +0000
parents f37b85834f7e
children d962ccf8829f
comparison
equal deleted inserted replaced
109358:a9586dc942d5 109390:f1045a53471c
1774 size. */ 1774 size. */
1775 1775
1776 #define CHANGED_LEAF_MATRIX (1 << 1) 1776 #define CHANGED_LEAF_MATRIX (1 << 1)
1777 1777
1778 static struct dim 1778 static struct dim
1779 allocate_matrices_for_frame_redisplay (window, x, y, dim_only_p, 1779 allocate_matrices_for_frame_redisplay (Lisp_Object window, int x, int y,
1780 window_change_flags) 1780 int dim_only_p, int *window_change_flags)
1781 Lisp_Object window;
1782 int x, y;
1783 int dim_only_p;
1784 int *window_change_flags;
1785 { 1781 {
1786 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (window))); 1782 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
1787 int x0 = x, y0 = y; 1783 int x0 = x, y0 = y;
1788 int wmax = 0, hmax = 0; 1784 int wmax = 0, hmax = 0;
1789 struct dim total; 1785 struct dim total;
2913 row 0 <= I < NLINES which is empty. 2909 row 0 <= I < NLINES which is empty.
2914 2910
2915 This function is called from do_scrolling and do_direct_scrolling. */ 2911 This function is called from do_scrolling and do_direct_scrolling. */
2916 2912
2917 void 2913 void
2918 mirrored_line_dance (matrix, unchanged_at_top, nlines, copy_from, 2914 mirrored_line_dance (struct glyph_matrix *matrix, int unchanged_at_top, int nlines,
2919 retained_p) 2915 int *copy_from, char *retained_p)
2920 struct glyph_matrix *matrix;
2921 int unchanged_at_top, nlines;
2922 int *copy_from;
2923 char *retained_p;
2924 { 2916 {
2925 /* A copy of original rows. */ 2917 /* A copy of original rows. */
2926 struct glyph_row *old_rows; 2918 struct glyph_row *old_rows;
2927 2919
2928 /* Rows to assign to. */ 2920 /* Rows to assign to. */