annotate src/dispnew.c @ 49393:85246e86a2cd

* w32term.c (x_draw_glyph_string_foreground) (x_draw_composite_glyph_string_foreground): Implement overstriking. * w32term.c (x_write_glyphs): Clear phys_cursor_on_p if current phys_cursor's hpos is overwritten. This is still not completely correct, as it doesn't really make sense to use hpos at all to get the cursor glyph (as that is relative to the width of the characters on the line, which may have changed during the update). * w32term.c (notice_overwritten_cursor): Handle the special case of the cursor being in the first blank non-text line at the end of a window. * w32term.c (x_draw_hollow_cursor, x_draw_bar_cursor) (x_draw_phys_cursor_glyph): Set phys_cursor_width here. Compute from the x position returned by x_draw_glyphs. * w32term.c (note_mode_line_or_margin_highlight): Renamed from note_mode_line_highlight and extended. * w32term.c (last_window): New variable. (w32_read_socket) <WM_MOUSEMOVE>: Generate SELECT_WINDOW_EVENTs. (note_mouse_movement): Remove reimplemented code in #if 0.
author Jason Rumney <jasonr@gnu.org>
date Wed, 22 Jan 2003 23:04:05 +0000
parents 2cbb0b823e83
children 23a1cea22d13
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1 /* Updating of data structures for redisplay.
44261
17ecdf2d924c Update copyright.
Gerd Moellmann <gerd@gnu.org>
parents: 44260
diff changeset
2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 97, 98, 1999, 2000, 2001, 2002
18853
4501a367a887 (direct_output_forward_char): Reenable check against
Richard M. Stallman <rms@gnu.org>
parents: 18774
diff changeset
3 Free Software Foundation, Inc.
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5 This file is part of GNU Emacs.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 GNU Emacs is free software; you can redistribute it and/or modify
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8 it under the terms of the GNU General Public License as published by
1777
4edfaa19c7a7 * window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents: 1766
diff changeset
9 the Free Software Foundation; either version 2, or (at your option)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10 any later version.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 GNU Emacs is distributed in the hope that it will be useful,
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 GNU General Public License for more details.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 along with GNU Emacs; see the file COPYING. If not, write to
14186
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 14125
diff changeset
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 14125
diff changeset
20 Boston, MA 02111-1307, USA. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 25781
diff changeset
22 #include <config.h>
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
23 #include <signal.h>
7900
60795e826dad Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents: 7814
diff changeset
24 #include <stdio.h>
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
25 #include <ctype.h>
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
26
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
27 #ifdef HAVE_UNISTD_H
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
28 #include <unistd.h>
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
29 #endif
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
30
3525
58e789baa27a Include lisp.h earlier (before termhooks.h).
Richard M. Stallman <rms@gnu.org>
parents: 3517
diff changeset
31 #include "lisp.h"
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
32 #include "termchar.h"
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
33 #include "termopts.h"
2198
8d7841ea526f Include termhooks.h.
Richard M. Stallman <rms@gnu.org>
parents: 2132
diff changeset
34 #include "termhooks.h"
13526
34382f4e23cb Always include dispextern.h before cm.h.
Richard M. Stallman <rms@gnu.org>
parents: 13448
diff changeset
35 /* cm.h must come after dispextern.h on Windows. */
13408
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
36 #include "dispextern.h"
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
37 #include "cm.h"
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
38 #include "buffer.h"
17015
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
39 #include "charset.h"
31093
6da961dff718 Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30720
diff changeset
40 #include "keyboard.h"
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
41 #include "frame.h"
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
42 #include "window.h"
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
43 #include "commands.h"
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
44 #include "disptab.h"
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
45 #include "indent.h"
4384
98605d0ea3cf (direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents: 4290
diff changeset
46 #include "intervals.h"
15065
270020829d09 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 14964
diff changeset
47 #include "blockinput.h"
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
48 #include "process.h"
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
49
17015
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
50 /* I don't know why DEC Alpha OSF1 fail to compile this file if we
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
51 include the following file. */
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
52 /* #include "systty.h" */
12917
8da09b463ee4 Include syssignal.h.
Richard M. Stallman <rms@gnu.org>
parents: 12667
diff changeset
53 #include "syssignal.h"
554
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
54
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
55 #ifdef HAVE_X_WINDOWS
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
56 #include "xterm.h"
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
57 #endif /* HAVE_X_WINDOWS */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
58
13408
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
59 #ifdef HAVE_NTGUI
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
60 #include "w32term.h"
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
61 #endif /* HAVE_NTGUI */
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
62
44890
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents: 44815
diff changeset
63 #ifdef MAC_OS
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32468
diff changeset
64 #include "macterm.h"
44890
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents: 44815
diff changeset
65 #endif /* MAC_OS */
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32468
diff changeset
66
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
67 /* Include systime.h after xterm.h to avoid double inclusion of time.h. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
68
7808
52e2eb6245d4 Include systime.h after xterm.h.
Richard M. Stallman <rms@gnu.org>
parents: 7648
diff changeset
69 #include "systime.h"
7558
8497bcb9fb8e (PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents: 7530
diff changeset
70 #include <errno.h>
8497bcb9fb8e (PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents: 7530
diff changeset
71
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
72 /* To get the prototype for `sleep'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
73
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
74 #ifdef HAVE_UNISTD_H
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
75 #include <unistd.h>
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
76 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
77
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
78 /* Get number of chars of output now in the buffer of a stdio stream.
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
79 This ought to be built in in stdio, but it isn't. Some s- files
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
80 override this because their stdio internals differ. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
81
5214
c4bf07b226be (PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents: 5083
diff changeset
82 #ifdef __GNU_LIBRARY__
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
83
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
84 /* The s- file might have overridden the definition with one that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
85 works for the system's C library. But we are using the GNU C
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
86 library, so this is the right definition for every system. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
87
7558
8497bcb9fb8e (PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents: 7530
diff changeset
88 #ifdef GNU_LIBRARY_PENDING_OUTPUT_COUNT
8497bcb9fb8e (PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents: 7530
diff changeset
89 #define PENDING_OUTPUT_COUNT GNU_LIBRARY_PENDING_OUTPUT_COUNT
8497bcb9fb8e (PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents: 7530
diff changeset
90 #else
7443
a9cb818e5316 [__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents: 7247
diff changeset
91 #undef PENDING_OUTPUT_COUNT
5214
c4bf07b226be (PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents: 5083
diff changeset
92 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__bufp - (FILE)->__buffer)
7558
8497bcb9fb8e (PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents: 7530
diff changeset
93 #endif
8497bcb9fb8e (PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents: 7530
diff changeset
94 #else /* not __GNU_LIBRARY__ */
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 25781
diff changeset
95 #if !defined (PENDING_OUTPUT_COUNT) && HAVE_STDIO_EXT_H && HAVE___FPENDING
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 25781
diff changeset
96 #include <stdio_ext.h>
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 25781
diff changeset
97 #define PENDING_OUTPUT_COUNT(FILE) __fpending (FILE)
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 25781
diff changeset
98 #endif
7443
a9cb818e5316 [__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents: 7247
diff changeset
99 #ifndef PENDING_OUTPUT_COUNT
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
100 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
101 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
102 #endif /* not __GNU_LIBRARY__ */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
103
41969
e669966d496e Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents: 41120
diff changeset
104 #if defined(HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES)
29437
979a75b2755b Conditionally include term.h.
Dave Love <fx@gnu.org>
parents: 29336
diff changeset
105 #include <term.h> /* for tgetent */
979a75b2755b Conditionally include term.h.
Dave Love <fx@gnu.org>
parents: 29336
diff changeset
106 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
107
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
108 /* Structure to pass dimensions around. Used for character bounding
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
109 boxes, glyph matrix dimensions and alike. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
110
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
111 struct dim
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
112 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
113 int width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
114 int height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
115 };
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
116
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
117
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
118 /* Function prototypes. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
119
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
120 static struct glyph_matrix *save_current_matrix P_ ((struct frame *));
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
121 static void restore_current_matrix P_ ((struct frame *, struct glyph_matrix *));
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
122 static void fake_current_matrices P_ ((Lisp_Object));
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
123 static void redraw_overlapping_rows P_ ((struct window *, int));
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
124 static void redraw_overlapped_rows P_ ((struct window *, int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
125 static int count_blanks P_ ((struct glyph *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
126 static int count_match P_ ((struct glyph *, struct glyph *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
127 struct glyph *, struct glyph *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
128 static unsigned line_draw_cost P_ ((struct glyph_matrix *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
129 static void update_frame_line P_ ((struct frame *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
130 static struct dim allocate_matrices_for_frame_redisplay
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
131 P_ ((Lisp_Object, int, int, int, int *));
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
132 static void allocate_matrices_for_window_redisplay P_ ((struct window *));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
133 static int realloc_glyph_pool P_ ((struct glyph_pool *, struct dim));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
134 static void adjust_frame_glyphs P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
135 struct glyph_matrix *new_glyph_matrix P_ ((struct glyph_pool *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
136 static void free_glyph_matrix P_ ((struct glyph_matrix *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
137 static void adjust_glyph_matrix P_ ((struct window *, struct glyph_matrix *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
138 int, int, struct dim));
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
139 static void change_frame_size_1 P_ ((struct frame *, int, int, int, int, int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
140 static void swap_glyph_pointers P_ ((struct glyph_row *, struct glyph_row *));
34895
53e52b3525bf Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents: 34893
diff changeset
141 #if GLYPH_DEBUG
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
142 static int glyph_row_slice_p P_ ((struct glyph_row *, struct glyph_row *));
30323
4cd1b8fe118c (direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents: 30307
diff changeset
143 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
144 static void fill_up_frame_row_with_spaces P_ ((struct glyph_row *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
145 static void build_frame_matrix_from_window_tree P_ ((struct glyph_matrix *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
146 struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
147 static void build_frame_matrix_from_leaf_window P_ ((struct glyph_matrix *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
148 struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
149 static struct glyph_pool *new_glyph_pool P_ ((void));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
150 static void free_glyph_pool P_ ((struct glyph_pool *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
151 static void adjust_frame_glyphs_initially P_ ((void));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
152 static void adjust_frame_message_buffer P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
153 static void adjust_decode_mode_spec_buffer P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
154 static void fill_up_glyph_row_with_spaces P_ ((struct glyph_row *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
155 static void build_frame_matrix P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
156 void clear_current_matrices P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
157 void scroll_glyph_matrix_range P_ ((struct glyph_matrix *, int, int,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
158 int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
159 static void clear_window_matrices P_ ((struct window *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
160 static void fill_up_glyph_row_area_with_spaces P_ ((struct glyph_row *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
161 static int scrolling_window P_ ((struct window *, int));
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
162 static int update_window_line P_ ((struct window *, int, int *));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
163 static void update_marginal_area P_ ((struct window *, int, int));
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
164 static int update_text_area P_ ((struct window *, int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
165 static void make_current P_ ((struct glyph_matrix *, struct glyph_matrix *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
166 int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
167 static void mirror_make_current P_ ((struct window *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
168 void check_window_matrix_pointers P_ ((struct window *));
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
169 #if GLYPH_DEBUG
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
170 static void check_matrix_pointers P_ ((struct glyph_matrix *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
171 struct glyph_matrix *));
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
172 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
173 static void mirror_line_dance P_ ((struct window *, int, int, int *, char *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
174 static int update_window_tree P_ ((struct window *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
175 static int update_window P_ ((struct window *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
176 static int update_frame_1 P_ ((struct frame *, int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
177 static void set_window_cursor_after_update P_ ((struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
178 static int row_equal_p P_ ((struct window *, struct glyph_row *,
30152
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
179 struct glyph_row *, int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
180 static void adjust_frame_glyphs_for_window_redisplay P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
181 static void adjust_frame_glyphs_for_frame_redisplay P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
182 static void reverse_rows P_ ((struct glyph_matrix *, int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
183 static int margin_glyphs_to_reserve P_ ((struct window *, int, Lisp_Object));
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
184 static void sync_window_with_frame_matrix_rows P_ ((struct window *));
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
185 struct window *frame_row_to_window P_ ((struct window *, int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
186
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
187
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
188 /* Non-zero means don't pause redisplay for pending input. (This is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
189 for debugging and for a future implementation of EDT-like
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
190 scrolling. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
191
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
192 int redisplay_dont_pause;
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
193
554
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
194 /* Nonzero upon entry to redisplay means do not assume anything about
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
195 current contents of actual terminal frame; clear and redraw it. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
196
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
197 int frame_garbaged;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
198
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
199 /* Nonzero means last display completed. Zero means it was preempted. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
200
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
201 int display_completed;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
202
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
203 /* Lisp variable visible-bell; enables use of screen-flash instead of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
204 audible bell. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
205
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
206 int visible_bell;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
207
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
208 /* Invert the color of the whole frame, at a low level. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
209
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
210 int inverse_video;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
211
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
212 /* Line speed of the terminal. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
213
43713
f92c4d87863a Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42835
diff changeset
214 EMACS_INT baud_rate;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
215
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
216 /* Either nil or a symbol naming the window system under which Emacs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
217 is running. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
218
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
219 Lisp_Object Vwindow_system;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
220
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
221 /* Version number of X windows: 10, 11 or nil. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
222
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
223 Lisp_Object Vwindow_system_version;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
224
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
225 /* Vector of glyph definitions. Indexed by glyph number, the contents
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
226 are a string which is how to output the glyph.
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
227
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
228 If Vglyph_table is nil, a glyph is output by using its low 8 bits
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
229 as a character code.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
230
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
231 This is an obsolete feature that is no longer used. The variable
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
232 is retained for compatibility. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
233
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
234 Lisp_Object Vglyph_table;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
235
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
236 /* Display table to use for vectors that don't specify their own. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
237
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
238 Lisp_Object Vstandard_display_table;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
239
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
240 /* Nonzero means reading single-character input with prompt so put
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
241 cursor on mini-buffer after the prompt. Positive means at end of
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
242 text in echo area; negative means at beginning of line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
243
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
244 int cursor_in_echo_area;
13220
2e9014617492 (Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13105
diff changeset
245
30720
64f3338f72d8 (Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30713
diff changeset
246 Lisp_Object Qdisplay_table, Qredisplay_dont_pause;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
247
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
248
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
249 /* The currently selected frame. In a single-frame version, this
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
250 variable always equals the_only_frame. */
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
251
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
252 Lisp_Object selected_frame;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
253
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
254 /* A frame which is not just a mini-buffer, or 0 if there are no such
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
255 frames. This is usually the most recent such frame that was
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9303
diff changeset
256 selected. In a single-frame version, this variable always holds
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9303
diff changeset
257 the address of the_only_frame. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
258
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
259 struct frame *last_nonminibuf_frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
260
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
261 /* Stdio stream being used for copy of all output. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
262
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
263 FILE *termscript;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
264
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
265 /* Structure for info on cursor positioning. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
266
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
267 struct cm Wcm;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
268
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
269 /* 1 means SIGWINCH happened when not safe. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
270
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
271 int delayed_size_change;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
272
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
273 /* 1 means glyph initialization has been completed at startup. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
274
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
275 static int glyphs_initialized_initially_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
276
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
277 /* Updated window if != 0. Set by update_window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
278
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
279 struct window *updated_window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
280
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
281 /* Glyph row updated in update_window_line, and area that is updated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
282
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
283 struct glyph_row *updated_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
284 int updated_area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
285
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
286 /* A glyph for a space. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
287
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
288 struct glyph space_glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
289
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
290 /* Non-zero means update has been performed directly, so that there's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
291 no need for redisplay_internal to do much work. Set by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
292 direct_output_for_insert. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
293
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
294 int redisplay_performed_directly_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
295
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
296 /* Counts of allocated structures. These counts serve to diagnose
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
297 memory leaks and double frees. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
298
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
299 int glyph_matrix_count;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
300 int glyph_pool_count;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
301
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
302 /* If non-null, the frame whose frame matrices are manipulated. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
303 null, window matrices are worked on. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
304
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
305 static struct frame *frame_matrix_frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
306
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
307 /* Current interface for window-based redisplay. Set from init_xterm.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
308 A null value means we are not using window-based redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
309
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
310 struct redisplay_interface *rif;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
311
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
312 /* Non-zero means that fonts have been loaded since the last glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
313 matrix adjustments. Redisplay must stop, and glyph matrices must
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
314 be adjusted when this flag becomes non-zero during display. The
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
315 reason fonts can be loaded so late is that fonts of fontsets are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
316 loaded on demand. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
317
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
318 int fonts_changed_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
319
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
320 /* Convert vpos and hpos from frame to window and vice versa.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
321 This may only be used for terminal frames. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
322
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
323 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
324
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
325 static int window_to_frame_vpos P_ ((struct window *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
326 static int window_to_frame_hpos P_ ((struct window *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
327 #define WINDOW_TO_FRAME_VPOS(W, VPOS) window_to_frame_vpos ((W), (VPOS))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
328 #define WINDOW_TO_FRAME_HPOS(W, HPOS) window_to_frame_hpos ((W), (HPOS))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
329
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
330 /* One element of the ring buffer containing redisplay history
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
331 information. */
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
332
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
333 struct redisplay_history
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
334 {
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
335 char trace[512 + 100];
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
336 };
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
337
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
338 /* The size of the history buffer. */
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
339
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
340 #define REDISPLAY_HISTORY_SIZE 30
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
341
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
342 /* The redisplay history buffer. */
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
343
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
344 static struct redisplay_history redisplay_history[REDISPLAY_HISTORY_SIZE];
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
345
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
346 /* Next free entry in redisplay_history. */
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
347
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
348 static int history_idx;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
349
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
350 /* A tick that's incremented each time something is added to the
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
351 history. */
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
352
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
353 static unsigned history_tick;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
354
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
355 static void add_frame_display_history P_ ((struct frame *, int));
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
356 static void add_window_display_history P_ ((struct window *, char *, int));
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
357
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
358
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
359 /* Add to the redisplay history how window W has been displayed.
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
360 MSG is a trace containing the information how W's glyph matrix
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
361 has been constructed. PAUSED_P non-zero means that the update
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
362 has been interrupted for pending input. */
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
363
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
364 static void
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
365 add_window_display_history (w, msg, paused_p)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
366 struct window *w;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
367 char *msg;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
368 int paused_p;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
369 {
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
370 char *buf;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
371
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
372 if (history_idx >= REDISPLAY_HISTORY_SIZE)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
373 history_idx = 0;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
374 buf = redisplay_history[history_idx].trace;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
375 ++history_idx;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
376
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
377 sprintf (buf, "%d: window %p (`%s')%s\n",
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
378 history_tick++,
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
379 w,
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
380 ((BUFFERP (w->buffer)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
381 && STRINGP (XBUFFER (w->buffer)->name))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
382 ? (char *) SDATA (XBUFFER (w->buffer)->name)
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
383 : "???"),
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
384 paused_p ? " ***paused***" : "");
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
385 strcat (buf, msg);
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
386 }
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
387
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
388
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
389 /* Add to the redisplay history that frame F has been displayed.
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
390 PAUSED_P non-zero means that the update has been interrupted for
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
391 pending input. */
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
392
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
393 static void
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
394 add_frame_display_history (f, paused_p)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
395 struct frame *f;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
396 int paused_p;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
397 {
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
398 char *buf;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
399
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
400 if (history_idx >= REDISPLAY_HISTORY_SIZE)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
401 history_idx = 0;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
402 buf = redisplay_history[history_idx].trace;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
403 ++history_idx;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
404
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
405 sprintf (buf, "%d: update frame %p%s",
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
406 history_tick++,
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
407 f, paused_p ? " ***paused***" : "");
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
408 }
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
409
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
410
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
411 DEFUN ("dump-redisplay-history", Fdump_redisplay_history,
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
412 Sdump_redisplay_history, 0, 0, "",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
413 doc: /* Dump redisplay history to stderr. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
414 ()
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
415 {
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
416 int i;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
417
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
418 for (i = history_idx - 1; i != history_idx; --i)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
419 {
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
420 if (i < 0)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
421 i = REDISPLAY_HISTORY_SIZE - 1;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
422 fprintf (stderr, "%s\n", redisplay_history[i].trace);
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
423 }
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
424
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
425 return Qnil;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
426 }
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
427
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
428
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
429 #else /* GLYPH_DEBUG == 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
430
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
431 #define WINDOW_TO_FRAME_VPOS(W, VPOS) ((VPOS) + XFASTINT ((W)->top))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
432 #define WINDOW_TO_FRAME_HPOS(W, HPOS) ((HPOS) + XFASTINT ((W)->left))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
433
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
434 #endif /* GLYPH_DEBUG == 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
435
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
436
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
437 /* Like bcopy except never gets confused by overlap. Let this be the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
438 first function defined in this file, or change emacs.c where the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
439 address of this function is used. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
440
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
441 void
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
442 safe_bcopy (from, to, size)
46551
227785e3e29f (safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents: 46370
diff changeset
443 const char *from;
227785e3e29f (safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents: 46370
diff changeset
444 char *to;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
445 int size;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
446 {
1588
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
447 if (size <= 0 || from == to)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
448 return;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
449
1588
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
450 /* If the source and destination don't overlap, then bcopy can
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
451 handle it. If they do overlap, but the destination is lower in
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
452 memory than the source, we'll assume bcopy can handle that. */
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
453 if (to < from || from + size <= to)
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
454 bcopy (from, to, size);
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
455
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
456 /* Otherwise, we'll copy from the end. */
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
457 else
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
458 {
46551
227785e3e29f (safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents: 46370
diff changeset
459 register const char *endf = from + size;
1588
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
460 register char *endt = to + size;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
461
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
462 /* If TO - FROM is large, then we should break the copy into
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
463 nonoverlapping chunks of TO - FROM bytes each. However, if
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
464 TO - FROM is small, then the bcopy function call overhead
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
465 makes this not worth it. The crossover point could be about
1588
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
466 anywhere. Since I don't think the obvious copy loop is too
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
467 bad, I'm trying to err in its favor. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
468 if (to - from < 64)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
469 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
470 do
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
471 *--endt = *--endf;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
472 while (endf != from);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
473 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
474 else
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
475 {
1588
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
476 for (;;)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
477 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
478 endt -= (to - from);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
479 endf -= (to - from);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
480
1588
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
481 if (endt < to)
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
482 break;
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
483
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
484 bcopy (endf, endt, to - from);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
485 }
1588
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
486
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
487 /* If SIZE wasn't a multiple of TO - FROM, there will be a
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
488 little left over. The amount left over is (endt + (to -
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
489 from)) - to, which is endt - from. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
490 bcopy (from, to, endt - from);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
491 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
492 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
493 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
494
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
495
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
496
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
497 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
498 Glyph Matrices
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
499 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
500
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
501 /* Allocate and return a glyph_matrix structure. POOL is the glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
502 pool from which memory for the matrix should be allocated, or null
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
503 for window-based redisplay where no glyph pools are used. The
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
504 member `pool' of the glyph matrix structure returned is set to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
505 POOL, the structure is otherwise zeroed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
506
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
507 struct glyph_matrix *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
508 new_glyph_matrix (pool)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
509 struct glyph_pool *pool;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
510 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
511 struct glyph_matrix *result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
512
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
513 /* Allocate and clear. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
514 result = (struct glyph_matrix *) xmalloc (sizeof *result);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
515 bzero (result, sizeof *result);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
516
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
517 /* Increment number of allocated matrices. This count is used
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
518 to detect memory leaks. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
519 ++glyph_matrix_count;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
520
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
521 /* Set pool and return. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
522 result->pool = pool;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
523 return result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
524 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
525
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
526
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
527 /* Free glyph matrix MATRIX. Passing in a null MATRIX is allowed.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
528
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
529 The global counter glyph_matrix_count is decremented when a matrix
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
530 is freed. If the count gets negative, more structures were freed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
531 than allocated, i.e. one matrix was freed more than once or a bogus
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
532 pointer was passed to this function.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
533
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
534 If MATRIX->pool is null, this means that the matrix manages its own
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
535 glyph memory---this is done for matrices on X frames. Freeing the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
536 matrix also frees the glyph memory in this case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
537
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
538 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
539 free_glyph_matrix (matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
540 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
541 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
542 if (matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
543 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
544 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
545
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
546 /* Detect the case that more matrices are freed than were
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
547 allocated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
548 if (--glyph_matrix_count < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
549 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
550
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
551 /* Free glyph memory if MATRIX owns it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
552 if (matrix->pool == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
553 for (i = 0; i < matrix->rows_allocated; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
554 xfree (matrix->rows[i].glyphs[LEFT_MARGIN_AREA]);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
555
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
556 /* Free row structures and the matrix itself. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
557 xfree (matrix->rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
558 xfree (matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
559 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
560 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
561
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
562
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
563 /* Return the number of glyphs to reserve for a marginal area of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
564 window W. TOTAL_GLYPHS is the number of glyphs in a complete
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
565 display line of window W. MARGIN gives the width of the marginal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
566 area in canonical character units. MARGIN should be an integer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
567 or a float. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
568
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
569 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
570 margin_glyphs_to_reserve (w, total_glyphs, margin)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
571 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
572 int total_glyphs;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
573 Lisp_Object margin;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
574 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
575 int n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
576
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
577 if (NUMBERP (margin))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
578 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
579 int width = XFASTINT (w->width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
580 double d = max (0, XFLOATINT (margin));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
581 d = min (width / 2 - 1, d);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
582 n = (int) ((double) total_glyphs / width * d);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
583 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
584 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
585 n = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
586
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
587 return n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
588 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
589
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
590
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
591 /* Adjust glyph matrix MATRIX on window W or on a frame to changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
592 window sizes.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
593
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
594 W is null if the function is called for a frame glyph matrix.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
595 Otherwise it is the window MATRIX is a member of. X and Y are the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
596 indices of the first column and row of MATRIX within the frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
597 matrix, if such a matrix exists. They are zero for purely
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
598 window-based redisplay. DIM is the needed size of the matrix.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
599
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
600 In window-based redisplay, where no frame matrices exist, glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
601 matrices manage their own glyph storage. Otherwise, they allocate
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
602 storage from a common frame glyph pool which can be found in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
603 MATRIX->pool.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
604
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
605 The reason for this memory management strategy is to avoid complete
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
606 frame redraws if possible. When we allocate from a common pool, a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
607 change of the location or size of a sub-matrix within the pool
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
608 requires a complete redisplay of the frame because we cannot easily
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
609 make sure that the current matrices of all windows still agree with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
610 what is displayed on the screen. While this is usually fast, it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
611 leads to screen flickering. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
612
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
613 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
614 adjust_glyph_matrix (w, matrix, x, y, dim)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
615 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
616 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
617 int x, y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
618 struct dim dim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
619 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
620 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
621 int new_rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
622 int marginal_areas_changed_p = 0;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
623 int header_line_changed_p = 0;
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
624 int header_line_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
625 int left = -1, right = -1;
34203
e55480843a8e (scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents: 33763
diff changeset
626 int window_x, window_y, window_width = -1, window_height;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
627
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
628 /* See if W had a header line that has disappeared now, or vice versa. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
629 if (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
630 {
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
631 header_line_p = WINDOW_WANTS_HEADER_LINE_P (w);
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
632 header_line_changed_p = header_line_p != matrix->header_line_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
633 }
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
634 matrix->header_line_p = header_line_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
635
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
636 /* Do nothing if MATRIX' size, position, vscroll, and marginal areas
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
637 haven't changed. This optimization is important because preserving
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
638 the matrix means preventing redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
639 if (matrix->pool == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
640 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
641 window_box (w, -1, &window_x, &window_y, &window_width, &window_height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
642 left = margin_glyphs_to_reserve (w, dim.width, w->left_margin_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
643 right = margin_glyphs_to_reserve (w, dim.width, w->right_margin_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
644 xassert (left >= 0 && right >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
645 marginal_areas_changed_p = (left != matrix->left_margin_glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
646 || right != matrix->right_margin_glyphs);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
647
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
648 if (!marginal_areas_changed_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
649 && !fonts_changed_p
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
650 && !header_line_changed_p
34279
7ab25b4a077c (adjust_glyph_matrix): Don't reuse a window's current
Gerd Moellmann <gerd@gnu.org>
parents: 34203
diff changeset
651 && matrix->window_left_x == XFASTINT (w->left)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
652 && matrix->window_top_y == XFASTINT (w->top)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
653 && matrix->window_height == window_height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
654 && matrix->window_vscroll == w->vscroll
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
655 && matrix->window_width == window_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
656 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
657 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
658
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
659 /* Enlarge MATRIX->rows if necessary. New rows are cleared. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
660 if (matrix->rows_allocated < dim.height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
661 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
662 int size = dim.height * sizeof (struct glyph_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
663 new_rows = dim.height - matrix->rows_allocated;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
664 matrix->rows = (struct glyph_row *) xrealloc (matrix->rows, size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
665 bzero (matrix->rows + matrix->rows_allocated,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
666 new_rows * sizeof *matrix->rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
667 matrix->rows_allocated = dim.height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
668 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
669 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
670 new_rows = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
671
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
672 /* If POOL is not null, MATRIX is a frame matrix or a window matrix
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
673 on a frame not using window-based redisplay. Set up pointers for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
674 each row into the glyph pool. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
675 if (matrix->pool)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
676 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
677 xassert (matrix->pool->glyphs);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
678
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
679 if (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
680 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
681 left = margin_glyphs_to_reserve (w, dim.width,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
682 w->left_margin_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
683 right = margin_glyphs_to_reserve (w, dim.width,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
684 w->right_margin_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
685 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
686 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
687 left = right = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
688
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
689 for (i = 0; i < dim.height; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
690 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
691 struct glyph_row *row = &matrix->rows[i];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
692
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
693 row->glyphs[LEFT_MARGIN_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
694 = (matrix->pool->glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
695 + (y + i) * matrix->pool->ncolumns
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
696 + x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
697
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
698 if (w == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
699 || row == matrix->rows + dim.height - 1
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
700 || (row == matrix->rows && matrix->header_line_p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
701 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
702 row->glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
703 = row->glyphs[LEFT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
704 row->glyphs[RIGHT_MARGIN_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
705 = row->glyphs[TEXT_AREA] + dim.width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
706 row->glyphs[LAST_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
707 = row->glyphs[RIGHT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
708 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
709 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
710 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
711 row->glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
712 = row->glyphs[LEFT_MARGIN_AREA] + left;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
713 row->glyphs[RIGHT_MARGIN_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
714 = row->glyphs[TEXT_AREA] + dim.width - left - right;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
715 row->glyphs[LAST_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
716 = row->glyphs[LEFT_MARGIN_AREA] + dim.width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
717 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
718 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
719
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
720 matrix->left_margin_glyphs = left;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
721 matrix->right_margin_glyphs = right;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
722 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
723 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
724 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
725 /* If MATRIX->pool is null, MATRIX is responsible for managing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
726 its own memory. Allocate glyph memory from the heap. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
727 if (dim.width > matrix->matrix_w
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
728 || new_rows
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
729 || header_line_changed_p
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
730 || marginal_areas_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
731 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
732 struct glyph_row *row = matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
733 struct glyph_row *end = row + matrix->rows_allocated;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
734
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
735 while (row < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
736 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
737 row->glyphs[LEFT_MARGIN_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
738 = (struct glyph *) xrealloc (row->glyphs[LEFT_MARGIN_AREA],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
739 (dim.width
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
740 * sizeof (struct glyph)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
741
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
742 /* The mode line never has marginal areas. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
743 if (row == matrix->rows + dim.height - 1
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
744 || (row == matrix->rows && matrix->header_line_p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
745 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
746 row->glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
747 = row->glyphs[LEFT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
748 row->glyphs[RIGHT_MARGIN_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
749 = row->glyphs[TEXT_AREA] + dim.width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
750 row->glyphs[LAST_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
751 = row->glyphs[RIGHT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
752 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
753 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
754 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
755 row->glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
756 = row->glyphs[LEFT_MARGIN_AREA] + left;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
757 row->glyphs[RIGHT_MARGIN_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
758 = row->glyphs[TEXT_AREA] + dim.width - left - right;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
759 row->glyphs[LAST_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
760 = row->glyphs[LEFT_MARGIN_AREA] + dim.width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
761 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
762 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
763 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
764 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
765
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
766 xassert (left >= 0 && right >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
767 matrix->left_margin_glyphs = left;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
768 matrix->right_margin_glyphs = right;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
769 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
770
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
771 /* Number of rows to be used by MATRIX. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
772 matrix->nrows = dim.height;
31932
081edde76197 (adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents: 31850
diff changeset
773 xassert (matrix->nrows >= 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
774
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
775 if (w)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
776 {
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
777 if (matrix == w->current_matrix)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
778 {
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
779 /* Mark rows in a current matrix of a window as not having
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
780 valid contents. It's important to not do this for
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
781 desired matrices. When Emacs starts, it may already be
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
782 building desired matrices when this function runs. */
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
783 if (window_width < 0)
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
784 window_width = window_box_width (w, -1);
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
785
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
786 /* Optimize the case that only the height has changed (C-x 2,
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
787 upper window). Invalidate all rows that are no longer part
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
788 of the window. */
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
789 if (!marginal_areas_changed_p
37098
e293840c7332 (adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents: 36697
diff changeset
790 && !header_line_changed_p
e293840c7332 (adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents: 36697
diff changeset
791 && new_rows == 0
e293840c7332 (adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents: 36697
diff changeset
792 && dim.width == matrix->matrix_w
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
793 && matrix->window_left_x == XFASTINT (w->left)
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
794 && matrix->window_top_y == XFASTINT (w->top)
37098
e293840c7332 (adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents: 36697
diff changeset
795 && matrix->window_width == window_width)
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
796 {
38528
c867615c6a26 (adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents: 38489
diff changeset
797 /* Find the last row in the window. */
c867615c6a26 (adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents: 38489
diff changeset
798 for (i = 0; i < matrix->nrows && matrix->rows[i].enabled_p; ++i)
c867615c6a26 (adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents: 38489
diff changeset
799 if (MATRIX_ROW_BOTTOM_Y (matrix->rows + i) >= window_height)
c867615c6a26 (adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents: 38489
diff changeset
800 {
38748
bb32ae33769e (adjust_glyph_matrix): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents: 38734
diff changeset
801 ++i;
38528
c867615c6a26 (adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents: 38489
diff changeset
802 break;
c867615c6a26 (adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents: 38489
diff changeset
803 }
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
804
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
805 /* Window end is invalid, if inside of the rows that
38528
c867615c6a26 (adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents: 38489
diff changeset
806 are invalidated below. */
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
807 if (INTEGERP (w->window_end_vpos)
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
808 && XFASTINT (w->window_end_vpos) >= i)
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
809 w->window_end_valid = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
810
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
811 while (i < matrix->nrows)
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
812 matrix->rows[i++].enabled_p = 0;
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
813 }
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
814 else
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
815 {
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
816 for (i = 0; i < matrix->nrows; ++i)
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
817 matrix->rows[i].enabled_p = 0;
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
818 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
819 }
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
820 else if (matrix == w->desired_matrix)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
821 {
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
822 /* Rows in desired matrices always have to be cleared;
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
823 redisplay expects this is the case when it runs, so it
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
824 had better be the case when we adjust matrices between
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
825 redisplays. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
826 for (i = 0; i < matrix->nrows; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
827 matrix->rows[i].enabled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
828 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
829 }
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
830
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
831
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
832 /* Remember last values to be able to optimize frame redraws. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
833 matrix->matrix_x = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
834 matrix->matrix_y = y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
835 matrix->matrix_w = dim.width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
836 matrix->matrix_h = dim.height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
837
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
838 /* Record the top y location and height of W at the time the matrix
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
839 was last adjusted. This is used to optimize redisplay above. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
840 if (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
841 {
34279
7ab25b4a077c (adjust_glyph_matrix): Don't reuse a window's current
Gerd Moellmann <gerd@gnu.org>
parents: 34203
diff changeset
842 matrix->window_left_x = XFASTINT (w->left);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
843 matrix->window_top_y = XFASTINT (w->top);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
844 matrix->window_height = window_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
845 matrix->window_width = window_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
846 matrix->window_vscroll = w->vscroll;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
847 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
848 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
849
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
850
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
851 /* Reverse the contents of rows in MATRIX between START and END. The
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
852 contents of the row at END - 1 end up at START, END - 2 at START +
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
853 1 etc. This is part of the implementation of rotate_matrix (see
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
854 below). */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
855
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
856 static void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
857 reverse_rows (matrix, start, end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
858 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
859 int start, end;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
860 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
861 int i, j;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
862
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
863 for (i = start, j = end - 1; i < j; ++i, --j)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
864 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
865 /* Non-ISO HP/UX compiler doesn't like auto struct
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
866 initialization. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
867 struct glyph_row temp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
868 temp = matrix->rows[i];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
869 matrix->rows[i] = matrix->rows[j];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
870 matrix->rows[j] = temp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
871 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
872 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
873
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
874
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
875 /* Rotate the contents of rows in MATRIX in the range FIRST .. LAST -
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
876 1 by BY positions. BY < 0 means rotate left, i.e. towards lower
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
877 indices. (Note: this does not copy glyphs, only glyph pointers in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
878 row structures are moved around).
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
879
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
880 The algorithm used for rotating the vector was, I believe, first
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
881 described by Kernighan. See the vector R as consisting of two
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
882 sub-vectors AB, where A has length BY for BY >= 0. The result
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
883 after rotating is then BA. Reverse both sub-vectors to get ArBr
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
884 and reverse the result to get (ArBr)r which is BA. Similar for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
885 rotating right. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
886
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
887 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
888 rotate_matrix (matrix, first, last, by)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
889 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
890 int first, last, by;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
891 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
892 if (by < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
893 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
894 /* Up (rotate left, i.e. towards lower indices). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
895 by = -by;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
896 reverse_rows (matrix, first, first + by);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
897 reverse_rows (matrix, first + by, last);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
898 reverse_rows (matrix, first, last);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
899 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
900 else if (by > 0)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
901 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
902 /* Down (rotate right, i.e. towards higher indices). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
903 reverse_rows (matrix, last - by, last);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
904 reverse_rows (matrix, first, last - by);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
905 reverse_rows (matrix, first, last);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
906 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
907 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
908
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
909
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
910 /* Increment buffer positions in glyph rows of MATRIX. Do it for rows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
911 with indices START <= index < END. Increment positions by DELTA/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
912 DELTA_BYTES. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
913
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
914 void
28708
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
915 increment_matrix_positions (matrix, start, end, delta, delta_bytes)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
916 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
917 int start, end, delta, delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
918 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
919 /* Check that START and END are reasonable values. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
920 xassert (start >= 0 && start <= matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
921 xassert (end >= 0 && end <= matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
922 xassert (start <= end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
923
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
924 for (; start < end; ++start)
28708
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
925 increment_row_positions (matrix->rows + start, delta, delta_bytes);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
926 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
927
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
928
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
929 /* Enable a range of rows in glyph matrix MATRIX. START and END are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
930 the row indices of the first and last + 1 row to enable. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
931 ENABLED_P is non-zero, enabled_p flags in rows will be set to 1. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
932
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
933 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
934 enable_glyph_matrix_rows (matrix, start, end, enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
935 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
936 int start, end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
937 int enabled_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
938 {
31932
081edde76197 (adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents: 31850
diff changeset
939 xassert (start <= end);
081edde76197 (adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents: 31850
diff changeset
940 xassert (start >= 0 && start < matrix->nrows);
081edde76197 (adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents: 31850
diff changeset
941 xassert (end >= 0 && end <= matrix->nrows);
081edde76197 (adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents: 31850
diff changeset
942
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
943 for (; start < end; ++start)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
944 matrix->rows[start].enabled_p = enabled_p != 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
945 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
946
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
947
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
948 /* Clear MATRIX.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
949
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
950 This empties all rows in MATRIX by setting the enabled_p flag for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
951 all rows of the matrix to zero. The function prepare_desired_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
952 will eventually really clear a row when it sees one with a zero
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
953 enabled_p flag.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
954
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
955 Resets update hints to defaults value. The only update hint
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
956 currently present is the flag MATRIX->no_scrolling_p. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
957
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
958 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
959 clear_glyph_matrix (matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
960 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
961 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
962 if (matrix)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
963 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
964 enable_glyph_matrix_rows (matrix, 0, matrix->nrows, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
965 matrix->no_scrolling_p = 0;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
966 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
967 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
968
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
969
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
970 /* Shift part of the glyph matrix MATRIX of window W up or down.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
971 Increment y-positions in glyph rows between START and END by DY,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
972 and recompute their visible height. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
973
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
974 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
975 shift_glyph_matrix (w, matrix, start, end, dy)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
976 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
977 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
978 int start, end, dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
979 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
980 int min_y, max_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
981
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
982 xassert (start <= end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
983 xassert (start >= 0 && start < matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
984 xassert (end >= 0 && end <= matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
985
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
986 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
987 max_y = WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
988
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
989 for (; start < end; ++start)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
990 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
991 struct glyph_row *row = &matrix->rows[start];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
992
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
993 row->y += dy;
38587
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
994 row->visible_height = row->height;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
995
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
996 if (row->y < min_y)
38587
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
997 row->visible_height -= min_y - row->y;
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
998 if (row->y + row->height > max_y)
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
999 row->visible_height -= row->y + row->height - max_y;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1000 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1001 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1002
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1003
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1004 /* Mark all rows in current matrices of frame F as invalid. Marking
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1005 invalid is done by setting enabled_p to zero for all rows in a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1006 current matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1007
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1008 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1009 clear_current_matrices (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1010 register struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1011 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1012 /* Clear frame current matrix, if we have one. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1013 if (f->current_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1014 clear_glyph_matrix (f->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1015
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1016 /* Clear the matrix of the menu bar window, if such a window exists.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1017 The menu bar window is currently used to display menus on X when
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1018 no toolkit support is compiled in. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1019 if (WINDOWP (f->menu_bar_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1020 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1021
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
1022 /* Clear the matrix of the tool-bar window, if any. */
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
1023 if (WINDOWP (f->tool_bar_window))
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
1024 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1025
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1026 /* Clear current window matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1027 xassert (WINDOWP (FRAME_ROOT_WINDOW (f)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1028 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1029 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1030
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1031
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1032 /* Clear out all display lines of F for a coming redisplay. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1033
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
1034 void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1035 clear_desired_matrices (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1036 register struct frame *f;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1037 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1038 if (f->desired_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1039 clear_glyph_matrix (f->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1040
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1041 if (WINDOWP (f->menu_bar_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1042 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1043
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
1044 if (WINDOWP (f->tool_bar_window))
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
1045 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->desired_matrix);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1046
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1047 /* Do it for window matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1048 xassert (WINDOWP (FRAME_ROOT_WINDOW (f)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1049 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1050 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1051
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1052
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1053 /* Clear matrices in window tree rooted in W. If DESIRED_P is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1054 non-zero clear desired matrices, otherwise clear current matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1055
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1056 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1057 clear_window_matrices (w, desired_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1058 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1059 int desired_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1060 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1061 while (w)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1062 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1063 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1064 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1065 xassert (WINDOWP (w->hchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1066 clear_window_matrices (XWINDOW (w->hchild), desired_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1067 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1068 else if (!NILP (w->vchild))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1069 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1070 xassert (WINDOWP (w->vchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1071 clear_window_matrices (XWINDOW (w->vchild), desired_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1072 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1073 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1074 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1075 if (desired_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1076 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1077 else
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1078 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1079 clear_glyph_matrix (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1080 w->window_end_valid = Qnil;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1081 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1082 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1083
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1084 w = NILP (w->next) ? 0 : XWINDOW (w->next);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1085 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1086 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1087
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1088
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1089
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1090 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1091 Glyph Rows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1092
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1093 See dispextern.h for an overall explanation of glyph rows.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1094 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1095
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1096 /* Clear glyph row ROW. Do it in a way that makes it robust against
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1097 changes in the glyph_row structure, i.e. addition or removal of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1098 structure members. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1099
33527
c4c7abc48752 (null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents: 33101
diff changeset
1100 static struct glyph_row null_row;
c4c7abc48752 (null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents: 33101
diff changeset
1101
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1102 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1103 clear_glyph_row (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1104 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1105 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1106 struct glyph *p[1 + LAST_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1107
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1108 /* Save pointers. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1109 p[LEFT_MARGIN_AREA] = row->glyphs[LEFT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1110 p[TEXT_AREA] = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1111 p[RIGHT_MARGIN_AREA] = row->glyphs[RIGHT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1112 p[LAST_AREA] = row->glyphs[LAST_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1113
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1114 /* Clear. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1115 *row = null_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1116
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1117 /* Restore pointers. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1118 row->glyphs[LEFT_MARGIN_AREA] = p[LEFT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1119 row->glyphs[TEXT_AREA] = p[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1120 row->glyphs[RIGHT_MARGIN_AREA] = p[RIGHT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1121 row->glyphs[LAST_AREA] = p[LAST_AREA];
30041
b20d72b7aa4b (clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 29980
diff changeset
1122
b20d72b7aa4b (clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 29980
diff changeset
1123 #if 0 /* At some point, some bit-fields of struct glyph were not set,
b20d72b7aa4b (clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 29980
diff changeset
1124 which made glyphs unequal when compared with GLYPH_EQUAL_P.
b20d72b7aa4b (clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 29980
diff changeset
1125 Redisplay outputs such glyphs, and flickering effects were
b20d72b7aa4b (clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 29980
diff changeset
1126 the result. This also depended on the contents of memory
b20d72b7aa4b (clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 29980
diff changeset
1127 returned by xmalloc. If flickering happens again, activate
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
1128 the code below. If the flickering is gone with that, chances
30041
b20d72b7aa4b (clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 29980
diff changeset
1129 are that the flickering has the same reason as here. */
b20d72b7aa4b (clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 29980
diff changeset
1130 bzero (p[0], (char *) p[LAST_AREA] - (char *) p[0]);
b20d72b7aa4b (clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 29980
diff changeset
1131 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1132 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1133
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1134
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1135 /* Make ROW an empty, enabled row of canonical character height,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1136 in window W starting at y-position Y. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1137
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1138 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1139 blank_row (w, row, y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1140 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1141 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1142 int y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1143 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1144 int min_y, max_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1145
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
1146 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1147 max_y = WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1148
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1149 clear_glyph_row (row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1150 row->y = y;
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
1151 row->ascent = row->phys_ascent = 0;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
1152 row->height = row->phys_height = CANON_Y_UNIT (XFRAME (w->frame));
38587
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1153 row->visible_height = row->height;
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1154
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1155 if (row->y < min_y)
38587
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1156 row->visible_height -= min_y - row->y;
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1157 if (row->y + row->height > max_y)
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1158 row->visible_height -= row->y + row->height - max_y;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1159
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1160 row->enabled_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1161 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1162
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1163
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1164 /* Increment buffer positions in glyph row ROW. DELTA and DELTA_BYTES
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1165 are the amounts by which to change positions. Note that the first
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1166 glyph of the text area of a row can have a buffer position even if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1167 the used count of the text area is zero. Such rows display line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1168 ends. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1169
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1170 void
28708
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
1171 increment_row_positions (row, delta, delta_bytes)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1172 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1173 int delta, delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1174 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1175 int area, i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1176
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1177 /* Increment start and end positions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1178 MATRIX_ROW_START_CHARPOS (row) += delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1179 MATRIX_ROW_START_BYTEPOS (row) += delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1180 MATRIX_ROW_END_CHARPOS (row) += delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1181 MATRIX_ROW_END_BYTEPOS (row) += delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1182
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1183 /* Increment positions in glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1184 for (area = 0; area < LAST_AREA; ++area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1185 for (i = 0; i < row->used[area]; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1186 if (BUFFERP (row->glyphs[area][i].object)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1187 && row->glyphs[area][i].charpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1188 row->glyphs[area][i].charpos += delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1189
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1190 /* Capture the case of rows displaying a line end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1191 if (row->used[TEXT_AREA] == 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1192 && MATRIX_ROW_DISPLAYS_TEXT_P (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1193 row->glyphs[TEXT_AREA]->charpos += delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1194 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1195
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1196
29336
5ccfe8a1638f (find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28708
diff changeset
1197 #if 0
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1198 /* Swap glyphs between two glyph rows A and B. This exchanges glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1199 contents, i.e. glyph structure contents are exchanged between A and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1200 B without changing glyph pointers in A and B. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1201
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1202 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1203 swap_glyphs_in_rows (a, b)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1204 struct glyph_row *a, *b;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1205 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1206 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1207
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1208 for (area = 0; area < LAST_AREA; ++area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1209 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1210 /* Number of glyphs to swap. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1211 int max_used = max (a->used[area], b->used[area]);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1212
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1213 /* Start of glyphs in area of row A. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1214 struct glyph *glyph_a = a->glyphs[area];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1215
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1216 /* End + 1 of glyphs in area of row A. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1217 struct glyph *glyph_a_end = a->glyphs[max_used];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1218
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1219 /* Start of glyphs in area of row B. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1220 struct glyph *glyph_b = b->glyphs[area];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1221
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1222 while (glyph_a < glyph_a_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1223 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1224 /* Non-ISO HP/UX compiler doesn't like auto struct
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1225 initialization. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1226 struct glyph temp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1227 temp = *glyph_a;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1228 *glyph_a = *glyph_b;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1229 *glyph_b = temp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1230 ++glyph_a;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1231 ++glyph_b;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1232 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1233 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1234 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1235
29336
5ccfe8a1638f (find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28708
diff changeset
1236 #endif /* 0 */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1237
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1238 /* Exchange pointers to glyph memory between glyph rows A and B. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1239
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1240 static INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1241 swap_glyph_pointers (a, b)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1242 struct glyph_row *a, *b;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1243 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1244 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1245 for (i = 0; i < LAST_AREA + 1; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1246 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1247 struct glyph *temp = a->glyphs[i];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1248 a->glyphs[i] = b->glyphs[i];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1249 b->glyphs[i] = temp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1250 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1251 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1252
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1253
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1254 /* Copy glyph row structure FROM to glyph row structure TO, except
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1255 that glyph pointers in the structures are left unchanged. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1256
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1257 INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1258 copy_row_except_pointers (to, from)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1259 struct glyph_row *to, *from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1260 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1261 struct glyph *pointers[1 + LAST_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1262
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1263 /* Save glyph pointers of TO. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1264 bcopy (to->glyphs, pointers, sizeof to->glyphs);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1265
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1266 /* Do a structure assignment. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1267 *to = *from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1268
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1269 /* Restore original pointers of TO. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1270 bcopy (pointers, to->glyphs, sizeof to->glyphs);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1271 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1272
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1273
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1274 /* Copy contents of glyph row FROM to glyph row TO. Glyph pointers in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1275 TO and FROM are left unchanged. Glyph contents are copied from the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1276 glyph memory of FROM to the glyph memory of TO. Increment buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1277 positions in row TO by DELTA/ DELTA_BYTES. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1278
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1279 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1280 copy_glyph_row_contents (to, from, delta, delta_bytes)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1281 struct glyph_row *to, *from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1282 int delta, delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1283 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1284 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1285
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1286 /* This is like a structure assignment TO = FROM, except that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1287 glyph pointers in the rows are left unchanged. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1288 copy_row_except_pointers (to, from);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1289
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1290 /* Copy glyphs from FROM to TO. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1291 for (area = 0; area < LAST_AREA; ++area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1292 if (from->used[area])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1293 bcopy (from->glyphs[area], to->glyphs[area],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1294 from->used[area] * sizeof (struct glyph));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1295
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1296 /* Increment buffer positions in TO by DELTA. */
28708
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
1297 increment_row_positions (to, delta, delta_bytes);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1298 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1299
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1300
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1301 /* Assign glyph row FROM to glyph row TO. This works like a structure
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1302 assignment TO = FROM, except that glyph pointers are not copied but
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1303 exchanged between TO and FROM. Pointers must be exchanged to avoid
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1304 a memory leak. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1305
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1306 static INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1307 assign_row (to, from)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1308 struct glyph_row *to, *from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1309 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1310 swap_glyph_pointers (to, from);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1311 copy_row_except_pointers (to, from);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1312 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1313
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1314
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1315 /* Test whether the glyph memory of the glyph row WINDOW_ROW, which is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1316 a row in a window matrix, is a slice of the glyph memory of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1317 glyph row FRAME_ROW which is a row in a frame glyph matrix. Value
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1318 is non-zero if the glyph memory of WINDOW_ROW is part of the glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1319 memory of FRAME_ROW. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1320
34893
779bd3fa820e Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents: 34866
diff changeset
1321 #if GLYPH_DEBUG
30323
4cd1b8fe118c (direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents: 30307
diff changeset
1322
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1323 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1324 glyph_row_slice_p (window_row, frame_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1325 struct glyph_row *window_row, *frame_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1326 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1327 struct glyph *window_glyph_start = window_row->glyphs[0];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1328 struct glyph *frame_glyph_start = frame_row->glyphs[0];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1329 struct glyph *frame_glyph_end = frame_row->glyphs[LAST_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1330
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1331 return (frame_glyph_start <= window_glyph_start
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1332 && window_glyph_start < frame_glyph_end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1333 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1334
30323
4cd1b8fe118c (direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents: 30307
diff changeset
1335 #endif /* GLYPH_DEBUG */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1336
29336
5ccfe8a1638f (find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28708
diff changeset
1337 #if 0
5ccfe8a1638f (find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28708
diff changeset
1338
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1339 /* Find the row in the window glyph matrix WINDOW_MATRIX being a slice
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1340 of ROW in the frame matrix FRAME_MATRIX. Value is null if no row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1341 in WINDOW_MATRIX is found satisfying the condition. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1342
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1343 static struct glyph_row *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1344 find_glyph_row_slice (window_matrix, frame_matrix, row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1345 struct glyph_matrix *window_matrix, *frame_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1346 int row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1347 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1348 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1349
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1350 xassert (row >= 0 && row < frame_matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1351
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1352 for (i = 0; i < window_matrix->nrows; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1353 if (glyph_row_slice_p (window_matrix->rows + i,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1354 frame_matrix->rows + row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1355 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1356
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1357 return i < window_matrix->nrows ? window_matrix->rows + i : 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1358 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1359
29336
5ccfe8a1638f (find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28708
diff changeset
1360 #endif /* 0 */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1361
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1362 /* Prepare ROW for display. Desired rows are cleared lazily,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1363 i.e. they are only marked as to be cleared by setting their
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1364 enabled_p flag to zero. When a row is to be displayed, a prior
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1365 call to this function really clears it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1366
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1367 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1368 prepare_desired_row (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1369 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1370 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1371 if (!row->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1372 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1373 clear_glyph_row (row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1374 row->enabled_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1375 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1376 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1377
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1378
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1379 /* Return a hash code for glyph row ROW. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1380
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1381 int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1382 line_hash_code (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1383 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1384 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1385 int hash = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1386
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1387 if (row->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1388 {
40075
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1389 struct glyph *glyph = row->glyphs[TEXT_AREA];
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1390 struct glyph *end = glyph + row->used[TEXT_AREA];
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1391
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1392 while (glyph < end)
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1393 {
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1394 int c = glyph->u.ch;
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1395 int face_id = glyph->face_id;
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1396 if (must_write_spaces)
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1397 c -= SPACEGLYPH;
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1398 hash = (((hash << 4) + (hash >> 24)) & 0x0fffffff) + c;
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1399 hash = (((hash << 4) + (hash >> 24)) & 0x0fffffff) + face_id;
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1400 ++glyph;
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1401 }
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1402
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1403 if (hash == 0)
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1404 hash = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1405 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1406
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1407 return hash;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1408 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1409
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1410
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
1411 /* Return the cost of drawing line VPOS in MATRIX. The cost equals
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1412 the number of characters in the line. If must_write_spaces is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1413 zero, leading and trailing spaces are ignored. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1414
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1415 static unsigned int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1416 line_draw_cost (matrix, vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1417 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1418 int vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1419 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1420 struct glyph_row *row = matrix->rows + vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1421 struct glyph *beg = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1422 struct glyph *end = beg + row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1423 int len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1424 Lisp_Object *glyph_table_base = GLYPH_TABLE_BASE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1425 int glyph_table_len = GLYPH_TABLE_LENGTH;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1426
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1427 /* Ignore trailing and leading spaces if we can. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1428 if (!must_write_spaces)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1429 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1430 /* Skip from the end over trailing spaces. */
34203
e55480843a8e (scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents: 33763
diff changeset
1431 while (end > beg && CHAR_GLYPH_SPACE_P (*(end - 1)))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1432 --end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1433
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1434 /* All blank line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1435 if (end == beg)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1436 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1437
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1438 /* Skip over leading spaces. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1439 while (CHAR_GLYPH_SPACE_P (*beg))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1440 ++beg;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1441 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1442
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1443 /* If we don't have a glyph-table, each glyph is one character,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1444 so return the number of glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1445 if (glyph_table_base == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1446 len = end - beg;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1447 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1448 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1449 /* Otherwise, scan the glyphs and accumulate their total length
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1450 in LEN. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1451 len = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1452 while (beg < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1453 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1454 GLYPH g = GLYPH_FROM_CHAR_GLYPH (*beg);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1455
26998
02e902f732d1 (line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents: 26902
diff changeset
1456 if (g < 0
02e902f732d1 (line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents: 26902
diff changeset
1457 || GLYPH_SIMPLE_P (glyph_table_base, glyph_table_len, g))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1458 len += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1459 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1460 len += GLYPH_LENGTH (glyph_table_base, g);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1461
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1462 ++beg;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1463 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1464 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1465
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1466 return len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1467 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1468
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1469
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1470 /* Test two glyph rows A and B for equality. Value is non-zero if A
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1471 and B have equal contents. W is the window to which the glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1472 rows A and B belong. It is needed here to test for partial row
30152
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
1473 visibility. MOUSE_FACE_P non-zero means compare the mouse_face_p
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
1474 flags of A and B, too. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1475
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1476 static INLINE int
30152
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
1477 row_equal_p (w, a, b, mouse_face_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1478 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1479 struct glyph_row *a, *b;
30152
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
1480 int mouse_face_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1481 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1482 if (a == b)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1483 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1484 else if (a->hash != b->hash)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1485 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1486 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1487 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1488 struct glyph *a_glyph, *b_glyph, *a_end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1489 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1490
30152
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
1491 if (mouse_face_p && a->mouse_face_p != b->mouse_face_p)
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
1492 return 0;
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
1493
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1494 /* Compare glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1495 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1496 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1497 if (a->used[area] != b->used[area])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1498 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1499
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1500 a_glyph = a->glyphs[area];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1501 a_end = a_glyph + a->used[area];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1502 b_glyph = b->glyphs[area];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1503
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1504 while (a_glyph < a_end
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1505 && GLYPH_EQUAL_P (a_glyph, b_glyph))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1506 ++a_glyph, ++b_glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1507
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1508 if (a_glyph != a_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1509 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1510 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1511
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1512 if (a->truncated_on_left_p != b->truncated_on_left_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1513 || a->fill_line_p != b->fill_line_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1514 || a->truncated_on_right_p != b->truncated_on_right_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1515 || a->overlay_arrow_p != b->overlay_arrow_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1516 || a->continued_p != b->continued_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1517 || a->indicate_empty_line_p != b->indicate_empty_line_p
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
1518 || a->overlapped_p != b->overlapped_p
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1519 || (MATRIX_ROW_CONTINUATION_LINE_P (a)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1520 != MATRIX_ROW_CONTINUATION_LINE_P (b))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1521 /* Different partially visible characters on left margin. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1522 || a->x != b->x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1523 /* Different height. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1524 || a->ascent != b->ascent
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
1525 || a->phys_ascent != b->phys_ascent
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
1526 || a->phys_height != b->phys_height
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1527 || a->visible_height != b->visible_height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1528 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1529 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1530
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1531 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1532 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1533
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1534
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1535
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1536 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1537 Glyph Pool
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1538
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1539 See dispextern.h for an overall explanation of glyph pools.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1540 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1541
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1542 /* Allocate a glyph_pool structure. The structure returned is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1543 initialized with zeros. The global variable glyph_pool_count is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1544 incremented for each pool allocated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1545
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1546 static struct glyph_pool *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1547 new_glyph_pool ()
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1548 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1549 struct glyph_pool *result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1550
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1551 /* Allocate a new glyph_pool and clear it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1552 result = (struct glyph_pool *) xmalloc (sizeof *result);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1553 bzero (result, sizeof *result);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1554
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1555 /* For memory leak and double deletion checking. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1556 ++glyph_pool_count;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1557
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1558 return result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1559 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1560
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1561
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1562 /* Free a glyph_pool structure POOL. The function may be called with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1563 a null POOL pointer. The global variable glyph_pool_count is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1564 decremented with every pool structure freed. If this count gets
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1565 negative, more structures were freed than allocated, i.e. one
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1566 structure must have been freed more than once or a bogus pointer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1567 was passed to free_glyph_pool. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1568
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1569 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1570 free_glyph_pool (pool)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1571 struct glyph_pool *pool;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1572 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1573 if (pool)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1574 {
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
1575 /* More freed than allocated? */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1576 --glyph_pool_count;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1577 xassert (glyph_pool_count >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1578
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1579 xfree (pool->glyphs);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1580 xfree (pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1581 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1582 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1583
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1584
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1585 /* Enlarge a glyph pool POOL. MATRIX_DIM gives the number of rows and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1586 columns we need. This function never shrinks a pool. The only
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1587 case in which this would make sense, would be when a frame's size
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1588 is changed from a large value to a smaller one. But, if someone
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1589 does it once, we can expect that he will do it again.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1590
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1591 Value is non-zero if the pool changed in a way which makes
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1592 re-adjusting window glyph matrices necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1593
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1594 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1595 realloc_glyph_pool (pool, matrix_dim)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1596 struct glyph_pool *pool;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1597 struct dim matrix_dim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1598 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1599 int needed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1600 int changed_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1601
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1602 changed_p = (pool->glyphs == 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1603 || matrix_dim.height != pool->nrows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1604 || matrix_dim.width != pool->ncolumns);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1605
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1606 /* Enlarge the glyph pool. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1607 needed = matrix_dim.width * matrix_dim.height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1608 if (needed > pool->nglyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1609 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1610 int size = needed * sizeof (struct glyph);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1611
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1612 if (pool->glyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1613 pool->glyphs = (struct glyph *) xrealloc (pool->glyphs, size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1614 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1615 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1616 pool->glyphs = (struct glyph *) xmalloc (size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1617 bzero (pool->glyphs, size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1618 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1619
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1620 pool->nglyphs = needed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1621 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1622
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
1623 /* Remember the number of rows and columns because (a) we use them
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1624 to do sanity checks, and (b) the number of columns determines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1625 where rows in the frame matrix start---this must be available to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1626 determine pointers to rows of window sub-matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1627 pool->nrows = matrix_dim.height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1628 pool->ncolumns = matrix_dim.width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1629
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1630 return changed_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1631 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1632
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1633
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1634
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1635 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1636 Debug Code
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1637 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1638
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1639 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1640
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1641
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1642 /* Flush standard output. This is sometimes useful to call from
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1643 the debugger. */
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1644
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1645 void
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1646 flush_stdout ()
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1647 {
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1648 fflush (stdout);
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1649 }
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1650
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1651
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1652 /* Check that no glyph pointers have been lost in MATRIX. If a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1653 pointer has been lost, e.g. by using a structure assignment between
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1654 rows, at least one pointer must occur more than once in the rows of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1655 MATRIX. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1656
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1657 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1658 check_matrix_pointer_lossage (matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1659 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1660 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1661 int i, j;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1662
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1663 for (i = 0; i < matrix->nrows; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1664 for (j = 0; j < matrix->nrows; ++j)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1665 xassert (i == j
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1666 || (matrix->rows[i].glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1667 != matrix->rows[j].glyphs[TEXT_AREA]));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1668 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1669
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1670
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1671 /* Get a pointer to glyph row ROW in MATRIX, with bounds checks. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1672
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1673 struct glyph_row *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1674 matrix_row (matrix, row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1675 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1676 int row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1677 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1678 xassert (matrix && matrix->rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1679 xassert (row >= 0 && row < matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1680
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1681 /* That's really too slow for normal testing because this function
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1682 is called almost everywhere. Although---it's still astonishingly
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1683 fast, so it is valuable to have for debugging purposes. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1684 #if 0
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1685 check_matrix_pointer_lossage (matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1686 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1687
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1688 return matrix->rows + row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1689 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1690
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1691
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1692 #if 0 /* This function makes invalid assumptions when text is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1693 partially invisible. But it might come handy for debugging
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1694 nevertheless. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1695
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1696 /* Check invariants that must hold for an up to date current matrix of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1697 window W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1698
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1699 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1700 check_matrix_invariants (w)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1701 struct window *w;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1702 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1703 struct glyph_matrix *matrix = w->current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1704 int yb = window_text_bottom_y (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1705 struct glyph_row *row = matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1706 struct glyph_row *last_text_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1707 struct buffer *saved = current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1708 struct buffer *buffer = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1709 int c;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1710
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1711 /* This can sometimes happen for a fresh window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1712 if (matrix->nrows < 2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1713 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1714
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1715 set_buffer_temp (buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1716
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1717 /* Note: last row is always reserved for the mode line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1718 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1719 && MATRIX_ROW_BOTTOM_Y (row) < yb)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1720 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1721 struct glyph_row *next = row + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1722
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1723 if (MATRIX_ROW_DISPLAYS_TEXT_P (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1724 last_text_row = row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1725
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1726 /* Check that character and byte positions are in sync. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1727 xassert (MATRIX_ROW_START_BYTEPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1728 == CHAR_TO_BYTE (MATRIX_ROW_START_CHARPOS (row)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1729
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1730 /* CHAR_TO_BYTE aborts when invoked for a position > Z. We can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1731 have such a position temporarily in case of a minibuffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1732 displaying something like `[Sole completion]' at its end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1733 if (MATRIX_ROW_END_CHARPOS (row) < BUF_ZV (current_buffer))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1734 xassert (MATRIX_ROW_END_BYTEPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1735 == CHAR_TO_BYTE (MATRIX_ROW_END_CHARPOS (row)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1736
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1737 /* Check that end position of `row' is equal to start position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1738 of next row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1739 if (next->enabled_p && MATRIX_ROW_DISPLAYS_TEXT_P (next))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1740 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1741 xassert (MATRIX_ROW_END_CHARPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1742 == MATRIX_ROW_START_CHARPOS (next));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1743 xassert (MATRIX_ROW_END_BYTEPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1744 == MATRIX_ROW_START_BYTEPOS (next));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1745 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1746 row = next;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1747 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1748
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1749 xassert (w->current_matrix->nrows == w->desired_matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1750 xassert (w->desired_matrix->rows != NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1751 set_buffer_temp (saved);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1752 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1753
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1754 #endif /* 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1755
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1756 #endif /* GLYPH_DEBUG != 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1757
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1758
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1759
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1760 /**********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1761 Allocating/ Adjusting Glyph Matrices
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1762 **********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1763
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1764 /* Allocate glyph matrices over a window tree for a frame-based
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1765 redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1766
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1767 X and Y are column/row within the frame glyph matrix where
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1768 sub-matrices for the window tree rooted at WINDOW must be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1769 allocated. CH_DIM contains the dimensions of the smallest
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1770 character that could be used during display. DIM_ONLY_P non-zero
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1771 means that the caller of this function is only interested in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1772 result matrix dimension, and matrix adjustments should not be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1773 performed.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1774
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1775 The function returns the total width/height of the sub-matrices of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1776 the window tree. If called on a frame root window, the computation
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1777 will take the mini-buffer window into account.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1778
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1779 *WINDOW_CHANGE_FLAGS is set to a bit mask with bits
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1780
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1781 NEW_LEAF_MATRIX set if any window in the tree did not have a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1782 glyph matrices yet, and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1783
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1784 CHANGED_LEAF_MATRIX set if the dimension or location of a matrix of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1785 any window in the tree will be changed or have been changed (see
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
1786 DIM_ONLY_P)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1787
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1788 *WINDOW_CHANGE_FLAGS must be initialized by the caller of this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1789 function.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1790
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1791 Windows are arranged into chains of windows on the same level
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1792 through the next fields of window structures. Such a level can be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1793 either a sequence of horizontally adjacent windows from left to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1794 right, or a sequence of vertically adjacent windows from top to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1795 bottom. Each window in a horizontal sequence can be either a leaf
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1796 window or a vertical sequence; a window in a vertical sequence can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1797 be either a leaf or a horizontal sequence. All windows in a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1798 horizontal sequence have the same height, and all windows in a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1799 vertical sequence have the same width.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1800
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1801 This function uses, for historical reasons, a more general
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1802 algorithm to determine glyph matrix dimensions that would be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1803 necessary.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1804
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1805 The matrix height of a horizontal sequence is determined by the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1806 maximum height of any matrix in the sequence. The matrix width of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1807 a horizontal sequence is computed by adding up matrix widths of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1808 windows in the sequence.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1809
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1810 |<------- result width ------->|
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1811 +---------+----------+---------+ ---
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1812 | | | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1813 | | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1814 +---------+ | | result height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1815 | +---------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1816 | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1817 +----------+ ---
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1818
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1819 The matrix width of a vertical sequence is the maximum matrix width
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1820 of any window in the sequence. Its height is computed by adding up
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1821 matrix heights of windows in the sequence.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1822
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1823 |<---- result width -->|
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1824 +---------+ ---
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1825 | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1826 | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1827 +---------+--+ |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1828 | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1829 | | result height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1830 | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1831 +------------+---------+ |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1832 | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1833 | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1834 +------------+---------+ --- */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1835
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1836 /* Bit indicating that a new matrix will be allocated or has been
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1837 allocated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1838
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1839 #define NEW_LEAF_MATRIX (1 << 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1840
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1841 /* Bit indicating that a matrix will or has changed its location or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1842 size. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1843
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1844 #define CHANGED_LEAF_MATRIX (1 << 1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1845
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1846 static struct dim
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1847 allocate_matrices_for_frame_redisplay (window, x, y, dim_only_p,
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1848 window_change_flags)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1849 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1850 int x, y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1851 int dim_only_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1852 int *window_change_flags;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1853 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1854 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1855 int x0 = x, y0 = y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1856 int wmax = 0, hmax = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1857 struct dim total;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1858 struct dim dim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1859 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1860 int in_horz_combination_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1861
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1862 /* What combination is WINDOW part of? Compute this once since the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1863 result is the same for all windows in the `next' chain. The
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1864 special case of a root window (parent equal to nil) is treated
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1865 like a vertical combination because a root window's `next'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1866 points to the mini-buffer window, if any, which is arranged
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1867 vertically below other windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1868 in_horz_combination_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1869 = (!NILP (XWINDOW (window)->parent)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1870 && !NILP (XWINDOW (XWINDOW (window)->parent)->hchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1871
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1872 /* For WINDOW and all windows on the same level. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1873 do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1874 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1875 w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1876
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1877 /* Get the dimension of the window sub-matrix for W, depending
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
1878 on whether this is a combination or a leaf window. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1879 if (!NILP (w->hchild))
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1880 dim = allocate_matrices_for_frame_redisplay (w->hchild, x, y,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1881 dim_only_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1882 window_change_flags);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1883 else if (!NILP (w->vchild))
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1884 dim = allocate_matrices_for_frame_redisplay (w->vchild, x, y,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1885 dim_only_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1886 window_change_flags);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1887 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1888 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1889 /* If not already done, allocate sub-matrix structures. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1890 if (w->desired_matrix == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1891 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1892 w->desired_matrix = new_glyph_matrix (f->desired_pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1893 w->current_matrix = new_glyph_matrix (f->current_pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1894 *window_change_flags |= NEW_LEAF_MATRIX;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1895 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1896
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1897 /* Width and height MUST be chosen so that there are no
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1898 holes in the frame matrix. */
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1899 dim.width = required_matrix_width (w);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1900 dim.height = required_matrix_height (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1901
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1902 /* Will matrix be re-allocated? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1903 if (x != w->desired_matrix->matrix_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1904 || y != w->desired_matrix->matrix_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1905 || dim.width != w->desired_matrix->matrix_w
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1906 || dim.height != w->desired_matrix->matrix_h
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1907 || (margin_glyphs_to_reserve (w, dim.width,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1908 w->right_margin_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1909 != w->desired_matrix->left_margin_glyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1910 || (margin_glyphs_to_reserve (w, dim.width,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1911 w->left_margin_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1912 != w->desired_matrix->right_margin_glyphs))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1913 *window_change_flags |= CHANGED_LEAF_MATRIX;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1914
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1915 /* Actually change matrices, if allowed. Do not consider
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1916 CHANGED_LEAF_MATRIX computed above here because the pool
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1917 may have been changed which we don't now here. We trust
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1918 that we only will be called with DIM_ONLY_P != 0 when
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1919 necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1920 if (!dim_only_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1921 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1922 adjust_glyph_matrix (w, w->desired_matrix, x, y, dim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1923 adjust_glyph_matrix (w, w->current_matrix, x, y, dim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1924 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1925 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1926
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1927 /* If we are part of a horizontal combination, advance x for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1928 windows to the right of W; otherwise advance y for windows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1929 below W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1930 if (in_horz_combination_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1931 x += dim.width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1932 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1933 y += dim.height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1934
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1935 /* Remember maximum glyph matrix dimensions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1936 wmax = max (wmax, dim.width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1937 hmax = max (hmax, dim.height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1938
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1939 /* Next window on same level. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1940 window = w->next;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1941 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1942 while (!NILP (window));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1943
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1944 /* Set `total' to the total glyph matrix dimension of this window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1945 level. In a vertical combination, the width is the width of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1946 widest window; the height is the y we finally reached, corrected
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1947 by the y we started with. In a horizontal combination, the total
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1948 height is the height of the tallest window, and the width is the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1949 x we finally reached, corrected by the x we started with. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1950 if (in_horz_combination_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1951 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1952 total.width = x - x0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1953 total.height = hmax;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1954 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1955 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1956 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1957 total.width = wmax;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1958 total.height = y - y0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1959 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1960
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1961 return total;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1962 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1963
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1964
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1965 /* Return the required height of glyph matrices for window W. */
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1966
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1967 int
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1968 required_matrix_height (w)
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1969 struct window *w;
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1970 {
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1971 #ifdef HAVE_WINDOW_SYSTEM
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1972 struct frame *f = XFRAME (w->frame);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1973
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1974 if (FRAME_WINDOW_P (f))
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1975 {
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1976 int ch_height = FRAME_SMALLEST_FONT_HEIGHT (f);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1977 int window_pixel_height = window_box_height (w) + abs (w->vscroll);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1978 return (((window_pixel_height + ch_height - 1)
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1979 / ch_height)
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1980 /* One partially visible line at the top and
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1981 bottom of the window. */
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1982 + 2
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
1983 /* 2 for header and mode line. */
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1984 + 2);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1985 }
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1986 #endif /* HAVE_WINDOW_SYSTEM */
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1987
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1988 return XINT (w->height);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1989 }
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1990
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1991
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1992 /* Return the required width of glyph matrices for window W. */
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1993
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1994 int
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1995 required_matrix_width (w)
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1996 struct window *w;
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1997 {
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1998 #ifdef HAVE_WINDOW_SYSTEM
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1999 struct frame *f = XFRAME (w->frame);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2000 if (FRAME_WINDOW_P (f))
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2001 {
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2002 int ch_width = FRAME_SMALLEST_CHAR_WIDTH (f);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2003 int window_pixel_width = XFLOATINT (w->width) * CANON_X_UNIT (f);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2004
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2005 /* Compute number of glyphs needed in a glyph row. */
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2006 return (((window_pixel_width + ch_width - 1)
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2007 / ch_width)
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2008 /* 2 partially visible columns in the text area. */
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2009 + 2
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2010 /* One partially visible column at the right
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2011 edge of each marginal area. */
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2012 + 1 + 1);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2013 }
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2014 #endif /* HAVE_WINDOW_SYSTEM */
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2015
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2016 return XINT (w->width);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2017 }
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2018
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2019
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2020 /* Allocate window matrices for window-based redisplay. W is the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2021 window whose matrices must be allocated/reallocated. CH_DIM is the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2022 size of the smallest character that could potentially be used on W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2023
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2024 static void
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2025 allocate_matrices_for_window_redisplay (w)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2026 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2027 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2028 while (w)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2029 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2030 if (!NILP (w->vchild))
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2031 allocate_matrices_for_window_redisplay (XWINDOW (w->vchild));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2032 else if (!NILP (w->hchild))
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2033 allocate_matrices_for_window_redisplay (XWINDOW (w->hchild));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2034 else
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2035 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2036 /* W is a leaf window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2037 struct dim dim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2038
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2039 /* If matrices are not yet allocated, allocate them now. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2040 if (w->desired_matrix == NULL)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2041 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2042 w->desired_matrix = new_glyph_matrix (NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2043 w->current_matrix = new_glyph_matrix (NULL);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2044 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2045
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2046 dim.width = required_matrix_width (w);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2047 dim.height = required_matrix_height (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2048 adjust_glyph_matrix (w, w->desired_matrix, 0, 0, dim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2049 adjust_glyph_matrix (w, w->current_matrix, 0, 0, dim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2050 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2051
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2052 w = NILP (w->next) ? NULL : XWINDOW (w->next);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2053 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2054 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2055
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2056
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2057 /* Re-allocate/ re-compute glyph matrices on frame F. If F is null,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2058 do it for all frames; otherwise do it just for the given frame.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2059 This function must be called when a new frame is created, its size
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2060 changes, or its window configuration changes. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2061
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2062 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2063 adjust_glyphs (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2064 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2065 {
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
2066 /* Block input so that expose events and other events that access
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
2067 glyph matrices are not processed while we are changing them. */
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
2068 BLOCK_INPUT;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
2069
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2070 if (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2071 adjust_frame_glyphs (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2072 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2073 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2074 Lisp_Object tail, lisp_frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2075
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2076 FOR_EACH_FRAME (tail, lisp_frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2077 adjust_frame_glyphs (XFRAME (lisp_frame));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2078 }
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
2079
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
2080 UNBLOCK_INPUT;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2081 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2082
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2083
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2084 /* Adjust frame glyphs when Emacs is initialized.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2085
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2086 To be called from init_display.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2087
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2088 We need a glyph matrix because redraw will happen soon.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2089 Unfortunately, window sizes on selected_frame are not yet set to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2090 meaningful values. I believe we can assume that there are only two
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2091 windows on the frame---the mini-buffer and the root window. Frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2092 height and width seem to be correct so far. So, set the sizes of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2093 windows to estimated values. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2094
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2095 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2096 adjust_frame_glyphs_initially ()
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2097 {
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
2098 struct frame *sf = SELECTED_FRAME ();
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
2099 struct window *root = XWINDOW (sf->root_window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2100 struct window *mini = XWINDOW (root->next);
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
2101 int frame_height = FRAME_HEIGHT (sf);
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
2102 int frame_width = FRAME_WIDTH (sf);
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
2103 int top_margin = FRAME_TOP_MARGIN (sf);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2104
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2105 /* Do it for the root window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2106 XSETFASTINT (root->top, top_margin);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2107 XSETFASTINT (root->width, frame_width);
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
2108 set_window_height (sf->root_window, frame_height - 1 - top_margin, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2109
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2110 /* Do it for the mini-buffer window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2111 XSETFASTINT (mini->top, frame_height - 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2112 XSETFASTINT (mini->width, frame_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2113 set_window_height (root->next, 1, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2114
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
2115 adjust_frame_glyphs (sf);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2116 glyphs_initialized_initially_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2117 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2118
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2119
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2120 /* Allocate/reallocate glyph matrices of a single frame F. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2121
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2122 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2123 adjust_frame_glyphs (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2124 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2125 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2126 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2127 adjust_frame_glyphs_for_window_redisplay (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2128 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2129 adjust_frame_glyphs_for_frame_redisplay (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2130
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2131 /* Don't forget the message buffer and the buffer for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2132 decode_mode_spec. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2133 adjust_frame_message_buffer (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2134 adjust_decode_mode_spec_buffer (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2135
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2136 f->glyphs_initialized_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2137 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2138
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2139
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2140 /* In the window tree with root W, build current matrices of leaf
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2141 windows from the frame's current matrix. */
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2142
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2143 static void
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2144 fake_current_matrices (window)
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2145 Lisp_Object window;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2146 {
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2147 struct window *w;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2148
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2149 for (; !NILP (window); window = w->next)
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2150 {
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2151 w = XWINDOW (window);
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2152
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2153 if (!NILP (w->hchild))
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2154 fake_current_matrices (w->hchild);
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2155 else if (!NILP (w->vchild))
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2156 fake_current_matrices (w->vchild);
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2157 else
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2158 {
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2159 int i;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2160 struct frame *f = XFRAME (w->frame);
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2161 struct glyph_matrix *m = w->current_matrix;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2162 struct glyph_matrix *fm = f->current_matrix;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2163
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2164 xassert (m->matrix_h == XFASTINT (w->height));
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2165 xassert (m->matrix_w == XFASTINT (w->width));
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2166
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2167 for (i = 0; i < m->matrix_h; ++i)
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2168 {
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2169 struct glyph_row *r = m->rows + i;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2170 struct glyph_row *fr = fm->rows + i + XFASTINT (w->top);
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2171
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2172 xassert (r->glyphs[TEXT_AREA] >= fr->glyphs[TEXT_AREA]
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2173 && r->glyphs[LAST_AREA] <= fr->glyphs[LAST_AREA]);
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2174
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2175 r->enabled_p = fr->enabled_p;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2176 if (r->enabled_p)
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2177 {
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2178 r->used[LEFT_MARGIN_AREA] = m->left_margin_glyphs;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2179 r->used[RIGHT_MARGIN_AREA] = m->right_margin_glyphs;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2180 r->used[TEXT_AREA] = (m->matrix_w
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2181 - r->used[LEFT_MARGIN_AREA]
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2182 - r->used[RIGHT_MARGIN_AREA]);
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2183 r->mode_line_p = 0;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2184 }
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2185 }
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2186 }
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2187 }
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2188 }
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2189
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2190
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2191 /* Save away the contents of frame F's current frame matrix. Value is
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
2192 a glyph matrix holding the contents of F's current frame matrix. */
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2193
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2194 static struct glyph_matrix *
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2195 save_current_matrix (f)
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2196 struct frame *f;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2197 {
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2198 int i;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2199 struct glyph_matrix *saved;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2200
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2201 saved = (struct glyph_matrix *) xmalloc (sizeof *saved);
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2202 bzero (saved, sizeof *saved);
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2203 saved->nrows = f->current_matrix->nrows;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2204 saved->rows = (struct glyph_row *) xmalloc (saved->nrows
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2205 * sizeof *saved->rows);
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2206 bzero (saved->rows, saved->nrows * sizeof *saved->rows);
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2207
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2208 for (i = 0; i < saved->nrows; ++i)
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2209 {
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2210 struct glyph_row *from = f->current_matrix->rows + i;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2211 struct glyph_row *to = saved->rows + i;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2212 size_t nbytes = from->used[TEXT_AREA] * sizeof (struct glyph);
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2213 to->glyphs[TEXT_AREA] = (struct glyph *) xmalloc (nbytes);
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2214 bcopy (from->glyphs[TEXT_AREA], to->glyphs[TEXT_AREA], nbytes);
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2215 to->used[TEXT_AREA] = from->used[TEXT_AREA];
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2216 }
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2217
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2218 return saved;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2219 }
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2220
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2221
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2222 /* Restore the contents of frame F's current frame matrix from SAVED,
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2223 and free memory associated with SAVED. */
34849
eac70be4cb58 (save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34788
diff changeset
2224
eac70be4cb58 (save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34788
diff changeset
2225 static void
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2226 restore_current_matrix (f, saved)
34849
eac70be4cb58 (save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34788
diff changeset
2227 struct frame *f;
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2228 struct glyph_matrix *saved;
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2229 {
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2230 int i;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2231
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2232 for (i = 0; i < saved->nrows; ++i)
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2233 {
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2234 struct glyph_row *from = saved->rows + i;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2235 struct glyph_row *to = f->current_matrix->rows + i;
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2236 size_t nbytes = from->used[TEXT_AREA] * sizeof (struct glyph);
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2237 bcopy (from->glyphs[TEXT_AREA], to->glyphs[TEXT_AREA], nbytes);
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2238 to->used[TEXT_AREA] = from->used[TEXT_AREA];
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2239 xfree (from->glyphs[TEXT_AREA]);
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2240 }
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2241
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2242 xfree (saved->rows);
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2243 xfree (saved);
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2244 }
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2245
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2246
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2247
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2248 /* Allocate/reallocate glyph matrices of a single frame F for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2249 frame-based redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2250
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2251 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2252 adjust_frame_glyphs_for_frame_redisplay (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2253 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2254 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2255 struct dim ch_dim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2256 struct dim matrix_dim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2257 int pool_changed_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2258 int window_change_flags;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2259 int top_window_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2260
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2261 if (!FRAME_LIVE_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2262 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2263
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2264 /* Determine the smallest character in any font for F. On
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2265 console windows, all characters have dimension (1, 1). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2266 ch_dim.width = ch_dim.height = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2267
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2268 top_window_y = FRAME_TOP_MARGIN (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2269
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2270 /* Allocate glyph pool structures if not already done. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2271 if (f->desired_pool == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2272 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2273 f->desired_pool = new_glyph_pool ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2274 f->current_pool = new_glyph_pool ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2275 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2276
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2277 /* Allocate frames matrix structures if needed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2278 if (f->desired_matrix == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2279 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2280 f->desired_matrix = new_glyph_matrix (f->desired_pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2281 f->current_matrix = new_glyph_matrix (f->current_pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2282 }
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2283
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2284 /* Compute window glyph matrices. (This takes the mini-buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2285 window into account). The result is the size of the frame glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2286 matrix needed. The variable window_change_flags is set to a bit
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2287 mask indicating whether new matrices will be allocated or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2288 existing matrices change their size or location within the frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2289 matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2290 window_change_flags = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2291 matrix_dim
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2292 = allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2293 0, top_window_y,
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2294 1,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2295 &window_change_flags);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2296
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2297 /* Add in menu bar lines, if any. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2298 matrix_dim.height += top_window_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2299
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2300 /* Enlarge pools as necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2301 pool_changed_p = realloc_glyph_pool (f->desired_pool, matrix_dim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2302 realloc_glyph_pool (f->current_pool, matrix_dim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2303
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2304 /* Set up glyph pointers within window matrices. Do this only if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2305 absolutely necessary since it requires a frame redraw. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2306 if (pool_changed_p || window_change_flags)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2307 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2308 /* Do it for window matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2309 allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f),
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2310 0, top_window_y, 0,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2311 &window_change_flags);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2312
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2313 /* Size of frame matrices must equal size of frame. Note
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2314 that we are called for X frames with window widths NOT equal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2315 to the frame width (from CHANGE_FRAME_SIZE_1). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2316 xassert (matrix_dim.width == FRAME_WIDTH (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2317 && matrix_dim.height == FRAME_HEIGHT (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2318
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2319 /* Pointers to glyph memory in glyph rows are exchanged during
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2320 the update phase of redisplay, which means in general that a
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2321 frame's current matrix consists of pointers into both the
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2322 desired and current glyph pool of the frame. Adjusting a
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2323 matrix sets the frame matrix up so that pointers are all into
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2324 the same pool. If we want to preserve glyph contents of the
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2325 current matrix over a call to adjust_glyph_matrix, we must
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2326 make a copy of the current glyphs, and restore the current
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2327 matrix' contents from that copy. */
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2328 if (display_completed
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2329 && !FRAME_GARBAGED_P (f)
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2330 && matrix_dim.width == f->current_matrix->matrix_w
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2331 && matrix_dim.height == f->current_matrix->matrix_h)
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2332 {
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2333 struct glyph_matrix *copy = save_current_matrix (f);
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2334 adjust_glyph_matrix (NULL, f->desired_matrix, 0, 0, matrix_dim);
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2335 adjust_glyph_matrix (NULL, f->current_matrix, 0, 0, matrix_dim);
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2336 restore_current_matrix (f, copy);
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2337 fake_current_matrices (FRAME_ROOT_WINDOW (f));
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2338 }
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2339 else
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2340 {
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2341 adjust_glyph_matrix (NULL, f->desired_matrix, 0, 0, matrix_dim);
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2342 adjust_glyph_matrix (NULL, f->current_matrix, 0, 0, matrix_dim);
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2343 SET_FRAME_GARBAGED (f);
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2344 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2345 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2346 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2347
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2348
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2349 /* Allocate/reallocate glyph matrices of a single frame F for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2350 window-based redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2351
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2352 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2353 adjust_frame_glyphs_for_window_redisplay (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2354 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2355 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2356 struct dim ch_dim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2357 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2358
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2359 xassert (FRAME_WINDOW_P (f) && FRAME_LIVE_P (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2360
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2361 /* Get minimum sizes. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2362 #ifdef HAVE_WINDOW_SYSTEM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2363 ch_dim.width = FRAME_SMALLEST_CHAR_WIDTH (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2364 ch_dim.height = FRAME_SMALLEST_FONT_HEIGHT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2365 #else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2366 ch_dim.width = ch_dim.height = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2367 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2368
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2369 /* Allocate/reallocate window matrices. */
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2370 allocate_matrices_for_window_redisplay (XWINDOW (FRAME_ROOT_WINDOW (f)));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2371
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2372 /* Allocate/ reallocate matrices of the dummy window used to display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2373 the menu bar under X when no X toolkit support is available. */
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 46551
diff changeset
2374 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2375 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2376 /* Allocate a dummy window if not already done. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2377 if (NILP (f->menu_bar_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2378 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2379 f->menu_bar_window = make_window ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2380 w = XWINDOW (f->menu_bar_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2381 XSETFRAME (w->frame, f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2382 w->pseudo_window_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2383 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2384 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2385 w = XWINDOW (f->menu_bar_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2386
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2387 /* Set window dimensions to frame dimensions and allocate or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2388 adjust glyph matrices of W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2389 XSETFASTINT (w->top, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2390 XSETFASTINT (w->left, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2391 XSETFASTINT (w->height, FRAME_MENU_BAR_LINES (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2392 XSETFASTINT (w->width, FRAME_WINDOW_WIDTH (f));
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2393 allocate_matrices_for_window_redisplay (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2394 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2395 #endif /* not USE_X_TOOLKIT */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2396
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 46551
diff changeset
2397 #ifndef USE_GTK
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2398 /* Allocate/ reallocate matrices of the tool bar window. If we
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2399 don't have a tool bar window yet, make one. */
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2400 if (NILP (f->tool_bar_window))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2401 {
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2402 f->tool_bar_window = make_window ();
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2403 w = XWINDOW (f->tool_bar_window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2404 XSETFRAME (w->frame, f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2405 w->pseudo_window_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2406 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2407 else
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2408 w = XWINDOW (f->tool_bar_window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2409
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2410 XSETFASTINT (w->top, FRAME_MENU_BAR_LINES (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2411 XSETFASTINT (w->left, 0);
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2412 XSETFASTINT (w->height, FRAME_TOOL_BAR_LINES (f));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2413 XSETFASTINT (w->width, FRAME_WINDOW_WIDTH (f));
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2414 allocate_matrices_for_window_redisplay (w);
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 46551
diff changeset
2415 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2416 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2417
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2418
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2419 /* Adjust/ allocate message buffer of frame F.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2420
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2421 Note that the message buffer is never freed. Since I could not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2422 find a free in 19.34, I assume that freeing it would be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2423 problematic in some way and don't do it either.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2424
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2425 (Implementation note: It should be checked if we can free it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2426 eventually without causing trouble). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2427
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2428 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2429 adjust_frame_message_buffer (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2430 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2431 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2432 int size = FRAME_MESSAGE_BUF_SIZE (f) + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2433
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2434 if (FRAME_MESSAGE_BUF (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2435 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2436 char *buffer = FRAME_MESSAGE_BUF (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2437 char *new_buffer = (char *) xrealloc (buffer, size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2438 FRAME_MESSAGE_BUF (f) = new_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2439 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2440 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2441 FRAME_MESSAGE_BUF (f) = (char *) xmalloc (size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2442 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2443
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2444
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2445 /* Re-allocate buffer for decode_mode_spec on frame F. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2446
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2447 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2448 adjust_decode_mode_spec_buffer (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2449 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2450 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2451 f->decode_mode_spec_buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2452 = (char *) xrealloc (f->decode_mode_spec_buffer,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2453 FRAME_MESSAGE_BUF_SIZE (f) + 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2454 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2455
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2456
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2457
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2458 /**********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2459 Freeing Glyph Matrices
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2460 **********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2461
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2462 /* Free glyph memory for a frame F. F may be null. This function can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2463 be called for the same frame more than once. The root window of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2464 F may be nil when this function is called. This is the case when
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2465 the function is called when F is destroyed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2466
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2467 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2468 free_glyphs (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2469 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2470 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2471 if (f && f->glyphs_initialized_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2472 {
27968
7634011b93f3 (free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 27855
diff changeset
2473 /* Block interrupt input so that we don't get surprised by an X
7634011b93f3 (free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 27855
diff changeset
2474 event while we're in an inconsistent state. */
7634011b93f3 (free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 27855
diff changeset
2475 BLOCK_INPUT;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2476 f->glyphs_initialized_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2477
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2478 /* Release window sub-matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2479 if (!NILP (f->root_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2480 free_window_matrices (XWINDOW (f->root_window));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2481
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2482 /* Free the dummy window for menu bars without X toolkit and its
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2483 glyph matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2484 if (!NILP (f->menu_bar_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2485 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2486 struct window *w = XWINDOW (f->menu_bar_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2487 free_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2488 free_glyph_matrix (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2489 w->desired_matrix = w->current_matrix = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2490 f->menu_bar_window = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2491 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2492
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2493 /* Free the tool bar window and its glyph matrices. */
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2494 if (!NILP (f->tool_bar_window))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2495 {
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2496 struct window *w = XWINDOW (f->tool_bar_window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2497 free_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2498 free_glyph_matrix (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2499 w->desired_matrix = w->current_matrix = NULL;
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2500 f->tool_bar_window = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2501 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2502
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2503 /* Release frame glyph matrices. Reset fields to zero in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2504 case we are called a second time. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2505 if (f->desired_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2506 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2507 free_glyph_matrix (f->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2508 free_glyph_matrix (f->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2509 f->desired_matrix = f->current_matrix = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2510 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2511
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2512 /* Release glyph pools. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2513 if (f->desired_pool)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2514 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2515 free_glyph_pool (f->desired_pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2516 free_glyph_pool (f->current_pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2517 f->desired_pool = f->current_pool = NULL;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2518 }
27968
7634011b93f3 (free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 27855
diff changeset
2519
7634011b93f3 (free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 27855
diff changeset
2520 UNBLOCK_INPUT;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2521 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2522 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2523
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2524
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2525 /* Free glyph sub-matrices in the window tree rooted at W. This
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2526 function may be called with a null pointer, and it may be called on
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2527 the same tree more than once. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2528
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2529 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2530 free_window_matrices (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2531 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2532 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2533 while (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2534 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2535 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2536 free_window_matrices (XWINDOW (w->hchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2537 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2538 free_window_matrices (XWINDOW (w->vchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2539 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2540 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2541 /* This is a leaf window. Free its memory and reset fields
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2542 to zero in case this function is called a second time for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2543 W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2544 free_glyph_matrix (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2545 free_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2546 w->current_matrix = w->desired_matrix = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2547 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2548
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2549 /* Next window on same level. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2550 w = NILP (w->next) ? 0 : XWINDOW (w->next);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2551 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2552 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2553
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2554
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2555 /* Check glyph memory leaks. This function is called from
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2556 shut_down_emacs. Note that frames are not destroyed when Emacs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2557 exits. We therefore free all glyph memory for all active frames
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2558 explicitly and check that nothing is left allocated. */
6620
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2559
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2560 void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2561 check_glyph_memory ()
6620
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2562 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2563 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2564
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2565 /* Free glyph memory for all frames. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2566 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2567 free_glyphs (XFRAME (frame));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2568
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2569 /* Check that nothing is left allocated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2570 if (glyph_matrix_count)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2571 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2572 if (glyph_pool_count)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2573 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2574 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2575
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2576
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2577
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2578 /**********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2579 Building a Frame Matrix
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2580 **********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2581
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2582 /* Most of the redisplay code works on glyph matrices attached to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2583 windows. This is a good solution most of the time, but it is not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2584 suitable for terminal code. Terminal output functions cannot rely
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2585 on being able to set an arbitrary terminal window. Instead they
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2586 must be provided with a view of the whole frame, i.e. the whole
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2587 screen. We build such a view by constructing a frame matrix from
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2588 window matrices in this section.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2589
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2590 Windows that must be updated have their must_be_update_p flag set.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2591 For all such windows, their desired matrix is made part of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2592 desired frame matrix. For other windows, their current matrix is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2593 made part of the desired frame matrix.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2594
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2595 +-----------------+----------------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2596 | desired | desired |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2597 | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2598 +-----------------+----------------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2599 | current |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2600 | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2601 +----------------------------------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2602
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2603 Desired window matrices can be made part of the frame matrix in a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2604 cheap way: We exploit the fact that the desired frame matrix and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2605 desired window matrices share their glyph memory. This is not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2606 possible for current window matrices. Their glyphs are copied to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2607 the desired frame matrix. The latter is equivalent to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2608 preserve_other_columns in the old redisplay.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2609
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2610 Used glyphs counters for frame matrix rows are the result of adding
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2611 up glyph lengths of the window matrices. A line in the frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2612 matrix is enabled, if a corresponding line in a window matrix is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2613 enabled.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2614
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2615 After building the desired frame matrix, it will be passed to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2616 terminal code, which will manipulate both the desired and current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2617 frame matrix. Changes applied to the frame's current matrix have
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2618 to be visible in current window matrices afterwards, of course.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2619
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2620 This problem is solved like this:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2621
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2622 1. Window and frame matrices share glyphs. Window matrices are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2623 constructed in a way that their glyph contents ARE the glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2624 contents needed in a frame matrix. Thus, any modification of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2625 glyphs done in terminal code will be reflected in window matrices
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2626 automatically.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2627
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2628 2. Exchanges of rows in a frame matrix done by terminal code are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2629 intercepted by hook functions so that corresponding row operations
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2630 on window matrices can be performed. This is necessary because we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2631 use pointers to glyphs in glyph row structures. To satisfy the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2632 assumption of point 1 above that glyphs are updated implicitly in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2633 window matrices when they are manipulated via the frame matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2634 window and frame matrix must of course agree where to find the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2635 glyphs for their rows. Possible manipulations that must be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2636 mirrored are assignments of rows of the desired frame matrix to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2637 current frame matrix and scrolling the current frame matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2638
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2639 /* Build frame F's desired matrix from window matrices. Only windows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2640 which have the flag must_be_updated_p set have to be updated. Menu
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2641 bar lines of a frame are not covered by window matrices, so make
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2642 sure not to touch them in this function. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2643
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2644 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2645 build_frame_matrix (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2646 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2647 {
6620
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2648 int i;
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2649
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2650 /* F must have a frame matrix when this function is called. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2651 xassert (!FRAME_WINDOW_P (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2652
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2653 /* Clear all rows in the frame matrix covered by window matrices.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2654 Menu bar lines are not covered by windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2655 for (i = FRAME_TOP_MARGIN (f); i < f->desired_matrix->nrows; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2656 clear_glyph_row (MATRIX_ROW (f->desired_matrix, i));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2657
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2658 /* Build the matrix by walking the window tree. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2659 build_frame_matrix_from_window_tree (f->desired_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2660 XWINDOW (FRAME_ROOT_WINDOW (f)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2661 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2662
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2663
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2664 /* Walk a window tree, building a frame matrix MATRIX from window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2665 matrices. W is the root of a window tree. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2666
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2667 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2668 build_frame_matrix_from_window_tree (matrix, w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2669 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2670 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2671 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2672 while (w)
6620
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2673 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2674 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2675 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->hchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2676 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2677 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->vchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2678 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2679 build_frame_matrix_from_leaf_window (matrix, w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2680
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2681 w = NILP (w->next) ? 0 : XWINDOW (w->next);
6620
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2682 }
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2683 }
6642
2fda5dd17356 (verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6627
diff changeset
2684
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2685
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2686 /* Add a window's matrix to a frame matrix. FRAME_MATRIX is the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2687 desired frame matrix built. W is a leaf window whose desired or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2688 current matrix is to be added to FRAME_MATRIX. W's flag
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2689 must_be_updated_p determines which matrix it contributes to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2690 FRAME_MATRIX. If must_be_updated_p is non-zero, W's desired matrix
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2691 is added to FRAME_MATRIX, otherwise W's current matrix is added.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2692 Adding a desired matrix means setting up used counters and such in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2693 frame rows, while adding a current window matrix to FRAME_MATRIX
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2694 means copying glyphs. The latter case corresponds to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2695 preserve_other_columns in the old redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2696
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2697 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2698 build_frame_matrix_from_leaf_window (frame_matrix, w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2699 struct glyph_matrix *frame_matrix;
6642
2fda5dd17356 (verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6627
diff changeset
2700 struct window *w;
2fda5dd17356 (verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6627
diff changeset
2701 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2702 struct glyph_matrix *window_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2703 int window_y, frame_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2704 /* If non-zero, a glyph to insert at the right border of W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2705 GLYPH right_border_glyph = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2706
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2707 /* Set window_matrix to the matrix we have to add to FRAME_MATRIX. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2708 if (w->must_be_updated_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2709 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2710 window_matrix = w->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2711
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2712 /* Decide whether we want to add a vertical border glyph. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2713 if (!WINDOW_RIGHTMOST_P (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2714 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2715 struct Lisp_Char_Table *dp = window_display_table (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2716 right_border_glyph = (dp && INTEGERP (DISP_BORDER_GLYPH (dp))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2717 ? XINT (DISP_BORDER_GLYPH (dp))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2718 : '|');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2719 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2720 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2721 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2722 window_matrix = w->current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2723
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2724 /* For all rows in the window matrix and corresponding rows in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2725 frame matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2726 window_y = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2727 frame_y = window_matrix->matrix_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2728 while (window_y < window_matrix->nrows)
6642
2fda5dd17356 (verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6627
diff changeset
2729 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2730 struct glyph_row *frame_row = frame_matrix->rows + frame_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2731 struct glyph_row *window_row = window_matrix->rows + window_y;
31271
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2732 int current_row_p = window_matrix == w->current_matrix;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2733
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2734 /* Fill up the frame row with spaces up to the left margin of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2735 window row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2736 fill_up_frame_row_with_spaces (frame_row, window_matrix->matrix_x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2737
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2738 /* Fill up areas in the window matrix row with spaces. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2739 fill_up_glyph_row_with_spaces (window_row);
31271
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2740
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2741 /* If only part of W's desired matrix has been built, and
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2742 window_row wasn't displayed, use the corresponding current
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2743 row instead. */
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2744 if (window_matrix == w->desired_matrix
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2745 && !window_row->enabled_p)
6682
16ab14205588 (verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents: 6648
diff changeset
2746 {
31271
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2747 window_row = w->current_matrix->rows + window_y;
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2748 current_row_p = 1;
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2749 }
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2750
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2751 if (current_row_p)
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2752 {
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2753 /* Copy window row to frame row. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2754 bcopy (window_row->glyphs[0],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2755 frame_row->glyphs[TEXT_AREA] + window_matrix->matrix_x,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2756 window_matrix->matrix_w * sizeof (struct glyph));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2757 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2758 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2759 {
31271
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2760 xassert (window_row->enabled_p);
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2761
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2762 /* Only when a desired row has been displayed, we want
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2763 the corresponding frame row to be updated. */
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2764 frame_row->enabled_p = 1;
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2765
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2766 /* Maybe insert a vertical border between horizontally adjacent
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2767 windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2768 if (right_border_glyph)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2769 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2770 struct glyph *border = window_row->glyphs[LAST_AREA] - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2771 SET_CHAR_GLYPH_FROM_GLYPH (*border, right_border_glyph);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2772 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2773
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
2774 /* Window row window_y must be a slice of frame row
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
2775 frame_y. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2776 xassert (glyph_row_slice_p (window_row, frame_row));
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
2777
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2778 /* If rows are in sync, we don't have to copy glyphs because
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2779 frame and window share glyphs. */
25241
35674d7c4136 (mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents: 25190
diff changeset
2780
35674d7c4136 (mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents: 25190
diff changeset
2781 #if GLYPH_DEBUG
35674d7c4136 (mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents: 25190
diff changeset
2782 strcpy (w->current_matrix->method, w->desired_matrix->method);
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
2783 add_window_display_history (w, w->current_matrix->method, 0);
25241
35674d7c4136 (mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents: 25190
diff changeset
2784 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2785 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2786
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2787 /* Set number of used glyphs in the frame matrix. Since we fill
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2788 up with spaces, and visit leaf windows from left to right it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2789 can be done simply. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2790 frame_row->used[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2791 = window_matrix->matrix_x + window_matrix->matrix_w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2792
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2793 /* Next row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2794 ++window_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2795 ++frame_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2796 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2797 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2798
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2799
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2800 /* Add spaces to a glyph row ROW in a window matrix.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2801
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2802 Each row has the form:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2803
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2804 +---------+-----------------------------+------------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2805 | left | text | right |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2806 +---------+-----------------------------+------------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2807
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2808 Left and right marginal areas are optional. This function adds
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2809 spaces to areas so that there are no empty holes between areas.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2810 In other words: If the right area is not empty, the text area
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2811 is filled up with spaces up to the right area. If the text area
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2812 is not empty, the left area is filled up.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2813
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2814 To be called for frame-based redisplay, only. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2815
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2816 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2817 fill_up_glyph_row_with_spaces (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2818 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2819 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2820 fill_up_glyph_row_area_with_spaces (row, LEFT_MARGIN_AREA);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2821 fill_up_glyph_row_area_with_spaces (row, TEXT_AREA);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2822 fill_up_glyph_row_area_with_spaces (row, RIGHT_MARGIN_AREA);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2823 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2824
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2825
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2826 /* Fill area AREA of glyph row ROW with spaces. To be called for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2827 frame-based redisplay only. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2828
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2829 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2830 fill_up_glyph_row_area_with_spaces (row, area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2831 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2832 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2833 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2834 if (row->glyphs[area] < row->glyphs[area + 1])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2835 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2836 struct glyph *end = row->glyphs[area + 1];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2837 struct glyph *text = row->glyphs[area] + row->used[area];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2838
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2839 while (text < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2840 *text++ = space_glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2841 row->used[area] = text - row->glyphs[area];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2842 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2843 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2844
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2845
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2846 /* Add spaces to the end of ROW in a frame matrix until index UPTO is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2847 reached. In frame matrices only one area, TEXT_AREA, is used. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2848
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2849 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2850 fill_up_frame_row_with_spaces (row, upto)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2851 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2852 int upto;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2853 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2854 int i = row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2855 struct glyph *glyph = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2856
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2857 while (i < upto)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2858 glyph[i++] = space_glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2859
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2860 row->used[TEXT_AREA] = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2861 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2862
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2863
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2864
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2865 /**********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2866 Mirroring operations on frame matrices in window matrices
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2867 **********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2868
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2869 /* Set frame being updated via frame-based redisplay to F. This
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2870 function must be called before updates to make explicit that we are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2871 working on frame matrices or not. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2872
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2873 static INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2874 set_frame_matrix_frame (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2875 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2876 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2877 frame_matrix_frame = f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2878 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2879
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2880
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2881 /* Make sure glyph row ROW in CURRENT_MATRIX is up to date.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2882 DESIRED_MATRIX is the desired matrix corresponding to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2883 CURRENT_MATRIX. The update is done by exchanging glyph pointers
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2884 between rows in CURRENT_MATRIX and DESIRED_MATRIX. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2885 frame_matrix_frame is non-null, this indicates that the exchange is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2886 done in frame matrices, and that we have to perform analogous
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2887 operations in window matrices of frame_matrix_frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2888
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2889 static INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2890 make_current (desired_matrix, current_matrix, row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2891 struct glyph_matrix *desired_matrix, *current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2892 int row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2893 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2894 struct glyph_row *current_row = MATRIX_ROW (current_matrix, row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2895 struct glyph_row *desired_row = MATRIX_ROW (desired_matrix, row);
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
2896 int mouse_face_p = current_row->mouse_face_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2897
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2898 /* Do current_row = desired_row. This exchanges glyph pointers
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2899 between both rows, and does a structure assignment otherwise. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2900 assign_row (current_row, desired_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2901
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2902 /* Enable current_row to mark it as valid. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2903 current_row->enabled_p = 1;
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
2904 current_row->mouse_face_p = mouse_face_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2905
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2906 /* If we are called on frame matrices, perform analogous operations
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2907 for window matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2908 if (frame_matrix_frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2909 mirror_make_current (XWINDOW (frame_matrix_frame->root_window), row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2910 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2911
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2912
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2913 /* W is the root of a window tree. FRAME_ROW is the index of a row in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2914 W's frame which has been made current (by swapping pointers between
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2915 current and desired matrix). Perform analogous operations in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2916 matrices of leaf windows in the window tree rooted at W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2917
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2918 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2919 mirror_make_current (w, frame_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2920 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2921 int frame_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2922 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2923 while (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2924 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2925 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2926 mirror_make_current (XWINDOW (w->hchild), frame_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2927 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2928 mirror_make_current (XWINDOW (w->vchild), frame_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2929 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2930 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2931 /* Row relative to window W. Don't use FRAME_TO_WINDOW_VPOS
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2932 here because the checks performed in debug mode there
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2933 will not allow the conversion. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2934 int row = frame_row - w->desired_matrix->matrix_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2935
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2936 /* If FRAME_ROW is within W, assign the desired row to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2937 current row (exchanging glyph pointers). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2938 if (row >= 0 && row < w->desired_matrix->matrix_h)
6682
16ab14205588 (verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents: 6648
diff changeset
2939 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2940 struct glyph_row *current_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2941 = MATRIX_ROW (w->current_matrix, row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2942 struct glyph_row *desired_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2943 = MATRIX_ROW (w->desired_matrix, row);
25241
35674d7c4136 (mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents: 25190
diff changeset
2944
35674d7c4136 (mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents: 25190
diff changeset
2945 if (desired_row->enabled_p)
35674d7c4136 (mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents: 25190
diff changeset
2946 assign_row (current_row, desired_row);
35674d7c4136 (mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents: 25190
diff changeset
2947 else
35674d7c4136 (mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents: 25190
diff changeset
2948 swap_glyph_pointers (desired_row, current_row);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2949 current_row->enabled_p = 1;
6682
16ab14205588 (verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents: 6648
diff changeset
2950 }
16ab14205588 (verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents: 6648
diff changeset
2951 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2952
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2953 w = NILP (w->next) ? 0 : XWINDOW (w->next);
6642
2fda5dd17356 (verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6627
diff changeset
2954 }
2fda5dd17356 (verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6627
diff changeset
2955 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2956
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2957
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2958 /* Perform row dance after scrolling. We are working on the range of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2959 lines UNCHANGED_AT_TOP + 1 to UNCHANGED_AT_TOP + NLINES (not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2960 including) in MATRIX. COPY_FROM is a vector containing, for each
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2961 row I in the range 0 <= I < NLINES, the index of the original line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2962 to move to I. This index is relative to the row range, i.e. 0 <=
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2963 index < NLINES. RETAINED_P is a vector containing zero for each
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2964 row 0 <= I < NLINES which is empty.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2965
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2966 This function is called from do_scrolling and do_direct_scrolling. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2967
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2968 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2969 mirrored_line_dance (matrix, unchanged_at_top, nlines, copy_from,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2970 retained_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2971 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2972 int unchanged_at_top, nlines;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2973 int *copy_from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2974 char *retained_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2975 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2976 /* A copy of original rows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2977 struct glyph_row *old_rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2978
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2979 /* Rows to assign to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2980 struct glyph_row *new_rows = MATRIX_ROW (matrix, unchanged_at_top);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2981
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2982 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2983
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2984 /* Make a copy of the original rows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2985 old_rows = (struct glyph_row *) alloca (nlines * sizeof *old_rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2986 bcopy (new_rows, old_rows, nlines * sizeof *old_rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2987
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2988 /* Assign new rows, maybe clear lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2989 for (i = 0; i < nlines; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2990 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2991 int enabled_before_p = new_rows[i].enabled_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2992
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2993 xassert (i + unchanged_at_top < matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2994 xassert (unchanged_at_top + copy_from[i] < matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2995 new_rows[i] = old_rows[copy_from[i]];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2996 new_rows[i].enabled_p = enabled_before_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2997
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2998 /* RETAINED_P is zero for empty lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2999 if (!retained_p[copy_from[i]])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3000 new_rows[i].enabled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3001 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3002
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
3003 /* Do the same for window matrices, if MATRIX is a frame matrix. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3004 if (frame_matrix_frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3005 mirror_line_dance (XWINDOW (frame_matrix_frame->root_window),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3006 unchanged_at_top, nlines, copy_from, retained_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3007 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3008
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3009
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3010 /* Synchronize glyph pointers in the current matrix of window W with
40214
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3011 the current frame matrix. */
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3012
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3013 static void
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3014 sync_window_with_frame_matrix_rows (w)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3015 struct window *w;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3016 {
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3017 struct frame *f = XFRAME (w->frame);
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3018 struct glyph_row *window_row, *window_row_end, *frame_row;
40271
ae4848857075 (sync_window_with_frame_matrix_rows): Remove unused variable `area'.
Pavel Janík <Pavel@Janik.cz>
parents: 40214
diff changeset
3019 int left, right, x, width;
40214
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3020
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3021 /* Preconditions: W must be a leaf window on a tty frame. */
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3022 xassert (NILP (w->hchild) && NILP (w->vchild));
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3023 xassert (!FRAME_WINDOW_P (f));
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3024
40214
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3025 left = margin_glyphs_to_reserve (w, 1, w->left_margin_width);
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3026 right = margin_glyphs_to_reserve (w, 1, w->right_margin_width);
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3027 x = w->current_matrix->matrix_x;
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3028 width = w->current_matrix->matrix_w;
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3029
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3030 window_row = w->current_matrix->rows;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3031 window_row_end = window_row + w->current_matrix->nrows;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3032 frame_row = f->current_matrix->rows + XFASTINT (w->top);
40214
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3033
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3034 for (; window_row < window_row_end; ++window_row, ++frame_row)
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3035 {
40214
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3036 window_row->glyphs[LEFT_MARGIN_AREA]
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3037 = frame_row->glyphs[0] + x;
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3038 window_row->glyphs[TEXT_AREA]
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3039 = window_row->glyphs[LEFT_MARGIN_AREA] + left;
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3040 window_row->glyphs[LAST_AREA]
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3041 = window_row->glyphs[LEFT_MARGIN_AREA] + width;
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3042 window_row->glyphs[RIGHT_MARGIN_AREA]
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3043 = window_row->glyphs[LAST_AREA] - right;
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3044 }
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3045 }
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3046
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3047
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3048 /* Return the window in the window tree rooted in W containing frame
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3049 row ROW. Value is null if none is found. */
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3050
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3051 struct window *
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3052 frame_row_to_window (w, row)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3053 struct window *w;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3054 int row;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3055 {
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3056 struct window *found = NULL;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3057
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3058 while (w && !found)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3059 {
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3060 if (!NILP (w->hchild))
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3061 found = frame_row_to_window (XWINDOW (w->hchild), row);
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3062 else if (!NILP (w->vchild))
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3063 found = frame_row_to_window (XWINDOW (w->vchild), row);
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3064 else if (row >= XFASTINT (w->top)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3065 && row < XFASTINT (w->top) + XFASTINT (w->height))
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3066 found = w;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3067
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3068 w = NILP (w->next) ? 0 : XWINDOW (w->next);
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3069 }
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3070
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3071 return found;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3072 }
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3073
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3074
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3075 /* Perform a line dance in the window tree rooted at W, after
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3076 scrolling a frame matrix in mirrored_line_dance.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3077
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3078 We are working on the range of lines UNCHANGED_AT_TOP + 1 to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3079 UNCHANGED_AT_TOP + NLINES (not including) in W's frame matrix.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3080 COPY_FROM is a vector containing, for each row I in the range 0 <=
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3081 I < NLINES, the index of the original line to move to I. This
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3082 index is relative to the row range, i.e. 0 <= index < NLINES.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3083 RETAINED_P is a vector containing zero for each row 0 <= I < NLINES
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3084 which is empty. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3085
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3086 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3087 mirror_line_dance (w, unchanged_at_top, nlines, copy_from, retained_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3088 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3089 int unchanged_at_top, nlines;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3090 int *copy_from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3091 char *retained_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3092 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3093 while (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3094 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3095 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3096 mirror_line_dance (XWINDOW (w->hchild), unchanged_at_top,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3097 nlines, copy_from, retained_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3098 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3099 mirror_line_dance (XWINDOW (w->vchild), unchanged_at_top,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3100 nlines, copy_from, retained_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3101 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3102 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3103 /* W is a leaf window, and we are working on its current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3104 matrix m. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3105 struct glyph_matrix *m = w->current_matrix;
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3106 int i, sync_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3107 struct glyph_row *old_rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3108
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3109 /* Make a copy of the original rows of matrix m. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3110 old_rows = (struct glyph_row *) alloca (m->nrows * sizeof *old_rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3111 bcopy (m->rows, old_rows, m->nrows * sizeof *old_rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3112
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3113 for (i = 0; i < nlines; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3114 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3115 /* Frame relative line assigned to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3116 int frame_to = i + unchanged_at_top;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3117
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3118 /* Frame relative line assigned. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3119 int frame_from = copy_from[i] + unchanged_at_top;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3120
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3121 /* Window relative line assigned to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3122 int window_to = frame_to - m->matrix_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3123
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3124 /* Window relative line assigned. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3125 int window_from = frame_from - m->matrix_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3126
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3127 /* Is assigned line inside window? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3128 int from_inside_window_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3129 = window_from >= 0 && window_from < m->matrix_h;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3130
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3131 /* Is assigned to line inside window? */
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3132 int to_inside_window_p
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3133 = window_to >= 0 && window_to < m->matrix_h;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3134
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3135 if (from_inside_window_p && to_inside_window_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3136 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3137 /* Enabled setting before assignment. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3138 int enabled_before_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3139
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3140 /* Do the assignment. The enabled_p flag is saved
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3141 over the assignment because the old redisplay did
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3142 that. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3143 enabled_before_p = m->rows[window_to].enabled_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3144 m->rows[window_to] = old_rows[window_from];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3145 m->rows[window_to].enabled_p = enabled_before_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3146
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3147 /* If frame line is empty, window line is empty, too. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3148 if (!retained_p[copy_from[i]])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3149 m->rows[window_to].enabled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3150 }
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3151 else if (to_inside_window_p)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3152 {
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3153 /* A copy between windows. This is an infrequent
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3154 case not worth optimizing. */
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3155 struct frame *f = XFRAME (w->frame);
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3156 struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f));
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3157 struct window *w2;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3158 struct glyph_matrix *m2;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3159 int m2_from;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3160
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3161 w2 = frame_row_to_window (root, frame_to);
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3162 m2 = w2->current_matrix;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3163 m2_from = frame_from - m2->matrix_y;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3164 copy_row_except_pointers (m->rows + window_to,
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3165 m2->rows + m2_from);
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3166
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3167 /* If frame line is empty, window line is empty, too. */
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3168 if (!retained_p[copy_from[i]])
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3169 m->rows[window_to].enabled_p = 0;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3170 sync_p = 1;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3171 }
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3172 else if (from_inside_window_p)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3173 sync_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3174 }
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3175
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3176 /* If there was a copy between windows, make sure glyph
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3177 pointers are in sync with the frame matrix. */
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3178 if (sync_p)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3179 sync_window_with_frame_matrix_rows (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3180
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3181 /* Check that no pointers are lost. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3182 CHECK_MATRIX (m);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3183 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3184
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3185 /* Next window on same level. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3186 w = NILP (w->next) ? 0 : XWINDOW (w->next);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3187 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3188 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3189
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3190
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3191 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3192
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3193 /* Check that window and frame matrices agree about their
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3194 understanding where glyphs of the rows are to find. For each
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3195 window in the window tree rooted at W, check that rows in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3196 matrices of leaf window agree with their frame matrices about
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3197 glyph pointers. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3198
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
3199 void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3200 check_window_matrix_pointers (w)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3201 struct window *w;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3202 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3203 while (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3204 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3205 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3206 check_window_matrix_pointers (XWINDOW (w->hchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3207 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3208 check_window_matrix_pointers (XWINDOW (w->vchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3209 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3210 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3211 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3212 check_matrix_pointers (w->desired_matrix, f->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3213 check_matrix_pointers (w->current_matrix, f->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3214 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3215
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3216 w = NILP (w->next) ? 0 : XWINDOW (w->next);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3217 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3218 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3219
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3220
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3221 /* Check that window rows are slices of frame rows. WINDOW_MATRIX is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3222 a window and FRAME_MATRIX is the corresponding frame matrix. For
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3223 each row in WINDOW_MATRIX check that it's a slice of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3224 corresponding frame row. If it isn't, abort. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3225
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3226 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3227 check_matrix_pointers (window_matrix, frame_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3228 struct glyph_matrix *window_matrix, *frame_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3229 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3230 /* Row number in WINDOW_MATRIX. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3231 int i = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3232
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3233 /* Row number corresponding to I in FRAME_MATRIX. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3234 int j = window_matrix->matrix_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3235
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3236 /* For all rows check that the row in the window matrix is a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3237 slice of the row in the frame matrix. If it isn't we didn't
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3238 mirror an operation on the frame matrix correctly. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3239 while (i < window_matrix->nrows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3240 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3241 if (!glyph_row_slice_p (window_matrix->rows + i,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3242 frame_matrix->rows + j))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3243 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3244 ++i, ++j;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3245 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3246 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3247
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3248 #endif /* GLYPH_DEBUG != 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3249
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3250
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3251
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3252 /**********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3253 VPOS and HPOS translations
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3254 **********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3255
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3256 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3257
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3258 /* Translate vertical position VPOS which is relative to window W to a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3259 vertical position relative to W's frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3260
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3261 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3262 window_to_frame_vpos (w, vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3263 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3264 int vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3265 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3266 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3267
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3268 xassert (!FRAME_WINDOW_P (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3269 xassert (vpos >= 0 && vpos <= w->desired_matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3270 vpos += XFASTINT (w->top);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3271 xassert (vpos >= 0 && vpos <= FRAME_HEIGHT (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3272 return vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3273 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3274
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3275
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3276 /* Translate horizontal position HPOS which is relative to window W to
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
3277 a horizontal position relative to W's frame. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3278
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3279 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3280 window_to_frame_hpos (w, hpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3281 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3282 int hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3283 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3284 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3285
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3286 xassert (!FRAME_WINDOW_P (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3287 hpos += XFASTINT (w->left);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3288 return hpos;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3289 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3290
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3291 #endif /* GLYPH_DEBUG */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3292
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3293
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3294
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3295 /**********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3296 Redrawing Frames
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3297 **********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3298
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3299 DEFUN ("redraw-frame", Fredraw_frame, Sredraw_frame, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
3300 doc: /* Clear frame FRAME and output again what is supposed to appear on it. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
3301 (frame)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3302 Lisp_Object frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3303 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3304 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3305
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40512
diff changeset
3306 CHECK_LIVE_FRAME (frame);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3307 f = XFRAME (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3308
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3309 /* Ignore redraw requests, if frame has no glyphs yet.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3310 (Implementation note: It still has to be checked why we are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3311 called so early here). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3312 if (!glyphs_initialized_initially_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3313 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3314
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3315 update_begin (f);
35445
9af454aee182 (Fredraw_frame): Remove reference to
Andrew Innes <andrewi@gnu.org>
parents: 35374
diff changeset
3316 if (FRAME_MSDOS_P (f))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3317 set_terminal_modes ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3318 clear_frame ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3319 clear_current_matrices (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3320 update_end (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3321 fflush (stdout);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3322 windows_or_buffers_changed++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3323 /* Mark all windows as inaccurate, so that every window will have
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3324 its redisplay done. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3325 mark_window_display_accurate (FRAME_ROOT_WINDOW (f), 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3326 set_window_update_flags (XWINDOW (FRAME_ROOT_WINDOW (f)), 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3327 f->garbaged = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3328 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3329 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3330
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3331
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3332 /* Redraw frame F. This is nothing more than a call to the Lisp
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3333 function redraw-frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3334
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3335 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3336 redraw_frame (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3337 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3338 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3339 Lisp_Object frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3340 XSETFRAME (frame, f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3341 Fredraw_frame (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3342 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3343
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3344
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3345 DEFUN ("redraw-display", Fredraw_display, Sredraw_display, 0, 0, "",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
3346 doc: /* Clear and redisplay all visible frames. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
3347 ()
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3348 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3349 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3350
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3351 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3352 if (FRAME_VISIBLE_P (XFRAME (frame)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3353 Fredraw_frame (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3354
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3355 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3356 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3357
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3358
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3359 /* This is used when frame_garbaged is set. Call Fredraw_frame on all
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3360 visible frames marked as garbaged. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3361
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3362 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3363 redraw_garbaged_frames ()
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3364 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3365 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3366
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3367 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3368 if (FRAME_VISIBLE_P (XFRAME (frame))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3369 && FRAME_GARBAGED_P (XFRAME (frame)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3370 Fredraw_frame (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3371 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3372
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3373
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3374
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3375 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3376 Direct Operations
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3377 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3378
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3379 /* Try to update display and current glyph matrix directly.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3380
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3381 This function is called after a character G has been inserted into
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3382 current_buffer. It tries to update the current glyph matrix and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3383 perform appropriate screen output to reflect the insertion. If it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3384 succeeds, the global flag redisplay_performed_directly_p will be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3385 set to 1, and thereby prevent the more costly general redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3386 from running (see redisplay_internal).
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3387
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3388 This function is not called for `hairy' character insertions.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3389 In particular, it is not called when after or before change
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3390 functions exist, like they are used by font-lock. See keyboard.c
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3391 for details where this function is called. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3392
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3393 int
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3394 direct_output_for_insert (g)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3395 int g;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3396 {
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3397 register struct frame *f = SELECTED_FRAME ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3398 struct window *w = XWINDOW (selected_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3399 struct it it, it2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3400 struct glyph_row *glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3401 struct glyph *glyphs, *glyph, *end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3402 int n;
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
3403 /* Non-null means that redisplay of W is based on window matrices. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3404 int window_redisplay_p = FRAME_WINDOW_P (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3405 /* Non-null means we are in overwrite mode. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3406 int overwrite_p = !NILP (current_buffer->overwrite_mode);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3407 int added_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3408 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3409 int delta, delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3410
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3411 /* Not done directly. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3412 redisplay_performed_directly_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3413
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3414 /* Quickly give up for some common cases. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3415 if (cursor_in_echo_area
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3416 /* Give up if fonts have changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3417 || fonts_changed_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3418 /* Give up if face attributes have been changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3419 || face_change_count
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3420 /* Give up if cursor position not really known. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3421 || !display_completed
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3422 /* Give up if buffer appears in two places. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3423 || buffer_shared > 1
34715
fc3693bea815 (direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents: 34622
diff changeset
3424 /* Give up if currently displaying a message instead of the
fc3693bea815 (direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents: 34622
diff changeset
3425 minibuffer contents. */
fc3693bea815 (direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents: 34622
diff changeset
3426 || (EQ (selected_window, minibuf_window)
fc3693bea815 (direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents: 34622
diff changeset
3427 && EQ (minibuf_window, echo_area_window))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3428 /* Give up for hscrolled mini-buffer because display of the prompt
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3429 is handled specially there (see display_line). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3430 || (MINI_WINDOW_P (w) && XFASTINT (w->hscroll))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3431 /* Give up if overwriting in the middle of a line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3432 || (overwrite_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3433 && PT != ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3434 && FETCH_BYTE (PT) != '\n')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3435 /* Give up for tabs and line ends. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3436 || g == '\t'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3437 || g == '\n'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3438 || g == '\r'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3439 /* Give up if unable to display the cursor in the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3440 || w->cursor.vpos < 0
36279
1e3dc8692936 (direct_output_for_insert): Give up if we are showing
Gerd Moellmann <gerd@gnu.org>
parents: 36115
diff changeset
3441 /* Give up if we are showing a message or just cleared the message
1e3dc8692936 (direct_output_for_insert): Give up if we are showing
Gerd Moellmann <gerd@gnu.org>
parents: 36115
diff changeset
3442 because we might need to resize the echo area window. */
1e3dc8692936 (direct_output_for_insert): Give up if we are showing
Gerd Moellmann <gerd@gnu.org>
parents: 36115
diff changeset
3443 || !NILP (echo_area_buffer[0])
1e3dc8692936 (direct_output_for_insert): Give up if we are showing
Gerd Moellmann <gerd@gnu.org>
parents: 36115
diff changeset
3444 || !NILP (echo_area_buffer[1])
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3445 || (glyph_row = MATRIX_ROW (w->current_matrix, w->cursor.vpos),
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3446 /* Can't do it in a continued line because continuation
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3447 lines would change. */
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3448 (glyph_row->continued_p
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3449 /* Can't use this method if the line overlaps others or is
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3450 overlapped by others because these other lines would
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3451 have to be redisplayed. */
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3452 || glyph_row->overlapping_p
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3453 || glyph_row->overlapped_p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3454 /* Can't do it for partial width windows on terminal frames
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3455 because we can't clear to eol in such a window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3456 || (!window_redisplay_p && !WINDOW_FULL_WIDTH_P (w)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3457 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3458
35374
3fc8f4c6ed56 (direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents: 35336
diff changeset
3459 /* If we can't insert glyphs, we can use this method only
3fc8f4c6ed56 (direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents: 35336
diff changeset
3460 at the end of a line. */
3fc8f4c6ed56 (direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents: 35336
diff changeset
3461 if (!char_ins_del_ok)
3fc8f4c6ed56 (direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents: 35336
diff changeset
3462 if (PT != ZV && FETCH_BYTE (PT_BYTE) != '\n')
3fc8f4c6ed56 (direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents: 35336
diff changeset
3463 return 0;
3fc8f4c6ed56 (direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents: 35336
diff changeset
3464
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3465 /* Set up a display iterator structure for W. Glyphs will be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3466 produced in scratch_glyph_row. Current position is W's cursor
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3467 position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3468 clear_glyph_row (&scratch_glyph_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3469 SET_TEXT_POS (pos, PT, PT_BYTE);
28361
eccb57c44da5 (direct_output_for_insert): Use DEC_TEXT_POS
Gerd Moellmann <gerd@gnu.org>
parents: 27968
diff changeset
3470 DEC_TEXT_POS (pos, !NILP (current_buffer->enable_multibyte_characters));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3471 init_iterator (&it, w, CHARPOS (pos), BYTEPOS (pos), &scratch_glyph_row,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3472 DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3473
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3474 glyph_row = MATRIX_ROW (w->current_matrix, w->cursor.vpos);
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
3475 if (glyph_row->mouse_face_p)
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
3476 return 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3477
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3478 /* Give up if highlighting trailing whitespace and we have trailing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3479 whitespace in glyph_row. We would have to remove the trailing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3480 whitespace face in that case. */
25304
4b75c26bd356 (direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25241
diff changeset
3481 if (!NILP (Vshow_trailing_whitespace)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3482 && glyph_row->used[TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3483 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3484 struct glyph *last;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3485
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3486 last = glyph_row->glyphs[TEXT_AREA] + glyph_row->used[TEXT_AREA] - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3487 if (last->type == STRETCH_GLYPH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3488 || (last->type == CHAR_GLYPH
26998
02e902f732d1 (line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents: 26902
diff changeset
3489 && last->u.ch == ' '))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3490 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3491 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3492
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3493 /* Give up if there are overlay strings at pos. This would fail
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3494 if the overlay string has newlines in it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3495 if (STRINGP (it.string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3496 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3497
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3498 it.hpos = w->cursor.hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3499 it.vpos = w->cursor.vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3500 it.current_x = w->cursor.x + it.first_visible_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3501 it.current_y = w->cursor.y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3502 it.end_charpos = PT;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3503 it.stop_charpos = min (PT, it.stop_charpos);
39226
d86fe98ee7d5 (direct_output_for_insert): Don't change IT's
Gerd Moellmann <gerd@gnu.org>
parents: 38988
diff changeset
3504 it.stop_charpos = max (IT_CHARPOS (it), it.stop_charpos);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3505
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3506 /* More than one display element may be returned for PT - 1 if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3507 (i) it's a control character which is translated into `\003' or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3508 `^C', or (ii) it has a display table entry, or (iii) it's a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3509 combination of both. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3510 delta = delta_bytes = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3511 while (get_next_display_element (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3512 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3513 PRODUCE_GLYPHS (&it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3514
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3515 /* Give up if glyph doesn't fit completely on the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3516 if (it.current_x >= it.last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3517 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3518
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3519 /* Give up if new glyph has different ascent or descent than
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3520 the original row, or if it is not a character glyph. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3521 if (glyph_row->ascent != it.ascent
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3522 || glyph_row->height != it.ascent + it.descent
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3523 || glyph_row->phys_ascent != it.phys_ascent
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3524 || glyph_row->phys_height != it.phys_ascent + it.phys_descent
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3525 || it.what != IT_CHARACTER)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3526 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3527
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3528 delta += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3529 delta_bytes += it.len;
32468
20788c8274cd (direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents: 31932
diff changeset
3530 set_iterator_to_next (&it, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3531 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3532
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3533 /* Give up if we hit the right edge of the window. We would have
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3534 to insert truncation or continuation glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3535 added_width = it.current_x - (w->cursor.x + it.first_visible_x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3536 if (glyph_row->pixel_width + added_width >= it.last_visible_x)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3537 return 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3538
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3539 /* Give up if there is a \t following in the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3540 it2 = it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3541 it2.end_charpos = ZV;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3542 it2.stop_charpos = min (it2.stop_charpos, ZV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3543 while (get_next_display_element (&it2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3544 && !ITERATOR_AT_END_OF_LINE_P (&it2))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3545 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3546 if (it2.c == '\t')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3547 return 0;
32468
20788c8274cd (direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents: 31932
diff changeset
3548 set_iterator_to_next (&it2, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3549 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3550
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3551 /* Number of new glyphs produced. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3552 n = it.glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3553
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3554 /* Start and end of glyphs in original row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3555 glyphs = glyph_row->glyphs[TEXT_AREA] + w->cursor.hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3556 end = glyph_row->glyphs[1 + TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3557
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3558 /* Make room for new glyphs, then insert them. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3559 xassert (end - glyphs - n >= 0);
25781
e5579bc77d9e (direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents: 25735
diff changeset
3560 safe_bcopy ((char *) glyphs, (char *) (glyphs + n),
e5579bc77d9e (direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents: 25735
diff changeset
3561 (end - glyphs - n) * sizeof (*end));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3562 bcopy (it.glyph_row->glyphs[TEXT_AREA], glyphs, n * sizeof *glyphs);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3563 glyph_row->used[TEXT_AREA] = min (glyph_row->used[TEXT_AREA] + n,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3564 end - glyph_row->glyphs[TEXT_AREA]);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3565
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3566 /* Compute new line width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3567 glyph = glyph_row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3568 end = glyph + glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3569 glyph_row->pixel_width = glyph_row->x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3570 while (glyph < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3571 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3572 glyph_row->pixel_width += glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3573 ++glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3574 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3575
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3576 /* Increment buffer positions for glyphs following the newly
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3577 inserted ones. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3578 for (glyph = glyphs + n; glyph < end; ++glyph)
26546
0f43cc91d6a5 (direct_output_for_insert): Increment glyph positions
Gerd Moellmann <gerd@gnu.org>
parents: 26499
diff changeset
3579 if (glyph->charpos > 0 && BUFFERP (glyph->object))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3580 glyph->charpos += delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3581
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3582 if (MATRIX_ROW_END_CHARPOS (glyph_row) > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3583 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3584 MATRIX_ROW_END_CHARPOS (glyph_row) += delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3585 MATRIX_ROW_END_BYTEPOS (glyph_row) += delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3586 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3587
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3588 /* Adjust positions in lines following the one we are in. */
28708
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
3589 increment_matrix_positions (w->current_matrix,
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
3590 w->cursor.vpos + 1,
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
3591 w->current_matrix->nrows,
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
3592 delta, delta_bytes);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3593
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3594 glyph_row->contains_overlapping_glyphs_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3595 |= it.glyph_row->contains_overlapping_glyphs_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3596
26591
f7c7ef351f04 (direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents: 26546
diff changeset
3597 glyph_row->displays_text_p = 1;
f7c7ef351f04 (direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents: 26546
diff changeset
3598 w->window_end_vpos = make_number (max (w->cursor.vpos,
f7c7ef351f04 (direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents: 26546
diff changeset
3599 XFASTINT (w->window_end_vpos)));
f7c7ef351f04 (direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents: 26546
diff changeset
3600
25304
4b75c26bd356 (direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25241
diff changeset
3601 if (!NILP (Vshow_trailing_whitespace))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3602 highlight_trailing_whitespace (it.f, glyph_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3603
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3604 /* Write glyphs. If at end of row, we can simply call write_glyphs.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3605 In the middle, we have to insert glyphs. Note that this is now
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3606 implemented for X frames. The implementation uses updated_window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3607 and updated_row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3608 updated_row = glyph_row;
38988
53ae5a92e2fc (direct_output_for_insert): Set updated_area
Gerd Moellmann <gerd@gnu.org>
parents: 38748
diff changeset
3609 updated_area = TEXT_AREA;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3610 update_begin (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3611 if (rif)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3612 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3613 rif->update_window_begin_hook (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3614
36115
c0fac212cfcc (direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents: 36097
diff changeset
3615 if (glyphs == end - n
c0fac212cfcc (direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents: 36097
diff changeset
3616 /* In front of a space added by append_space. */
c0fac212cfcc (direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents: 36097
diff changeset
3617 || (glyphs == end - n - 1
c0fac212cfcc (direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents: 36097
diff changeset
3618 && (end - n)->charpos <= 0))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3619 rif->write_glyphs (glyphs, n);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3620 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3621 rif->insert_glyphs (glyphs, n);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3622 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3623 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3624 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3625 if (glyphs == end - n)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3626 write_glyphs (glyphs, n);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3627 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3628 insert_glyphs (glyphs, n);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3629 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3630
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3631 w->cursor.hpos += n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3632 w->cursor.x = it.current_x - it.first_visible_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3633 xassert (w->cursor.hpos >= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3634 && w->cursor.hpos < w->desired_matrix->matrix_w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3635
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3636 /* How to set the cursor differs depending on whether we are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3637 using a frame matrix or a window matrix. Note that when
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3638 a frame matrix is used, cursor_to expects frame coordinates,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3639 and the X and Y parameters are not used. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3640 if (window_redisplay_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3641 rif->cursor_to (w->cursor.vpos, w->cursor.hpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3642 w->cursor.y, w->cursor.x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3643 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3644 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3645 int x, y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3646 x = (WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3647 + (INTEGERP (w->left_margin_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3648 ? XFASTINT (w->left_margin_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3649 : 0));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3650 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3651 cursor_to (y, x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3652 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3653
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3654 if (rif)
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
3655 rif->update_window_end_hook (w, 1, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3656 update_end (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3657 updated_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3658 fflush (stdout);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3659
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3660 TRACE ((stderr, "direct output for insert\n"));
44260
64c67a3eebb2 (direct_output_for_insert): Call
Gerd Moellmann <gerd@gnu.org>
parents: 43729
diff changeset
3661 mark_window_display_accurate (it.window, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3662 redisplay_performed_directly_p = 1;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3663 return 1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3664 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3665
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3666
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3667 /* Perform a direct display update for moving PT by N positions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3668 left or right. N < 0 means a movement backwards. This function
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3669 is currently only called for N == 1 or N == -1. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3670
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3671 int
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3672 direct_output_forward_char (n)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3673 int n;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3674 {
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3675 struct frame *f = SELECTED_FRAME ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3676 struct window *w = XWINDOW (selected_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3677 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3678
26851
2513566d55fd (direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents: 26729
diff changeset
3679 /* Give up if point moved out of or into a composition. */
28507
b6f06a755c7d make_number/XINT/XUINT conversions; EQ/== fixes; ==Qnil -> NILP
Ken Raeburn <raeburn@raeburn.org>
parents: 28361
diff changeset
3680 if (check_point_in_composition (current_buffer, XINT (w->last_point),
26851
2513566d55fd (direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents: 26729
diff changeset
3681 current_buffer, PT))
2513566d55fd (direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents: 26729
diff changeset
3682 return 0;
2513566d55fd (direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents: 26729
diff changeset
3683
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3684 /* Give up if face attributes have been changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3685 if (face_change_count)
17015
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
3686 return 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3687
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3688 /* Give up if current matrix is not up to date or we are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3689 displaying a message. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3690 if (!display_completed || cursor_in_echo_area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3691 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3692
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3693 /* Give up if the buffer's direction is reversed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3694 if (!NILP (XBUFFER (w->buffer)->direction_reversed))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3695 return 0;
11096
cac0367b1794 (direct_output_forward_char): Don't use direct output at an overlay boundary.
Karl Heuer <kwzh@gnu.org>
parents: 10770
diff changeset
3696
2794
9163e4e4752c (direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents: 2778
diff changeset
3697 /* Can't use direct output if highlighting a region. */
9163e4e4752c (direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents: 2778
diff changeset
3698 if (!NILP (Vtransient_mark_mode) && !NILP (current_buffer->mark_active))
9163e4e4752c (direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents: 2778
diff changeset
3699 return 0;
9163e4e4752c (direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents: 2778
diff changeset
3700
25304
4b75c26bd356 (direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25241
diff changeset
3701 /* Can't use direct output if highlighting trailing whitespace. */
4b75c26bd356 (direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25241
diff changeset
3702 if (!NILP (Vshow_trailing_whitespace))
4b75c26bd356 (direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25241
diff changeset
3703 return 0;
4b75c26bd356 (direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25241
diff changeset
3704
25735
fcb92c26acf2 (direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents: 25725
diff changeset
3705 /* Give up if we are showing a message or just cleared the message
fcb92c26acf2 (direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents: 25725
diff changeset
3706 because we might need to resize the echo area window. */
fcb92c26acf2 (direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents: 25725
diff changeset
3707 if (!NILP (echo_area_buffer[0]) || !NILP (echo_area_buffer[1]))
fcb92c26acf2 (direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents: 25725
diff changeset
3708 return 0;
fcb92c26acf2 (direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents: 25725
diff changeset
3709
30152
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
3710 /* Give up if currently displaying a message instead of the
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
3711 minibuffer contents. */
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
3712 if (XWINDOW (minibuf_window) == w
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
3713 && EQ (minibuf_window, echo_area_window))
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
3714 return 0;
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
3715
25735
fcb92c26acf2 (direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents: 25725
diff changeset
3716 /* Give up if we don't know where the cursor is. */
fcb92c26acf2 (direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents: 25725
diff changeset
3717 if (w->cursor.vpos < 0)
fcb92c26acf2 (direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents: 25725
diff changeset
3718 return 0;
fcb92c26acf2 (direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents: 25725
diff changeset
3719
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3720 row = MATRIX_ROW (w->current_matrix, w->cursor.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3721
31271
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
3722 /* Give up if PT is outside of the last known cursor row. */
41069
818a84568f83 (direct_output_forward_char): Fix character/byte
Gerd Moellmann <gerd@gnu.org>
parents: 41025
diff changeset
3723 if (PT <= MATRIX_ROW_START_CHARPOS (row)
818a84568f83 (direct_output_forward_char): Fix character/byte
Gerd Moellmann <gerd@gnu.org>
parents: 41025
diff changeset
3724 || PT >= MATRIX_ROW_END_CHARPOS (row))
6069
07045ca8ff19 (direct_output_forward_char): Use Fget_char_property to test for invisibility.
Karl Heuer <kwzh@gnu.org>
parents: 6068
diff changeset
3725 return 0;
4384
98605d0ea3cf (direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents: 4290
diff changeset
3726
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3727 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
31271
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
3728
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3729 w->last_cursor = w->cursor;
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15896
diff changeset
3730 XSETFASTINT (w->last_point, PT);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3731
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3732 xassert (w->cursor.hpos >= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3733 && w->cursor.hpos < w->desired_matrix->matrix_w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3734
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3735 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3736 rif->cursor_to (w->cursor.vpos, w->cursor.hpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3737 w->cursor.y, w->cursor.x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3738 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3739 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3740 int x, y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3741 x = (WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3742 + (INTEGERP (w->left_margin_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3743 ? XFASTINT (w->left_margin_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3744 : 0));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3745 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3746 cursor_to (y, x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3747 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3748
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3749 fflush (stdout);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3750 redisplay_performed_directly_p = 1;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3751 return 1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3752 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3753
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3754
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3755
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3756 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3757 Frame Update
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3758 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3759
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3760 /* Update frame F based on the data in desired matrices.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3761
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3762 If FORCE_P is non-zero, don't let redisplay be stopped by detecting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3763 pending input. If INHIBIT_HAIRY_ID_P is non-zero, don't try
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3764 scrolling.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3765
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3766 Value is non-zero if redisplay was stopped due to pending input. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3767
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3768 int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3769 update_frame (f, force_p, inhibit_hairy_id_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3770 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3771 int force_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3772 int inhibit_hairy_id_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3773 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3774 /* 1 means display has been paused because of pending input. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3775 int paused_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3776 struct window *root_window = XWINDOW (f->root_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3777
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3778 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3779 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3780 /* We are working on window matrix basis. All windows whose
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3781 flag must_be_updated_p is set have to be updated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3782
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3783 /* Record that we are not working on frame matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3784 set_frame_matrix_frame (NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3785
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3786 /* Update all windows in the window tree of F, maybe stopping
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3787 when pending input is detected. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3788 update_begin (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3789
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3790 /* Update the menu bar on X frames that don't have toolkit
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3791 support. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3792 if (WINDOWP (f->menu_bar_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3793 update_window (XWINDOW (f->menu_bar_window), 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3794
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3795 /* Update the tool-bar window, if present. */
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
3796 if (WINDOWP (f->tool_bar_window))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3797 {
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
3798 struct window *w = XWINDOW (f->tool_bar_window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3799
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3800 /* Update tool-bar window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3801 if (w->must_be_updated_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3802 {
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
3803 Lisp_Object tem;
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
3804
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3805 update_window (w, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3806 w->must_be_updated_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3807
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3808 /* Swap tool-bar strings. We swap because we want to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3809 reuse strings. */
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
3810 tem = f->current_tool_bar_string;
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
3811 f->current_tool_bar_string = f->desired_tool_bar_string;
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
3812 f->desired_tool_bar_string = tem;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3813 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3814 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3815
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3816
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3817 /* Update windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3818 paused_p = update_window_tree (root_window, force_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3819 update_end (f);
31295
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3820
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3821 #if 0 /* This flush is a performance bottleneck under X,
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3822 and it doesn't seem to be necessary anyway. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3823 rif->flush_display (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3824 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3825 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3826 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3827 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3828 /* We are working on frame matrix basis. Set the frame on whose
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3829 frame matrix we operate. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3830 set_frame_matrix_frame (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3831
31295
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3832 /* Build F's desired matrix from window matrices. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3833 build_frame_matrix (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3834
31295
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3835 /* Update the display */
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3836 update_begin (f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3837 paused_p = update_frame_1 (f, force_p, inhibit_hairy_id_p);
31295
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3838 update_end (f);
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3839
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3840 if (termscript)
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3841 fflush (termscript);
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3842 fflush (stdout);
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3843
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3844 /* Check window matrices for lost pointers. */
34893
779bd3fa820e Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents: 34866
diff changeset
3845 #if GLYPH_DEBUG
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
3846 check_window_matrix_pointers (root_window);
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
3847 add_frame_display_history (f, paused_p);
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
3848 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3849 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3850
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3851 /* Reset flags indicating that a window should be updated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3852 set_window_update_flags (root_window, 0);
31295
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3853
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3854 display_completed = !paused_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3855 return paused_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3856 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3857
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3858
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3859
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3860 /************************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3861 Window-based updates
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3862 ************************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3863
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3864 /* Perform updates in window tree rooted at W. FORCE_P non-zero means
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3865 don't stop updating when input is pending. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3866
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3867 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3868 update_window_tree (w, force_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3869 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3870 int force_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3871 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3872 int paused_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3873
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3874 while (w && !paused_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3875 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3876 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3877 paused_p |= update_window_tree (XWINDOW (w->hchild), force_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3878 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3879 paused_p |= update_window_tree (XWINDOW (w->vchild), force_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3880 else if (w->must_be_updated_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3881 paused_p |= update_window (w, force_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3882
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3883 w = NILP (w->next) ? 0 : XWINDOW (w->next);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3884 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3885
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3886 return paused_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3887 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3888
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3889
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3890 /* Update window W if its flag must_be_updated_p is non-zero. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3891 FORCE_P is non-zero, don't stop updating if input is pending. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3892
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3893 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3894 update_single_window (w, force_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3895 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3896 int force_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3897 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3898 if (w->must_be_updated_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3899 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3900 struct frame *f = XFRAME (WINDOW_FRAME (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3901
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3902 /* Record that this is not a frame-based redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3903 set_frame_matrix_frame (NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3904
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3905 /* Update W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3906 update_begin (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3907 update_window (w, force_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3908 update_end (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3909
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3910 /* Reset flag in W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3911 w->must_be_updated_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3912 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3913 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3914
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3915
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3916 /* Redraw lines from the current matrix of window W that are
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3917 overlapped by other rows. YB is bottom-most y-position in W. */
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3918
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3919 static void
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3920 redraw_overlapped_rows (w, yb)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3921 struct window *w;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3922 int yb;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3923 {
30165
d7ec5b3caccc (redraw_overlapped_rows): Add missing local.
Gerd Moellmann <gerd@gnu.org>
parents: 30161
diff changeset
3924 int i;
d7ec5b3caccc (redraw_overlapped_rows): Add missing local.
Gerd Moellmann <gerd@gnu.org>
parents: 30161
diff changeset
3925
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3926 /* If rows overlapping others have been changed, the rows being
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3927 overlapped have to be redrawn. This won't draw lines that have
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3928 already been drawn in update_window_line because overlapped_p in
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3929 desired rows is 0, so after row assignment overlapped_p in
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3930 current rows is 0. */
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3931 for (i = 0; i < w->current_matrix->nrows; ++i)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3932 {
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
3933 struct glyph_row *row = w->current_matrix->rows + i;
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3934
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3935 if (!row->enabled_p)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3936 break;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3937 else if (row->mode_line_p)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3938 continue;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3939
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3940 if (row->overlapped_p)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3941 {
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3942 enum glyph_row_area area;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3943
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3944 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3945 {
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3946 updated_row = row;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3947 updated_area = area;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3948 rif->cursor_to (i, 0, row->y, area == TEXT_AREA ? row->x : 0);
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3949 if (row->used[area])
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3950 rif->write_glyphs (row->glyphs[area], row->used[area]);
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3951 rif->clear_end_of_line (-1);
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3952 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3953
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3954 row->overlapped_p = 0;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3955 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3956
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
3957 if (MATRIX_ROW_BOTTOM_Y (row) >= yb)
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3958 break;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3959 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3960 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3961
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3962
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3963 /* Redraw lines from the current matrix of window W that overlap
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3964 others. YB is bottom-most y-position in W. */
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3965
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3966 static void
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3967 redraw_overlapping_rows (w, yb)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3968 struct window *w;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3969 int yb;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3970 {
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3971 int i, bottom_y;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3972 struct glyph_row *row;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3973
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3974 for (i = 0; i < w->current_matrix->nrows; ++i)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3975 {
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3976 row = w->current_matrix->rows + i;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3977
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3978 if (!row->enabled_p)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3979 break;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3980 else if (row->mode_line_p)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3981 continue;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3982
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3983 bottom_y = MATRIX_ROW_BOTTOM_Y (row);
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3984
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3985 if (row->overlapping_p && i > 0 && bottom_y < yb)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3986 {
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3987 if (row->used[LEFT_MARGIN_AREA])
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3988 rif->fix_overlapping_area (w, row, LEFT_MARGIN_AREA);
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3989
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3990 if (row->used[TEXT_AREA])
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3991 rif->fix_overlapping_area (w, row, TEXT_AREA);
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3992
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3993 if (row->used[RIGHT_MARGIN_AREA])
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3994 rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA);
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3995
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
3996 /* Record in neighbour rows that ROW overwrites part of their
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3997 display. */
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3998 if (row->phys_ascent > row->ascent && i > 0)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3999 MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4000 if ((row->phys_height - row->phys_ascent
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4001 > row->height - row->ascent)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4002 && bottom_y < yb)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4003 MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p = 1;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4004 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4005
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4006 if (bottom_y >= yb)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4007 break;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4008 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4009 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4010
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4011
34929
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4012 #ifdef GLYPH_DEBUG
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4013
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4014 /* Check that no row in the current matrix of window W is enabled
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4015 which is below what's displayed in the window. */
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4016
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4017 void
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4018 check_current_matrix_flags (w)
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4019 struct window *w;
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4020 {
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4021 int last_seen_p = 0;
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4022 int i, yb = window_text_bottom_y (w);
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4023
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4024 for (i = 0; i < w->current_matrix->nrows - 1; ++i)
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4025 {
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4026 struct glyph_row *row = MATRIX_ROW (w->current_matrix, i);
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4027 if (!last_seen_p && MATRIX_ROW_BOTTOM_Y (row) >= yb)
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4028 last_seen_p = 1;
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4029 else if (last_seen_p && row->enabled_p)
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4030 abort ();
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4031 }
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4032 }
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4033
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4034 #endif /* GLYPH_DEBUG */
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4035
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4036
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4037 /* Update display of window W. FORCE_P non-zero means that we should
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4038 not stop when detecting pending input. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4039
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4040 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4041 update_window (w, force_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4042 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4043 int force_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4044 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4045 struct glyph_matrix *desired_matrix = w->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4046 int paused_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4047 int preempt_count = baud_rate / 2400 + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4048 extern int input_pending;
34517
7c8d2cec3d08 (update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents: 34279
diff changeset
4049 extern Lisp_Object do_mouse_tracking;
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4050 #if GLYPH_DEBUG
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4051 struct frame *f = XFRAME (WINDOW_FRAME (w));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4052 extern struct frame *updating_frame;
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4053 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4054
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4055 /* Check that W's frame doesn't have glyph matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4056 xassert (FRAME_WINDOW_P (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4057 xassert (updating_frame != NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4058
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4059 /* Check pending input the first time so that we can quickly return. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4060 if (redisplay_dont_pause)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4061 force_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4062 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4063 detect_input_pending ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4064
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4065 /* If forced to complete the update, or if no input is pending, do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4066 the update. */
34517
7c8d2cec3d08 (update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents: 34279
diff changeset
4067 if (force_p || !input_pending || !NILP (do_mouse_tracking))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4068 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4069 struct glyph_row *row, *end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4070 struct glyph_row *mode_line_row;
38489
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4071 struct glyph_row *header_line_row;
34622
877ed6cab304 (update_window): Detect pending input every nth line
Gerd Moellmann <gerd@gnu.org>
parents: 34517
diff changeset
4072 int yb, changed_p = 0, mouse_face_overwritten_p = 0, n_updated;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4073
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4074 rif->update_window_begin_hook (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4075 yb = window_text_bottom_y (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4076
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
4077 /* If window has a header line, update it before everything else.
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
4078 Adjust y-positions of other rows by the header line height. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4079 row = desired_matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4080 end = row + desired_matrix->nrows - 1;
38489
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4081
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4082 if (row->mode_line_p)
38489
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4083 {
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4084 header_line_row = row;
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4085 ++row;
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4086 }
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4087 else
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4088 header_line_row = NULL;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4089
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4090 /* Update the mode line, if necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4091 mode_line_row = MATRIX_MODE_LINE_ROW (desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4092 if (mode_line_row->mode_line_p && mode_line_row->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4093 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4094 mode_line_row->y = yb;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4095 update_window_line (w, MATRIX_ROW_VPOS (mode_line_row,
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4096 desired_matrix),
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4097 &mouse_face_overwritten_p);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4098 changed_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4099 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4100
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4101 /* Find first enabled row. Optimizations in redisplay_internal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4102 may lead to an update with only one row enabled. There may
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4103 be also completely empty matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4104 while (row < end && !row->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4105 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4106
31825
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4107 /* Try reusing part of the display by copying. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4108 if (row < end && !desired_matrix->no_scrolling_p)
38489
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4109 {
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4110 int rc = scrolling_window (w, header_line_row != NULL);
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4111 if (rc < 0)
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4112 {
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4113 /* All rows were found to be equal. */
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4114 paused_p = 0;
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4115 goto set_cursor;
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4116 }
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4117 else if (rc > 0)
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4118 /* We've scrolled the display. */
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4119 force_p = 1;
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4120 changed_p = 1;
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4121 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4122
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
4123 /* Update the header line after scrolling because a new header
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4124 line would otherwise overwrite lines at the top of the window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4125 that can be scrolled. */
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
4126 if (header_line_row && header_line_row->enabled_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4127 {
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
4128 header_line_row->y = 0;
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4129 update_window_line (w, 0, &mouse_face_overwritten_p);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4130 changed_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4131 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4132
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4133 /* Update the rest of the lines. */
34622
877ed6cab304 (update_window): Detect pending input every nth line
Gerd Moellmann <gerd@gnu.org>
parents: 34517
diff changeset
4134 for (n_updated = 0; row < end && (force_p || !input_pending); ++row)
31653
2554afbeb88d (update_window): Make sure to make desired rows
Gerd Moellmann <gerd@gnu.org>
parents: 31295
diff changeset
4135 if (row->enabled_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4136 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4137 int vpos = MATRIX_ROW_VPOS (row, desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4138 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4139
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
4140 /* We'll have to play a little bit with when to
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4141 detect_input_pending. If it's done too often,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4142 scrolling large windows with repeated scroll-up
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4143 commands will too quickly pause redisplay. */
34622
877ed6cab304 (update_window): Detect pending input every nth line
Gerd Moellmann <gerd@gnu.org>
parents: 34517
diff changeset
4144 if (!force_p && ++n_updated % preempt_count == 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4145 detect_input_pending ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4146
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4147 changed_p |= update_window_line (w, vpos,
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4148 &mouse_face_overwritten_p);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4149
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4150 /* Mark all rows below the last visible one in the current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4151 matrix as invalid. This is necessary because of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4152 variable line heights. Consider the case of three
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4153 successive redisplays, where the first displays 5
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4154 lines, the second 3 lines, and the third 5 lines again.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4155 If the second redisplay wouldn't mark rows in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4156 current matrix invalid, the third redisplay might be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4157 tempted to optimize redisplay based on lines displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4158 in the first redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4159 if (MATRIX_ROW_BOTTOM_Y (row) >= yb)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4160 for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4161 MATRIX_ROW (w->current_matrix, i)->enabled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4162 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4163
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4164 /* Was display preempted? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4165 paused_p = row < end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4166
38489
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4167 set_cursor:
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4168
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
4169 /* Fix the appearance of overlapping/overlapped rows. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4170 if (!paused_p && !w->pseudo_window_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4171 {
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4172 if (changed_p && rif->fix_overlapping_area)
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4173 {
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4174 redraw_overlapped_rows (w, yb);
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4175 redraw_overlapping_rows (w, yb);
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4176 }
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4177
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4178 /* Make cursor visible at cursor position of W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4179 set_window_cursor_after_update (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4180
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4181 #if 0 /* Check that current matrix invariants are satisfied. This is
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4182 for debugging only. See the comment of check_matrix_invariants. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4183 IF_DEBUG (check_matrix_invariants (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4184 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4185 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4186
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4187 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4188 /* Remember the redisplay method used to display the matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4189 strcpy (w->current_matrix->method, w->desired_matrix->method);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4190 #endif
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4191
38489
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4192 /* End the update of window W. Don't set the cursor if we
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4193 paused updating the display because in this case,
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4194 set_window_cursor_after_update hasn't been called, and
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4195 output_cursor doesn't contain the cursor location. */
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4196 rif->update_window_end_hook (w, !paused_p, mouse_face_overwritten_p);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4197 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4198 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4199 paused_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4200
34893
779bd3fa820e Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents: 34866
diff changeset
4201 #if GLYPH_DEBUG
34944
4fc804373f2a (update_window): Don't check_current_matrix_flags.
Gerd Moellmann <gerd@gnu.org>
parents: 34929
diff changeset
4202 /* check_current_matrix_flags (w); */
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
4203 add_window_display_history (w, w->current_matrix->method, paused_p);
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
4204 #endif
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
4205
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4206 clear_glyph_matrix (desired_matrix);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4207
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4208 return paused_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4209 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4210
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4211
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4212 /* Update the display of area AREA in window W, row number VPOS.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4213 AREA can be either LEFT_MARGIN_AREA or RIGHT_MARGIN_AREA. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4214
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4215 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4216 update_marginal_area (w, area, vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4217 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4218 int area, vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4219 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4220 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4221
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4222 /* Let functions in xterm.c know what area subsequent X positions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4223 will be relative to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4224 updated_area = area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4225
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4226 /* Set cursor to start of glyphs, write them, and clear to the end
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4227 of the area. I don't think that something more sophisticated is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4228 necessary here, since marginal areas will not be the default. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4229 rif->cursor_to (vpos, 0, desired_row->y, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4230 if (desired_row->used[area])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4231 rif->write_glyphs (desired_row->glyphs[area], desired_row->used[area]);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4232 rif->clear_end_of_line (-1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4233 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4234
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4235
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4236 /* Update the display of the text area of row VPOS in window W.
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4237 Value is non-zero if display has changed. */
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4238
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4239 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4240 update_text_area (w, vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4241 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4242 int vpos;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4243 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4244 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4245 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4246 int changed_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4247
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4248 /* Let functions in xterm.c know what area subsequent X positions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4249 will be relative to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4250 updated_area = TEXT_AREA;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4251
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4252 /* If rows are at different X or Y, or rows have different height,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4253 or the current row is marked invalid, write the entire line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4254 if (!current_row->enabled_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4255 || desired_row->y != current_row->y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4256 || desired_row->ascent != current_row->ascent
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4257 || desired_row->phys_ascent != current_row->phys_ascent
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4258 || desired_row->phys_height != current_row->phys_height
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4259 || desired_row->visible_height != current_row->visible_height
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4260 || current_row->overlapped_p
30307
faf4e303bab7 (update_text_area): Write the whole row if it
Gerd Moellmann <gerd@gnu.org>
parents: 30165
diff changeset
4261 || current_row->mouse_face_p
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4262 || current_row->x != desired_row->x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4263 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4264 rif->cursor_to (vpos, 0, desired_row->y, desired_row->x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4265
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4266 if (desired_row->used[TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4267 rif->write_glyphs (desired_row->glyphs[TEXT_AREA],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4268 desired_row->used[TEXT_AREA]);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4269
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4270 /* Clear to end of window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4271 rif->clear_end_of_line (-1);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4272 changed_p = 1;
44815
cf2454d3a103 (update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents: 44580
diff changeset
4273
cf2454d3a103 (update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents: 44580
diff changeset
4274 /* This erases the cursor. We do this here because
cf2454d3a103 (update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents: 44580
diff changeset
4275 notice_overwritten_cursor cannot easily check this, which
cf2454d3a103 (update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents: 44580
diff changeset
4276 might indicate that the whole functionality of
cf2454d3a103 (update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents: 44580
diff changeset
4277 notice_overwritten_cursor would better be implemented here.
cf2454d3a103 (update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents: 44580
diff changeset
4278 On the other hand, we need notice_overwritten_cursor as long
cf2454d3a103 (update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents: 44580
diff changeset
4279 as mouse highlighting is done asynchronously outside of
cf2454d3a103 (update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents: 44580
diff changeset
4280 redisplay. */
cf2454d3a103 (update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents: 44580
diff changeset
4281 if (vpos == w->phys_cursor.vpos)
cf2454d3a103 (update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents: 44580
diff changeset
4282 w->phys_cursor_on_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4283 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4284 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4285 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4286 int stop, i, x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4287 struct glyph *current_glyph = current_row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4288 struct glyph *desired_glyph = desired_row->glyphs[TEXT_AREA];
33596
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4289 int overlapping_glyphs_p = current_row->contains_overlapping_glyphs_p;
35268
d93bf580d166 (update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents: 35006
diff changeset
4290 int desired_stop_pos = desired_row->used[TEXT_AREA];
d93bf580d166 (update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents: 35006
diff changeset
4291
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4292 /* If the desired row extends its face to the text area end,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4293 make sure we write at least one glyph, so that the face
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4294 extension actually takes place. */
35269
ec15c68b25ba Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 35268
diff changeset
4295 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row))
35268
d93bf580d166 (update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents: 35006
diff changeset
4296 --desired_stop_pos;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4297
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4298 stop = min (current_row->used[TEXT_AREA], desired_stop_pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4299 i = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4300 x = desired_row->x;
36097
1dfaaf6d6166 (update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents: 35924
diff changeset
4301
1dfaaf6d6166 (update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents: 35924
diff changeset
4302 /* Loop over glyphs that current and desired row may have
1dfaaf6d6166 (update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents: 35924
diff changeset
4303 in common. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4304 while (i < stop)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4305 {
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4306 int can_skip_p = 1;
33596
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4307
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4308 /* Skip over glyphs that both rows have in common. These
33596
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4309 don't have to be written. We can't skip if the last
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4310 current glyph overlaps the glyph to its right. For
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4311 example, consider a current row of `if ' with the `f' in
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4312 Courier bold so that it overlaps the ` ' to its right.
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4313 If the desired row is ` ', we would skip over the space
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4314 after the `if' and there would remain a pixel from the
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4315 `f' on the screen. */
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4316 if (overlapping_glyphs_p && i > 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4317 {
33596
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4318 struct glyph *glyph = &current_row->glyphs[TEXT_AREA][i - 1];
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4319 int left, right;
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4320
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4321 rif->get_glyph_overhangs (glyph, XFRAME (w->frame),
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4322 &left, &right);
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4323 can_skip_p = right == 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4324 }
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4325
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4326 if (can_skip_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4327 {
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4328 while (i < stop
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4329 && GLYPH_EQUAL_P (desired_glyph, current_glyph))
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4330 {
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4331 x += desired_glyph->pixel_width;
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4332 ++desired_glyph, ++current_glyph, ++i;
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4333 }
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4334
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4335 /* Consider the case that the current row contains "xxx
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4336 ppp ggg" in italic Courier font, and the desired row
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4337 is "xxx ggg". The character `p' has lbearing, `g'
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4338 has not. The loop above will stop in front of the
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4339 first `p' in the current row. If we would start
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4340 writing glyphs there, we wouldn't erase the lbearing
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4341 of the `p'. The rest of the lbearing problem is then
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4342 taken care of by x_draw_glyphs. */
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4343 if (overlapping_glyphs_p
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4344 && i > 0
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4345 && i < current_row->used[TEXT_AREA]
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4346 && (current_row->used[TEXT_AREA]
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4347 != desired_row->used[TEXT_AREA]))
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4348 {
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4349 int left, right;
33596
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4350
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4351 rif->get_glyph_overhangs (current_glyph, XFRAME (w->frame),
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4352 &left, &right);
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4353 while (left > 0 && i > 0)
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4354 {
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4355 --i, --desired_glyph, --current_glyph;
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4356 x -= desired_glyph->pixel_width;
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4357 left -= desired_glyph->pixel_width;
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4358 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4359 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4360 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4361
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4362 /* Try to avoid writing the entire rest of the desired row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4363 by looking for a resync point. This mainly prevents
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4364 mode line flickering in the case the mode line is in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4365 fixed-pitch font, which it usually will be. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4366 if (i < desired_row->used[TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4367 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4368 int start_x = x, start_hpos = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4369 struct glyph *start = desired_glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4370 int current_x = x;
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4371 int skip_first_p = !can_skip_p;
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4372
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4373 /* Find the next glyph that's equal again. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4374 while (i < stop
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4375 && (skip_first_p
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4376 || !GLYPH_EQUAL_P (desired_glyph, current_glyph))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4377 && x == current_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4378 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4379 x += desired_glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4380 current_x += current_glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4381 ++desired_glyph, ++current_glyph, ++i;
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4382 skip_first_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4383 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4384
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4385 if (i == start_hpos || x != current_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4386 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4387 i = start_hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4388 x = start_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4389 desired_glyph = start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4390 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4391 }
33596
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4392
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4393 rif->cursor_to (vpos, start_hpos, desired_row->y, start_x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4394 rif->write_glyphs (start, i - start_hpos);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4395 changed_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4396 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4397 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4398
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4399 /* Write the rest. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4400 if (i < desired_row->used[TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4401 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4402 rif->cursor_to (vpos, i, desired_row->y, x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4403 rif->write_glyphs (desired_glyph, desired_row->used[TEXT_AREA] - i);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4404 changed_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4405 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4406
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4407 /* Maybe clear to end of line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4408 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4409 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4410 /* If new row extends to the end of the text area, nothing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4411 has to be cleared, if and only if we did a write_glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4412 above. This is made sure by setting desired_stop_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4413 appropriately above. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4414 xassert (i < desired_row->used[TEXT_AREA]);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4415 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4416 else if (MATRIX_ROW_EXTENDS_FACE_P (current_row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4417 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4418 /* If old row extends to the end of the text area, clear. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4419 if (i >= desired_row->used[TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4420 rif->cursor_to (vpos, i, desired_row->y,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4421 desired_row->x + desired_row->pixel_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4422 rif->clear_end_of_line (-1);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4423 changed_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4424 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4425 else if (desired_row->pixel_width < current_row->pixel_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4426 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4427 /* Otherwise clear to the end of the old row. Everything
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4428 after that position should be clear already. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4429 int x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4430
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4431 if (i >= desired_row->used[TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4432 rif->cursor_to (vpos, i, desired_row->y,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4433 desired_row->x + desired_row->pixel_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4434
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4435 /* If cursor is displayed at the end of the line, make sure
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4436 it's cleared. Nowadays we don't have a phys_cursor_glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4437 with which to erase the cursor (because this method
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4438 doesn't work with lbearing/rbearing), so we must do it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4439 this way. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4440 if (vpos == w->phys_cursor.vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4441 && w->phys_cursor.hpos >= desired_row->used[TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4442 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4443 w->phys_cursor_on_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4444 x = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4445 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4446 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4447 x = current_row->x + current_row->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4448 rif->clear_end_of_line (x);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4449 changed_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4450 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4451 }
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4452
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4453 return changed_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4454 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4455
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4456
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4457 /* Update row VPOS in window W. Value is non-zero if display has been
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4458 changed. */
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4459
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4460 static int
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4461 update_window_line (w, vpos, mouse_face_overwritten_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4462 struct window *w;
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4463 int vpos, *mouse_face_overwritten_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4464 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4465 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4466 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4467 int changed_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4468
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4469 /* Set the row being updated. This is important to let xterm.c
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4470 know what line height values are in effect. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4471 updated_row = desired_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4472
31690
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4473 /* A row can be completely invisible in case a desired matrix was
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4474 built with a vscroll and then make_cursor_line_fully_visible shifts
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4475 the matrix. Make sure to make such rows current anyway, since
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4476 we need the correct y-position, for example, in the current matrix. */
31726
59b455472b56 (update_window_line): Make sure to always draw
Gerd Moellmann <gerd@gnu.org>
parents: 31690
diff changeset
4477 if (desired_row->mode_line_p
59b455472b56 (update_window_line): Make sure to always draw
Gerd Moellmann <gerd@gnu.org>
parents: 31690
diff changeset
4478 || desired_row->visible_height > 0)
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4479 {
31690
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4480 xassert (desired_row->enabled_p);
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4481
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4482 /* Update display of the left margin area, if there is one. */
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4483 if (!desired_row->full_width_p
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4484 && !NILP (w->left_margin_width))
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4485 {
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4486 changed_p = 1;
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4487 update_marginal_area (w, LEFT_MARGIN_AREA, vpos);
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4488 }
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4489
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4490 /* Update the display of the text area. */
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4491 if (update_text_area (w, vpos))
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4492 {
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4493 changed_p = 1;
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4494 if (current_row->mouse_face_p)
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4495 *mouse_face_overwritten_p = 1;
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4496 }
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4497
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4498 /* Update display of the right margin area, if there is one. */
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4499 if (!desired_row->full_width_p
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4500 && !NILP (w->right_margin_width))
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4501 {
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4502 changed_p = 1;
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4503 update_marginal_area (w, RIGHT_MARGIN_AREA, vpos);
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4504 }
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4505
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4506 /* Draw truncation marks etc. */
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4507 if (!current_row->enabled_p
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4508 || desired_row->y != current_row->y
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4509 || desired_row->visible_height != current_row->visible_height
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4510 || desired_row->overlay_arrow_p != current_row->overlay_arrow_p
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4511 || desired_row->truncated_on_left_p != current_row->truncated_on_left_p
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4512 || desired_row->truncated_on_right_p != current_row->truncated_on_right_p
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4513 || desired_row->continued_p != current_row->continued_p
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4514 || desired_row->mode_line_p != current_row->mode_line_p
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4515 || (desired_row->indicate_empty_line_p
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4516 != current_row->indicate_empty_line_p)
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4517 || (MATRIX_ROW_CONTINUATION_LINE_P (desired_row)
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4518 != MATRIX_ROW_CONTINUATION_LINE_P (current_row)))
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4519 rif->after_update_window_line_hook (desired_row);
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4520 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4521
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4522 /* Update current_row from desired_row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4523 make_current (w->desired_matrix, w->current_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4524 updated_row = NULL;
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4525 return changed_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4526 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4527
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4528
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4529 /* Set the cursor after an update of window W. This function may only
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4530 be called from update_window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4531
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4532 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4533 set_window_cursor_after_update (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4534 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4535 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4536 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4537 int cx, cy, vpos, hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4538
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4539 /* Not intended for frame matrix updates. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4540 xassert (FRAME_WINDOW_P (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4541
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4542 if (cursor_in_echo_area
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4543 && !NILP (echo_area_buffer[0])
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4544 /* If we are showing a message instead of the mini-buffer,
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4545 show the cursor for the message instead. */
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4546 && XWINDOW (minibuf_window) == w
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4547 && EQ (minibuf_window, echo_area_window)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4548 /* These cases apply only to the frame that contains
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4549 the active mini-buffer window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4550 && FRAME_HAS_MINIBUF_P (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4551 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4552 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4553 cx = cy = vpos = hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4554
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4555 if (cursor_in_echo_area >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4556 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4557 /* If the mini-buffer is several lines high, find the last
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4558 line that has any text on it. Note: either all lines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4559 are enabled or none. Otherwise we wouldn't be able to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4560 determine Y. */
25190
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4561 struct glyph_row *row, *last_row;
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4562 struct glyph *glyph;
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4563 int yb = window_text_bottom_y (w);
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4564
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4565 last_row = NULL;
39254
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4566 row = w->current_matrix->rows;
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4567 while (row->enabled_p
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4568 && (last_row == NULL
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4569 || MATRIX_ROW_BOTTOM_Y (row) <= yb))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4570 {
25190
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4571 if (row->used[TEXT_AREA]
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4572 && row->glyphs[TEXT_AREA][0].charpos >= 0)
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4573 last_row = row;
39254
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4574 ++row;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4575 }
25190
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4576
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4577 if (last_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4578 {
39254
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4579 struct glyph *start = last_row->glyphs[TEXT_AREA];
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4580 struct glyph *last = start + last_row->used[TEXT_AREA] - 1;
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4581
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4582 while (last > start && last->charpos < 0)
25190
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4583 --last;
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4584
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4585 for (glyph = start; glyph < last; ++glyph)
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4586 {
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4587 cx += glyph->pixel_width;
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4588 ++hpos;
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4589 }
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4590
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4591 cy = last_row->y;
25190
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4592 vpos = MATRIX_ROW_VPOS (last_row, w->current_matrix);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4593 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4594 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4595 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4596 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4597 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4598 cx = w->cursor.x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4599 cy = w->cursor.y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4600 hpos = w->cursor.hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4601 vpos = w->cursor.vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4602 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4603
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4604 /* Window cursor can be out of sync for horizontally split windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4605 hpos = max (0, hpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4606 hpos = min (w->current_matrix->matrix_w - 1, hpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4607 vpos = max (0, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4608 vpos = min (w->current_matrix->nrows - 1, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4609 rif->cursor_to (vpos, hpos, cy, cx);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4610 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4611
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4612
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4613 /* Set WINDOW->must_be_updated_p to ON_P for all windows in the window
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4614 tree rooted at W. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4615
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4616 void
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4617 set_window_update_flags (w, on_p)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4618 struct window *w;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4619 int on_p;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4620 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4621 while (w)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4622 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4623 if (!NILP (w->hchild))
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4624 set_window_update_flags (XWINDOW (w->hchild), on_p);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4625 else if (!NILP (w->vchild))
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4626 set_window_update_flags (XWINDOW (w->vchild), on_p);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4627 else
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4628 w->must_be_updated_p = on_p;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4629
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4630 w = NILP (w->next) ? 0 : XWINDOW (w->next);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4631 }
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4632 }
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4633
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4634
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4635
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4636 /***********************************************************************
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4637 Window-Based Scrolling
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4638 ***********************************************************************/
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4639
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4640 /* Structure describing rows in scrolling_window. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4641
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4642 struct row_entry
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4643 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4644 /* Number of occurrences of this row in desired and current matrix. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4645 int old_uses, new_uses;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4646
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4647 /* Vpos of row in new matrix. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4648 int new_line_number;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4649
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4650 /* Bucket index of this row_entry in the hash table row_table. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4651 int bucket;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4652
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4653 /* The row described by this entry. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4654 struct glyph_row *row;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4655
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4656 /* Hash collision chain. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4657 struct row_entry *next;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4658 };
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4659
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4660 /* A pool to allocate row_entry structures from, and the size of the
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4661 pool. The pool is reallocated in scrolling_window when we find
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4662 that we need a larger one. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4663
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4664 static struct row_entry *row_entry_pool;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4665 static int row_entry_pool_size;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4666
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4667 /* Index of next free entry in row_entry_pool. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4668
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4669 static int row_entry_idx;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4670
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4671 /* The hash table used during scrolling, and the table's size. This
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4672 table is used to quickly identify equal rows in the desired and
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4673 current matrix. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4674
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4675 static struct row_entry **row_table;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4676 static int row_table_size;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4677
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4678 /* Vectors of pointers to row_entry structures belonging to the
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4679 current and desired matrix, and the size of the vectors. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4680
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4681 static struct row_entry **old_lines, **new_lines;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4682 static int old_lines_size, new_lines_size;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4683
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4684 /* A pool to allocate run structures from, and its size. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4685
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4686 static struct run *run_pool;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4687 static int runs_size;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4688
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4689 /* A vector of runs of lines found during scrolling. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4690
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4691 static struct run **runs;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4692
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4693 /* Add glyph row ROW to the scrolling hash table during the scrolling
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4694 of window W. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4695
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4696 static INLINE struct row_entry *
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4697 add_row_entry (w, row)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4698 struct window *w;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4699 struct glyph_row *row;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4700 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4701 struct row_entry *entry;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4702 int i = row->hash % row_table_size;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4703
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4704 entry = row_table[i];
30152
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
4705 while (entry && !row_equal_p (w, entry->row, row, 1))
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4706 entry = entry->next;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4707
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4708 if (entry == NULL)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4709 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4710 entry = row_entry_pool + row_entry_idx++;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4711 entry->row = row;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4712 entry->old_uses = entry->new_uses = 0;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4713 entry->new_line_number = 0;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4714 entry->bucket = i;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4715 entry->next = row_table[i];
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4716 row_table[i] = entry;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4717 }
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4718
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4719 return entry;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4720 }
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4721
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4722
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4723 /* Try to reuse part of the current display of W by scrolling lines.
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
4724 HEADER_LINE_P non-zero means W has a header line.
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4725
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4726 The algorithm is taken from Communications of the ACM, Apr78 "A
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4727 Technique for Isolating Differences Between Files." It should take
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4728 O(N) time.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4729
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4730 A short outline of the steps of the algorithm
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4731
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4732 1. Skip lines equal at the start and end of both matrices.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4733
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4734 2. Enter rows in the current and desired matrix into a symbol
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4735 table, counting how often they appear in both matrices.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4736
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4737 3. Rows that appear exactly once in both matrices serve as anchors,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4738 i.e. we assume that such lines are likely to have been moved.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4739
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4740 4. Starting from anchor lines, extend regions to be scrolled both
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4741 forward and backward.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4742
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4743 Value is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4744
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4745 -1 if all rows were found to be equal.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4746 0 to indicate that we did not scroll the display, or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4747 1 if we did scroll. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4748
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4749 static int
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
4750 scrolling_window (w, header_line_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4751 struct window *w;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
4752 int header_line_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4753 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4754 struct glyph_matrix *desired_matrix = w->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4755 struct glyph_matrix *current_matrix = w->current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4756 int yb = window_text_bottom_y (w);
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4757 int i, j, first_old, first_new, last_old, last_new;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4758 int nruns, nbytes, n, run_idx;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4759 struct row_entry *entry;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4760
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4761 /* Skip over rows equal at the start. */
31825
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4762 for (i = header_line_p ? 1 : 0; i < current_matrix->nrows - 1; ++i)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4763 {
31825
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4764 struct glyph_row *d = MATRIX_ROW (desired_matrix, i);
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4765 struct glyph_row *c = MATRIX_ROW (current_matrix, i);
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4766
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4767 if (c->enabled_p
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4768 && d->enabled_p
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4769 && c->y == d->y
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4770 && MATRIX_ROW_BOTTOM_Y (c) <= yb
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4771 && MATRIX_ROW_BOTTOM_Y (d) <= yb
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4772 && row_equal_p (w, c, d, 1))
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4773 {
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4774 assign_row (c, d);
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4775 d->enabled_p = 0;
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4776 }
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4777 else
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4778 break;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4779 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4780
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4781 /* Give up if some rows in the desired matrix are not enabled. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4782 if (!MATRIX_ROW (desired_matrix, i)->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4783 return -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4784
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4785 first_old = first_new = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4786
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4787 /* Set last_new to the index + 1 of the last enabled row in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4788 desired matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4789 i = first_new + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4790 while (i < desired_matrix->nrows - 1
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4791 && MATRIX_ROW (desired_matrix, i)->enabled_p
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4792 && MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (desired_matrix, i)) <= yb)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4793 ++i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4794
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4795 if (!MATRIX_ROW (desired_matrix, i)->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4796 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4797
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4798 last_new = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4799
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4800 /* Set last_old to the index + 1 of the last enabled row in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4801 current matrix. We don't look at the enabled flag here because
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4802 we plan to reuse part of the display even if other parts are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4803 disabled. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4804 i = first_old + 1;
34929
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4805 while (i < current_matrix->nrows - 1)
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4806 {
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4807 int bottom = MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (current_matrix, i));
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4808 if (bottom <= yb)
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4809 ++i;
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4810 if (bottom >= yb)
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4811 break;
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4812 }
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4813
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4814 last_old = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4815
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4816 /* Skip over rows equal at the bottom. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4817 i = last_new;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4818 j = last_old;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4819 while (i - 1 > first_new
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4820 && j - 1 > first_old
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4821 && MATRIX_ROW (current_matrix, i - 1)->enabled_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4822 && (MATRIX_ROW (current_matrix, i - 1)->y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4823 == MATRIX_ROW (desired_matrix, j - 1)->y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4824 && row_equal_p (w,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4825 MATRIX_ROW (desired_matrix, i - 1),
30152
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
4826 MATRIX_ROW (current_matrix, j - 1), 1))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4827 --i, --j;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4828 last_new = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4829 last_old = j;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4830
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4831 /* Nothing to do if all rows are equal. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4832 if (last_new == first_new)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4833 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4834
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4835 /* Reallocate vectors, tables etc. if necessary. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4836
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4837 if (current_matrix->nrows > old_lines_size)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4838 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4839 old_lines_size = current_matrix->nrows;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4840 nbytes = old_lines_size * sizeof *old_lines;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4841 old_lines = (struct row_entry **) xrealloc (old_lines, nbytes);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4842 }
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4843
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4844 if (desired_matrix->nrows > new_lines_size)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4845 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4846 new_lines_size = desired_matrix->nrows;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4847 nbytes = new_lines_size * sizeof *new_lines;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4848 new_lines = (struct row_entry **) xrealloc (new_lines, nbytes);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4849 }
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4850
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4851 n = desired_matrix->nrows + current_matrix->nrows;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4852 if (3 * n > row_table_size)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4853 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4854 row_table_size = next_almost_prime (3 * n);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4855 nbytes = row_table_size * sizeof *row_table;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4856 row_table = (struct row_entry **) xrealloc (row_table, nbytes);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4857 bzero (row_table, nbytes);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4858 }
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4859
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4860 if (n > row_entry_pool_size)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4861 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4862 row_entry_pool_size = n;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4863 nbytes = row_entry_pool_size * sizeof *row_entry_pool;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4864 row_entry_pool = (struct row_entry *) xrealloc (row_entry_pool, nbytes);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4865 }
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4866
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4867 if (desired_matrix->nrows > runs_size)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4868 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4869 runs_size = desired_matrix->nrows;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4870 nbytes = runs_size * sizeof *runs;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4871 runs = (struct run **) xrealloc (runs, nbytes);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4872 nbytes = runs_size * sizeof *run_pool;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4873 run_pool = (struct run *) xrealloc (run_pool, nbytes);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4874 }
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4875
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4876 nruns = run_idx = 0;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4877 row_entry_idx = 0;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4878
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4879 /* Add rows from the current and desired matrix to the hash table
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4880 row_hash_table to be able to find equal ones quickly. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4881
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4882 for (i = first_old; i < last_old; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4883 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4884 if (MATRIX_ROW (current_matrix, i)->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4885 {
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4886 entry = add_row_entry (w, MATRIX_ROW (current_matrix, i));
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4887 old_lines[i] = entry;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4888 ++entry->old_uses;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4889 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4890 else
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4891 old_lines[i] = NULL;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4892 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4893
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4894 for (i = first_new; i < last_new; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4895 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4896 xassert (MATRIX_ROW_ENABLED_P (desired_matrix, i));
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4897 entry = add_row_entry (w, MATRIX_ROW (desired_matrix, i));
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4898 ++entry->new_uses;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4899 entry->new_line_number = i;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4900 new_lines[i] = entry;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4901 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4902
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4903 /* Identify moves based on lines that are unique and equal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4904 in both matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4905 for (i = first_old; i < last_old;)
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4906 if (old_lines[i]
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4907 && old_lines[i]->old_uses == 1
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4908 && old_lines[i]->new_uses == 1)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4909 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4910 int j, k;
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4911 int new_line = old_lines[i]->new_line_number;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4912 struct run *run = run_pool + run_idx++;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4913
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4914 /* Record move. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4915 run->current_vpos = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4916 run->current_y = MATRIX_ROW (current_matrix, i)->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4917 run->desired_vpos = new_line;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4918 run->desired_y = MATRIX_ROW (desired_matrix, new_line)->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4919 run->nrows = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4920 run->height = MATRIX_ROW (current_matrix, i)->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4921
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4922 /* Extend backward. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4923 j = i - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4924 k = new_line - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4925 while (j > first_old
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4926 && k > first_new
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4927 && old_lines[j] == new_lines[k])
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4928 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4929 int h = MATRIX_ROW (current_matrix, j)->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4930 --run->current_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4931 --run->desired_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4932 ++run->nrows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4933 run->height += h;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4934 run->desired_y -= h;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4935 run->current_y -= h;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4936 --j, --k;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4937 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4938
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4939 /* Extend forward. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4940 j = i + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4941 k = new_line + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4942 while (j < last_old
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4943 && k < last_new
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4944 && old_lines[j] == new_lines[k])
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4945 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4946 int h = MATRIX_ROW (current_matrix, j)->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4947 ++run->nrows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4948 run->height += h;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4949 ++j, ++k;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4950 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4951
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4952 /* Insert run into list of all runs. Order runs by copied
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4953 pixel lines. Note that we record runs that don't have to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4954 be copied because they are already in place. This is done
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4955 because we can avoid calling update_window_line in this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4956 case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4957 for (j = 0; j < nruns && runs[j]->height > run->height; ++j)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4958 ;
34203
e55480843a8e (scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents: 33763
diff changeset
4959 for (k = nruns; k > j; --k)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4960 runs[k] = runs[k - 1];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4961 runs[j] = run;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4962 ++nruns;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4963
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4964 i += run->nrows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4965 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4966 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4967 ++i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4968
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4969 /* Do the moves. Do it in a way that we don't overwrite something
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4970 we want to copy later on. This is not solvable in general
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4971 because there is only one display and we don't have a way to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4972 exchange areas on this display. Example:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4973
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4974 +-----------+ +-----------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4975 | A | | B |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4976 +-----------+ --> +-----------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4977 | B | | A |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4978 +-----------+ +-----------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4979
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4980 Instead, prefer bigger moves, and invalidate moves that would
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4981 copy from where we copied to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4982
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4983 for (i = 0; i < nruns; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4984 if (runs[i]->nrows > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4985 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4986 struct run *r = runs[i];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4987
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4988 /* Copy on the display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4989 if (r->current_y != r->desired_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4990 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4991 rif->scroll_run_hook (w, r);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4992
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4993 /* Invalidate runs that copy from where we copied to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4994 for (j = i + 1; j < nruns; ++j)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4995 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4996 struct run *p = runs[j];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4997
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4998 if ((p->current_y >= r->desired_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4999 && p->current_y < r->desired_y + r->height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5000 || (p->current_y + p->height >= r->desired_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5001 && (p->current_y + p->height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5002 < r->desired_y + r->height)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5003 p->nrows = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5004 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5005 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5006
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5007 /* Assign matrix rows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5008 for (j = 0; j < r->nrows; ++j)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5009 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5010 struct glyph_row *from, *to;
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
5011 int to_overlapped_p;
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
5012
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5013 to = MATRIX_ROW (current_matrix, r->desired_vpos + j);
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
5014 from = MATRIX_ROW (desired_matrix, r->desired_vpos + j);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
5015 to_overlapped_p = to->overlapped_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5016 assign_row (to, from);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5017 to->enabled_p = 1, from->enabled_p = 0;
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
5018 to->overlapped_p = to_overlapped_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5019 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5020 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5021
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
5022 /* Clear the hash table, for the next time. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
5023 for (i = 0; i < row_entry_idx; ++i)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
5024 row_table[row_entry_pool[i].bucket] = NULL;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
5025
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5026 /* Value is non-zero to indicate that we scrolled the display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5027 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5028 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5029
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5030
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5031
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5032 /************************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5033 Frame-Based Updates
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5034 ************************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5035
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5036 /* Update the desired frame matrix of frame F.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5037
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5038 FORCE_P non-zero means that the update should not be stopped by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5039 pending input. INHIBIT_HAIRY_ID_P non-zero means that scrolling
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5040 should not be tried.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5041
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5042 Value is non-zero if update was stopped due to pending input. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5043
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5044 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5045 update_frame_1 (f, force_p, inhibit_id_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5046 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5047 int force_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5048 int inhibit_id_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5049 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5050 /* Frame matrices to work on. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5051 struct glyph_matrix *current_matrix = f->current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5052 struct glyph_matrix *desired_matrix = f->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5053 int i;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5054 int pause;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5055 int preempt_count = baud_rate / 2400 + 1;
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
5056 extern int input_pending;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5057
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5058 xassert (current_matrix && desired_matrix);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5059
10122
3de6776ae141 (update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents: 9963
diff changeset
5060 if (baud_rate != FRAME_COST_BAUD_RATE (f))
3de6776ae141 (update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents: 9963
diff changeset
5061 calculate_costs (f);
3de6776ae141 (update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents: 9963
diff changeset
5062
3357
d9523a958b3c (update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents: 3317
diff changeset
5063 if (preempt_count <= 0)
d9523a958b3c (update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents: 3317
diff changeset
5064 preempt_count = 1;
d9523a958b3c (update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents: 3317
diff changeset
5065
30720
64f3338f72d8 (Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30713
diff changeset
5066 if (redisplay_dont_pause)
64f3338f72d8 (Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30713
diff changeset
5067 force_p = 1;
64f3338f72d8 (Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30713
diff changeset
5068 else if (!force_p && detect_input_pending ())
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5069 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5070 pause = 1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5071 goto do_pause;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5072 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5073
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5074 /* If we cannot insert/delete lines, it's no use trying it. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5075 if (!line_ins_del_ok)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5076 inhibit_id_p = 1;
7188
7da4ad9a2a8f (update_frame): Move those assignments even farther down.
Richard M. Stallman <rms@gnu.org>
parents: 7179
diff changeset
5077
493
8b101799ff37 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 451
diff changeset
5078 /* See if any of the desired lines are enabled; don't compute for
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5079 i/d line if just want cursor motion. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5080 for (i = 0; i < desired_matrix->nrows; i++)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5081 if (MATRIX_ROW_ENABLED_P (desired_matrix, i))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5082 break;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5083
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5084 /* Try doing i/d line, if not yet inhibited. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5085 if (!inhibit_id_p && i < desired_matrix->nrows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5086 force_p |= scrolling (f);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5087
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5088 /* Update the individual lines as needed. Do bottom line first. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5089 if (MATRIX_ROW_ENABLED_P (desired_matrix, desired_matrix->nrows - 1))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5090 update_frame_line (f, desired_matrix->nrows - 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5091
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5092 /* Now update the rest of the lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5093 for (i = 0; i < desired_matrix->nrows - 1 && (force_p || !input_pending); i++)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5094 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5095 if (MATRIX_ROW_ENABLED_P (desired_matrix, i))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5096 {
960
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5097 if (FRAME_TERMCAP_P (f))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5098 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5099 /* Flush out every so many lines.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5100 Also flush out if likely to have more than 1k buffered
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5101 otherwise. I'm told that some telnet connections get
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5102 really screwed by more than 1k output at once. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5103 int outq = PENDING_OUTPUT_COUNT (stdout);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5104 if (outq > 900
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5105 || (outq > 20 && ((i - 1) % preempt_count == 0)))
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5106 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5107 fflush (stdout);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5108 if (preempt_count == 1)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5109 {
554
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
5110 #ifdef EMACS_OUTQSIZE
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
5111 if (EMACS_OUTQSIZE (0, &outq) < 0)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5112 /* Probably not a tty. Ignore the error and reset
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
5113 the outq count. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5114 outq = PENDING_OUTPUT_COUNT (stdout);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5115 #endif
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5116 outq *= 10;
7530
57c2345a9002 (update_frame): Fix test of outq and baud_rate some more.
Richard M. Stallman <rms@gnu.org>
parents: 7529
diff changeset
5117 if (baud_rate <= outq && baud_rate > 0)
3357
d9523a958b3c (update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents: 3317
diff changeset
5118 sleep (outq / baud_rate);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5119 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5120 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5121 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5122
16822
483e137d5384 (update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents: 16589
diff changeset
5123 if ((i - 1) % preempt_count == 0)
483e137d5384 (update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents: 16589
diff changeset
5124 detect_input_pending ();
483e137d5384 (update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents: 16589
diff changeset
5125
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5126 update_frame_line (f, i);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5127 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5128 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5129
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5130 pause = (i < FRAME_HEIGHT (f) - 1) ? i : 0;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5131
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5132 /* Now just clean up termcap drivers and set cursor, etc. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5133 if (!pause)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5134 {
12409
6e374b28ecc3 (update_frame): Pretend cursor is in echo area
Richard M. Stallman <rms@gnu.org>
parents: 12193
diff changeset
5135 if ((cursor_in_echo_area
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5136 /* If we are showing a message instead of the mini-buffer,
12627
c7bc7a24b1ff (update_frame): Check that the echo area is in the frame being displayed.
Richard M. Stallman <rms@gnu.org>
parents: 12532
diff changeset
5137 show the cursor for the message instead of for the
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5138 (now hidden) mini-buffer contents. */
12627
c7bc7a24b1ff (update_frame): Check that the echo area is in the frame being displayed.
Richard M. Stallman <rms@gnu.org>
parents: 12532
diff changeset
5139 || (EQ (minibuf_window, selected_window)
c7bc7a24b1ff (update_frame): Check that the echo area is in the frame being displayed.
Richard M. Stallman <rms@gnu.org>
parents: 12532
diff changeset
5140 && EQ (minibuf_window, echo_area_window)
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5141 && !NILP (echo_area_buffer[0])))
12627
c7bc7a24b1ff (update_frame): Check that the echo area is in the frame being displayed.
Richard M. Stallman <rms@gnu.org>
parents: 12532
diff changeset
5142 /* These cases apply only to the frame that contains
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5143 the active mini-buffer window. */
12627
c7bc7a24b1ff (update_frame): Check that the echo area is in the frame being displayed.
Richard M. Stallman <rms@gnu.org>
parents: 12532
diff changeset
5144 && FRAME_HAS_MINIBUF_P (f)
14459
c1d25453a95f (update_frame): Compare FRAME_MINIBUF_WINDOW(f)
Richard M. Stallman <rms@gnu.org>
parents: 14286
diff changeset
5145 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window))
708
030fb4635335 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 687
diff changeset
5146 {
1042
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5147 int top = XINT (XWINDOW (FRAME_MINIBUF_WINDOW (f))->top);
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5148 int row, col;
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5149
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5150 if (cursor_in_echo_area < 0)
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5151 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5152 /* Negative value of cursor_in_echo_area means put
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5153 cursor at beginning of line. */
1042
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5154 row = top;
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5155 col = 0;
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5156 }
708
030fb4635335 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 687
diff changeset
5157 else
1042
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5158 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5159 /* Positive value of cursor_in_echo_area means put
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5160 cursor at the end of the prompt. If the mini-buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5161 is several lines high, find the last line that has
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5162 any text on it. */
1042
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5163 row = FRAME_HEIGHT (f);
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5164 do
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5165 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5166 --row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5167 col = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5168
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5169 if (MATRIX_ROW_ENABLED_P (current_matrix, row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5170 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5171 /* Frame rows are filled up with spaces that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5172 must be ignored here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5173 struct glyph_row *r = MATRIX_ROW (current_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5174 row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5175 struct glyph *start = r->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5176 struct glyph *last = start + r->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5177
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5178 while (last > start
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5179 && (last - 1)->charpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5180 --last;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5181
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5182 col = last - start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5183 }
1042
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5184 }
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5185 while (row > top && col == 0);
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5186
21757
629f6df4a329 (update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
5187 /* Make sure COL is not out of range. */
21763
b685f9451792 (change_frame_size_1): Use FRAME_CURSOR_X_LIMIT.
Richard M. Stallman <rms@gnu.org>
parents: 21757
diff changeset
5188 if (col >= FRAME_CURSOR_X_LIMIT (f))
1042
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5189 {
21757
629f6df4a329 (update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
5190 /* If we have another row, advance cursor into it. */
1042
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5191 if (row < FRAME_HEIGHT (f) - 1)
21757
629f6df4a329 (update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
5192 {
629f6df4a329 (update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
5193 col = FRAME_LEFT_SCROLL_BAR_WIDTH (f);
629f6df4a329 (update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
5194 row++;
629f6df4a329 (update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
5195 }
629f6df4a329 (update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
5196 /* Otherwise move it back in range. */
629f6df4a329 (update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
5197 else
21763
b685f9451792 (change_frame_size_1): Use FRAME_CURSOR_X_LIMIT.
Richard M. Stallman <rms@gnu.org>
parents: 21757
diff changeset
5198 col = FRAME_CURSOR_X_LIMIT (f) - 1;
1042
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5199 }
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5200 }
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5201
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5202 cursor_to (row, col);
708
030fb4635335 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 687
diff changeset
5203 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5204 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5205 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5206 /* We have only one cursor on terminal frames. Use it to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5207 display the cursor of the selected window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5208 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f));
29687
5d67ef29764b (update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents: 29437
diff changeset
5209 if (w->cursor.vpos >= 0
5d67ef29764b (update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents: 29437
diff changeset
5210 /* The cursor vpos may be temporarily out of bounds
5d67ef29764b (update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents: 29437
diff changeset
5211 in the following situation: There is one window,
5d67ef29764b (update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents: 29437
diff changeset
5212 with the cursor in the lower half of it. The window
5d67ef29764b (update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents: 29437
diff changeset
5213 is split, and a message causes a redisplay before
5d67ef29764b (update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents: 29437
diff changeset
5214 a new cursor position has been computed. */
5d67ef29764b (update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents: 29437
diff changeset
5215 && w->cursor.vpos < XFASTINT (w->height))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5216 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5217 int x = WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5218 int y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5219
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5220 if (INTEGERP (w->left_margin_width))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5221 x += XFASTINT (w->left_margin_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5222
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5223 /* x = max (min (x, FRAME_WINDOW_WIDTH (f) - 1), 0); */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5224 cursor_to (y, x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5225 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5226 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5227 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5228
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5229 do_pause:
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5230
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5231 clear_desired_matrices (f);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5232 return pause;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5233 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5234
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5235
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5236 /* Do line insertions/deletions on frame F for frame-based redisplay. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5237
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
5238 int
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5239 scrolling (frame)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5240 struct frame *frame;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5241 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5242 int unchanged_at_top, unchanged_at_bottom;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5243 int window_size;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5244 int changed_lines;
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5245 int *old_hash = (int *) alloca (FRAME_HEIGHT (frame) * sizeof (int));
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5246 int *new_hash = (int *) alloca (FRAME_HEIGHT (frame) * sizeof (int));
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5247 int *draw_cost = (int *) alloca (FRAME_HEIGHT (frame) * sizeof (int));
10259
48e4dfc6bb43 (scrolling): Fewer restrictions if scroll_region_ok is
Richard M. Stallman <rms@gnu.org>
parents: 10122
diff changeset
5248 int *old_draw_cost = (int *) alloca (FRAME_HEIGHT (frame) * sizeof (int));
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5249 register int i;
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5250 int free_at_end_vpos = FRAME_HEIGHT (frame);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5251 struct glyph_matrix *current_matrix = frame->current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5252 struct glyph_matrix *desired_matrix = frame->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5253
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5254 if (!current_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5255 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5256
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5257 /* Compute hash codes of all the lines. Also calculate number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5258 changed lines, number of unchanged lines at the beginning, and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5259 number of unchanged lines at the end. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5260 changed_lines = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5261 unchanged_at_top = 0;
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5262 unchanged_at_bottom = FRAME_HEIGHT (frame);
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5263 for (i = 0; i < FRAME_HEIGHT (frame); i++)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5264 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5265 /* Give up on this scrolling if some old lines are not enabled. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5266 if (!MATRIX_ROW_ENABLED_P (current_matrix, i))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5267 return 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5268 old_hash[i] = line_hash_code (MATRIX_ROW (current_matrix, i));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5269 if (! MATRIX_ROW_ENABLED_P (desired_matrix, i))
18015
934a44a3b34f (scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents: 17961
diff changeset
5270 {
934a44a3b34f (scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents: 17961
diff changeset
5271 /* This line cannot be redrawn, so don't let scrolling mess it. */
934a44a3b34f (scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents: 17961
diff changeset
5272 new_hash[i] = old_hash[i];
934a44a3b34f (scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents: 17961
diff changeset
5273 #define INFINITY 1000000 /* Taken from scroll.c */
934a44a3b34f (scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents: 17961
diff changeset
5274 draw_cost[i] = INFINITY;
934a44a3b34f (scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents: 17961
diff changeset
5275 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5276 else
18015
934a44a3b34f (scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents: 17961
diff changeset
5277 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5278 new_hash[i] = line_hash_code (MATRIX_ROW (desired_matrix, i));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5279 draw_cost[i] = line_draw_cost (desired_matrix, i);
18015
934a44a3b34f (scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents: 17961
diff changeset
5280 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5281
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5282 if (old_hash[i] != new_hash[i])
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5283 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5284 changed_lines++;
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5285 unchanged_at_bottom = FRAME_HEIGHT (frame) - i - 1;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5286 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5287 else if (i == unchanged_at_top)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5288 unchanged_at_top++;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5289 old_draw_cost[i] = line_draw_cost (current_matrix, i);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5290 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5291
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5292 /* If changed lines are few, don't allow preemption, don't scroll. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5293 if ((!scroll_region_ok && changed_lines < baud_rate / 2400)
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5294 || unchanged_at_bottom == FRAME_HEIGHT (frame))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5295 return 1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5296
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5297 window_size = (FRAME_HEIGHT (frame) - unchanged_at_top
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5298 - unchanged_at_bottom);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5299
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5300 if (scroll_region_ok)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5301 free_at_end_vpos -= unchanged_at_bottom;
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5302 else if (memory_below_frame)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5303 free_at_end_vpos = -1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5304
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5305 /* If large window, fast terminal and few lines in common between
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5306 current frame and desired frame, don't bother with i/d calc. */
10259
48e4dfc6bb43 (scrolling): Fewer restrictions if scroll_region_ok is
Richard M. Stallman <rms@gnu.org>
parents: 10122
diff changeset
5307 if (!scroll_region_ok && window_size >= 18 && baud_rate > 2400
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5308 && (window_size >=
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5309 10 * scrolling_max_lines_saved (unchanged_at_top,
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5310 FRAME_HEIGHT (frame) - unchanged_at_bottom,
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5311 old_hash, new_hash, draw_cost)))
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5312 return 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5313
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5314 if (window_size < 2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5315 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5316
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5317 scrolling_1 (frame, window_size, unchanged_at_top, unchanged_at_bottom,
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5318 draw_cost + unchanged_at_top - 1,
10259
48e4dfc6bb43 (scrolling): Fewer restrictions if scroll_region_ok is
Richard M. Stallman <rms@gnu.org>
parents: 10122
diff changeset
5319 old_draw_cost + unchanged_at_top - 1,
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5320 old_hash + unchanged_at_top - 1,
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5321 new_hash + unchanged_at_top - 1,
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5322 free_at_end_vpos - unchanged_at_top);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5323
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5324 return 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5325 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5326
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5327
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5328 /* Count the number of blanks at the start of the vector of glyphs R
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5329 which is LEN glyphs long. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5330
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5331 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5332 count_blanks (r, len)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5333 struct glyph *r;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5334 int len;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5335 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5336 int i;
33101
39cd5f99c67d (update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
5337
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5338 for (i = 0; i < len; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5339 if (!CHAR_GLYPH_SPACE_P (r[i]))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5340 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5341
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5342 return i;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5343 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5344
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5345
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5346 /* Count the number of glyphs in common at the start of the glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5347 vectors STR1 and STR2. END1 is the end of STR1 and END2 is the end
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5348 of STR2. Value is the number of equal glyphs equal at the start. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5349
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5350 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5351 count_match (str1, end1, str2, end2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5352 struct glyph *str1, *end1, *str2, *end2;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5353 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5354 struct glyph *p1 = str1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5355 struct glyph *p2 = str2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5356
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5357 while (p1 < end1
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5358 && p2 < end2
26998
02e902f732d1 (line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents: 26902
diff changeset
5359 && GLYPH_CHAR_AND_FACE_EQUAL_P (p1, p2))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5360 ++p1, ++p2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5361
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5362 return p1 - str1;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5363 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5364
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5365
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5366 /* Char insertion/deletion cost vector, from term.c */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5367
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5368 extern int *char_ins_del_vector;
16267
05ca2cb9fe0f (make_frame_glyphs, update_line, update_frame)
Richard M. Stallman <rms@gnu.org>
parents: 16256
diff changeset
5369 #define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_WINDOW_WIDTH((f))])
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5370
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5371
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5372 /* Perform a frame-based update on line VPOS in frame FRAME. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5373
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5374 static void
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5375 update_frame_line (f, vpos)
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5376 struct frame *f;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5377 int vpos;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5378 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5379 struct glyph *obody, *nbody, *op1, *op2, *np1, *nend;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5380 int tem;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5381 int osp, nsp, begmatch, endmatch, olen, nlen;
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5382 struct glyph_matrix *current_matrix = f->current_matrix;
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5383 struct glyph_matrix *desired_matrix = f->desired_matrix;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5384 struct glyph_row *current_row = MATRIX_ROW (current_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5385 struct glyph_row *desired_row = MATRIX_ROW (desired_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5386 int must_write_whole_line_p;
33101
39cd5f99c67d (update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
5387 int write_spaces_p = must_write_spaces;
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5388 int colored_spaces_p = (FACE_FROM_ID (f, DEFAULT_FACE_ID)->background
33101
39cd5f99c67d (update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
5389 != FACE_TTY_DEFAULT_BG_COLOR);
39cd5f99c67d (update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
5390
39cd5f99c67d (update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
5391 if (colored_spaces_p)
39cd5f99c67d (update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
5392 write_spaces_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5393
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5394 /* Current row not enabled means it has unknown contents. We must
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5395 write the whole desired line in that case. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5396 must_write_whole_line_p = !current_row->enabled_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5397 if (must_write_whole_line_p)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5398 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5399 obody = 0;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5400 olen = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5401 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5402 else
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5403 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5404 obody = MATRIX_ROW_GLYPH_START (current_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5405 olen = current_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5406
40075
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
5407 /* Ignore trailing spaces, if we can. */
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
5408 if (!write_spaces_p)
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
5409 while (olen > 0 && CHAR_GLYPH_SPACE_P (obody[olen-1]))
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
5410 olen--;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5411 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5412
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5413 current_row->enabled_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5414 current_row->used[TEXT_AREA] = desired_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5415
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5416 /* If desired line is empty, just clear the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5417 if (!desired_row->enabled_p)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5418 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5419 nlen = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5420 goto just_erase;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5421 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5422
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5423 nbody = desired_row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5424 nlen = desired_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5425 nend = nbody + nlen;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5426
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5427 /* If display line has unknown contents, write the whole line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5428 if (must_write_whole_line_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5429 {
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5430 /* Ignore spaces at the end, if we can. */
33101
39cd5f99c67d (update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
5431 if (!write_spaces_p)
25313
6b4475fbef86 (update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents: 25304
diff changeset
5432 while (nlen > 0 && CHAR_GLYPH_SPACE_P (nbody[nlen - 1]))
6b4475fbef86 (update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents: 25304
diff changeset
5433 --nlen;
6b4475fbef86 (update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents: 25304
diff changeset
5434
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5435 /* Write the contents of the desired line. */
25313
6b4475fbef86 (update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents: 25304
diff changeset
5436 if (nlen)
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5437 {
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5438 cursor_to (vpos, 0);
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5439 write_glyphs (nbody, nlen);
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5440 }
25313
6b4475fbef86 (update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents: 25304
diff changeset
5441
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5442 /* Don't call clear_end_of_line if we already wrote the whole
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5443 line. The cursor will not be at the right margin in that
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5444 case but in the line below. */
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5445 if (nlen < FRAME_WINDOW_WIDTH (f))
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5446 {
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5447 cursor_to (vpos, nlen);
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5448 clear_end_of_line (FRAME_WINDOW_WIDTH (f));
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5449 }
28682
f05d48759416 (update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
5450 else
f05d48759416 (update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
5451 /* Make sure we are in the right row, otherwise cursor movement
f05d48759416 (update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
5452 with cmgoto might use `ch' in the wrong row. */
f05d48759416 (update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
5453 cursor_to (vpos, 0);
f05d48759416 (update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
5454
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5455 make_current (desired_matrix, current_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5456 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5457 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5458
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5459 /* Pretend trailing spaces are not there at all,
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5460 unless for one reason or another we must write all spaces. */
40075
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
5461 if (!write_spaces_p)
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
5462 while (nlen > 0 && CHAR_GLYPH_SPACE_P (nbody[nlen - 1]))
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
5463 nlen--;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5464
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5465 /* If there's no i/d char, quickly do the best we can without it. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5466 if (!char_ins_del_ok)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5467 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5468 int i, j;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5469
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5470 /* Find the first glyph in desired row that doesn't agree with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5471 a glyph in the current row, and write the rest from there on. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5472 for (i = 0; i < nlen; i++)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5473 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5474 if (i >= olen || !GLYPH_EQUAL_P (nbody + i, obody + i))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5475 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5476 /* Find the end of the run of different glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5477 j = i + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5478 while (j < nlen
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5479 && (j >= olen
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5480 || !GLYPH_EQUAL_P (nbody + j, obody + j)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5481 || CHAR_GLYPH_PADDING_P (nbody[j])))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5482 ++j;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5483
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5484 /* Output this run of non-matching chars. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5485 cursor_to (vpos, i);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5486 write_glyphs (nbody + i, j - i);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5487 i = j - 1;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5488
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5489 /* Now find the next non-match. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5490 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5491 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5492
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5493 /* Clear the rest of the line, or the non-clear part of it. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5494 if (olen > nlen)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5495 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5496 cursor_to (vpos, nlen);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5497 clear_end_of_line (olen);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5498 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5499
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5500 /* Make current row = desired row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5501 make_current (desired_matrix, current_matrix, vpos);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5502 return;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5503 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5504
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5505 /* Here when CHAR_INS_DEL_OK != 0, i.e. we can insert or delete
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5506 characters in a row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5507
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5508 if (!olen)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5509 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5510 /* If current line is blank, skip over initial spaces, if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5511 possible, and write the rest. */
40075
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
5512 if (write_spaces_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5513 nsp = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5514 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5515 nsp = count_blanks (nbody, nlen);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5516
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5517 if (nlen > nsp)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5518 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5519 cursor_to (vpos, nsp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5520 write_glyphs (nbody + nsp, nlen - nsp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5521 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5522
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5523 /* Exchange contents between current_frame and new_frame. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5524 make_current (desired_matrix, current_matrix, vpos);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5525 return;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5526 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5527
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5528 /* Compute number of leading blanks in old and new contents. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5529 osp = count_blanks (obody, olen);
40075
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
5530 nsp = (colored_spaces_p ? 0 : count_blanks (nbody, nlen));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5531
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5532 /* Compute number of matching chars starting with first non-blank. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5533 begmatch = count_match (obody + osp, obody + olen,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5534 nbody + nsp, nbody + nlen);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5535
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5536 /* Spaces in new match implicit space past the end of old. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5537 /* A bug causing this to be a no-op was fixed in 18.29. */
33101
39cd5f99c67d (update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
5538 if (!write_spaces_p && osp + begmatch == olen)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5539 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5540 np1 = nbody + nsp;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5541 while (np1 + begmatch < nend && CHAR_GLYPH_SPACE_P (np1[begmatch]))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5542 ++begmatch;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5543 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5544
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5545 /* Avoid doing insert/delete char
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5546 just cause number of leading spaces differs
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5547 when the following text does not match. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5548 if (begmatch == 0 && osp != nsp)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5549 osp = nsp = min (osp, nsp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5550
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5551 /* Find matching characters at end of line */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5552 op1 = obody + olen;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5553 np1 = nbody + nlen;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5554 op2 = op1 + begmatch - min (olen - osp, nlen - nsp);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5555 while (op1 > op2
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5556 && GLYPH_EQUAL_P (op1 - 1, np1 - 1))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5557 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5558 op1--;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5559 np1--;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5560 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5561 endmatch = obody + olen - op1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5562
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5563 /* tem gets the distance to insert or delete.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5564 endmatch is how many characters we save by doing so.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5565 Is it worth it? */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5566
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5567 tem = (nlen - nsp) - (olen - osp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5568 if (endmatch && tem
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5569 && (!char_ins_del_ok || endmatch <= char_ins_del_cost (f)[tem]))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5570 endmatch = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5571
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5572 /* nsp - osp is the distance to insert or delete.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5573 If that is nonzero, begmatch is known to be nonzero also.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5574 begmatch + endmatch is how much we save by doing the ins/del.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5575 Is it worth it? */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5576
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5577 if (nsp != osp
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5578 && (!char_ins_del_ok
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5579 || begmatch + endmatch <= char_ins_del_cost (f)[nsp - osp]))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5580 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5581 begmatch = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5582 endmatch = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5583 osp = nsp = min (osp, nsp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5584 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5585
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5586 /* Now go through the line, inserting, writing and
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5587 deleting as appropriate. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5588
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5589 if (osp > nsp)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5590 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5591 cursor_to (vpos, nsp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5592 delete_glyphs (osp - nsp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5593 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5594 else if (nsp > osp)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5595 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5596 /* If going to delete chars later in line
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5597 and insert earlier in the line,
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5598 must delete first to avoid losing data in the insert */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5599 if (endmatch && nlen < olen + nsp - osp)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5600 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5601 cursor_to (vpos, nlen - endmatch + osp - nsp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5602 delete_glyphs (olen + nsp - osp - nlen);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5603 olen = nlen - (nsp - osp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5604 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5605 cursor_to (vpos, osp);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5606 insert_glyphs (0, nsp - osp);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5607 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5608 olen += nsp - osp;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5609
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5610 tem = nsp + begmatch + endmatch;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5611 if (nlen != tem || olen != tem)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5612 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5613 if (!endmatch || nlen == olen)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5614 {
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5615 /* If new text being written reaches right margin, there is
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5616 no need to do clear-to-eol at the end of this function
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5617 (and it would not be safe, since cursor is not going to
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5618 be "at the margin" after the text is done). */
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5619 if (nlen == FRAME_WINDOW_WIDTH (f))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5620 olen = 0;
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5621
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5622 /* Function write_glyphs is prepared to do nothing
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5623 if passed a length <= 0. Check it here to avoid
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5624 unnecessary cursor movement. */
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5625 if (nlen - tem > 0)
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5626 {
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5627 cursor_to (vpos, nsp + begmatch);
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5628 write_glyphs (nbody + nsp + begmatch, nlen - tem);
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5629 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5630 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5631 else if (nlen > olen)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5632 {
17015
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5633 /* Here, we used to have the following simple code:
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5634 ----------------------------------------
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5635 write_glyphs (nbody + nsp + begmatch, olen - tem);
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5636 insert_glyphs (nbody + nsp + begmatch + olen - tem, nlen - olen);
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5637 ----------------------------------------
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5638 but it doesn't work if nbody[nsp + begmatch + olen - tem]
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5639 is a padding glyph. */
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5640 int out = olen - tem; /* Columns to be overwritten originally. */
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5641 int del;
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5642
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5643 cursor_to (vpos, nsp + begmatch);
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5644
17015
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5645 /* Calculate columns we can actually overwrite. */
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5646 while (CHAR_GLYPH_PADDING_P (nbody[nsp + begmatch + out]))
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5647 out--;
17015
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5648 write_glyphs (nbody + nsp + begmatch, out);
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5649
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5650 /* If we left columns to be overwritten, we must delete them. */
17015
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5651 del = olen - tem - out;
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5652 if (del > 0)
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5653 delete_glyphs (del);
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5654
17015
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5655 /* At last, we insert columns not yet written out. */
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5656 insert_glyphs (nbody + nsp + begmatch + out, nlen - olen + del);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5657 olen = nlen;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5658 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5659 else if (olen > nlen)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5660 {
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5661 cursor_to (vpos, nsp + begmatch);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5662 write_glyphs (nbody + nsp + begmatch, nlen - tem);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5663 delete_glyphs (olen - nlen);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5664 olen = nlen;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5665 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5666 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5667
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5668 just_erase:
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5669 /* If any unerased characters remain after the new line, erase them. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5670 if (olen > nlen)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5671 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5672 cursor_to (vpos, nlen);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5673 clear_end_of_line (olen);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5674 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5675
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5676 /* Exchange contents between current_frame and new_frame. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5677 make_current (desired_matrix, current_matrix, vpos);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5678 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5679
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5680
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5681
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5682 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5683 X/Y Position -> Buffer Position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5684 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5685
36697
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5686 /* Determine what's under window-relative pixel position (*X, *Y).
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5687 Return in *OBJECT the object (string or buffer) that's there.
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5688 Return in *POS the position in that object. Adjust *X and *Y
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5689 to character boundaries. */
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5690
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5691 void
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5692 buffer_posn_from_coords (w, x, y, object, pos)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5693 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5694 int *x, *y;
36697
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5695 Lisp_Object *object;
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5696 struct display_pos *pos;
7810
15c0bf73737e (Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7808
diff changeset
5697 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5698 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5699 struct buffer *old_current_buffer = current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5700 struct text_pos startp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5701 int left_area_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5702
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5703 current_buffer = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5704 SET_TEXT_POS_FROM_MARKER (startp, w->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5705 CHARPOS (startp) = min (ZV, max (BEGV, CHARPOS (startp)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5706 BYTEPOS (startp) = min (ZV_BYTE, max (BEGV_BYTE, BYTEPOS (startp)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5707 start_display (&it, w, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5708
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5709 left_area_width = WINDOW_DISPLAY_LEFT_AREA_PIXEL_WIDTH (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5710 move_it_to (&it, -1, *x + it.first_visible_x - left_area_width, *y, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5711 MOVE_TO_X | MOVE_TO_Y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5712
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5713 *x = it.current_x - it.first_visible_x + left_area_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5714 *y = it.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5715 current_buffer = old_current_buffer;
36697
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5716
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5717 *object = STRINGP (it.string) ? it.string : w->buffer;
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5718 *pos = it.current;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5719 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5720
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5721
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5722 /* Value is the string under window-relative coordinates X/Y in the
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
5723 mode or header line of window W, or nil if none. MODE_LINE_P non-zero
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5724 means look at the mode line. *CHARPOS is set to the position in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5725 the string returned. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5726
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5727 Lisp_Object
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5728 mode_line_string (w, x, y, mode_line_p, charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5729 struct window *w;
30713
fee809f81f97 (mode_line_string): Declare parameter MODE_LINE_P.
Gerd Moellmann <gerd@gnu.org>
parents: 30323
diff changeset
5730 int x, y, mode_line_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5731 int *charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5732 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5733 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5734 struct glyph *glyph, *end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5735 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5736 int x0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5737 Lisp_Object string = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5738
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5739 if (mode_line_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5740 row = MATRIX_MODE_LINE_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5741 else
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
5742 row = MATRIX_HEADER_LINE_ROW (w->current_matrix);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5743
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5744 if (row->mode_line_p && row->enabled_p)
11919
31cb053405f2 (Fframe_or_buffer_changed_p): Record frame names
Karl Heuer <kwzh@gnu.org>
parents: 11914
diff changeset
5745 {
41120
7f07991cc0b2 Fringe cleanup.
Kim F. Storm <storm@cua.dk>
parents: 41069
diff changeset
5746 /* The mode lines are displayed over scroll bars and fringes,
7f07991cc0b2 Fringe cleanup.
Kim F. Storm <storm@cua.dk>
parents: 41069
diff changeset
5747 and X is window-relative. Correct X by the scroll bar
7f07991cc0b2 Fringe cleanup.
Kim F. Storm <storm@cua.dk>
parents: 41069
diff changeset
5748 and fringe width. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5749 if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5750 x += FRAME_SCROLL_BAR_COLS (f) * CANON_X_UNIT (f);
41120
7f07991cc0b2 Fringe cleanup.
Kim F. Storm <storm@cua.dk>
parents: 41069
diff changeset
5751 x += FRAME_LEFT_FRINGE_WIDTH (f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5752
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5753 /* Find the glyph under X. If we find one with a string object,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5754 it's the one we were looking for. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5755 glyph = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5756 end = glyph + row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5757 for (x0 = 0; glyph < end; x0 += glyph->pixel_width, ++glyph)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5758 if (x >= x0 && x < x0 + glyph->pixel_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5759 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5760 string = glyph->object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5761 *charpos = glyph->charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5762 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5763 }
7810
15c0bf73737e (Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7808
diff changeset
5764 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5765
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5766 return string;
7810
15c0bf73737e (Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7808
diff changeset
5767 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5768
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5769
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5770 /* Value is the string under window-relative coordinates X/Y in either
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5771 marginal area, or nil if none. *CHARPOS is set to the position in
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5772 the string returned. */
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5773
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5774 Lisp_Object
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5775 marginal_area_string (w, x, y, area, charpos)
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5776 struct window *w;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5777 int x, y;
44580
79c7463828d6 (marginal_area_string): Sort arguments.
Pavel Janík <Pavel@Janik.cz>
parents: 44536
diff changeset
5778 int area;
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5779 int *charpos;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5780 {
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5781 struct glyph_row *row = w->current_matrix->rows;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5782 struct glyph *glyph, *end;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5783 int x0, i, wy = y;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5784 Lisp_Object string = Qnil;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5785
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5786 if (area == 6)
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5787 area = LEFT_MARGIN_AREA;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5788 else if (area == 7)
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5789 area = RIGHT_MARGIN_AREA;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5790 else
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5791 abort ();
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5792
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5793 for (i = 0; row->enabled_p && i < w->current_matrix->nrows; ++i, ++row)
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5794 if (wy >= row->y && wy < MATRIX_ROW_BOTTOM_Y (row))
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5795 break;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5796
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5797 if (row->enabled_p)
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5798 {
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5799 /* Find the glyph under X. If we find one with a string object,
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5800 it's the one we were looking for. */
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5801 glyph = row->glyphs[area];
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5802 end = glyph + row->used[area];
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5803 if (area == RIGHT_MARGIN_AREA)
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5804 x0 = (window_box_width (w, TEXT_AREA)
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5805 + window_box_width (w, LEFT_MARGIN_AREA));
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5806 else
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5807 x0 = 0;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5808 for (; glyph < end; x0 += glyph->pixel_width, ++glyph)
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5809 if (x >= x0 && x < x0 + glyph->pixel_width)
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5810 {
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5811 string = glyph->object;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5812 *charpos = glyph->charpos;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5813 break;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5814 }
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5815 }
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5816
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5817 return string;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5818 }
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5819
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5820
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5821 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5822 Changing Frame Sizes
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5823 ***********************************************************************/
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5824
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5825 #ifdef SIGWINCH
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5826
493
8b101799ff37 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 451
diff changeset
5827 SIGTYPE
10745
a553a08f5785 (window_change_signal): Add ignored argument.
Richard M. Stallman <rms@gnu.org>
parents: 10259
diff changeset
5828 window_change_signal (signalnum) /* If we don't have an argument, */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5829 int signalnum; /* some compilers complain in signal calls. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5830 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5831 int width, height;
31093
6da961dff718 Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30720
diff changeset
5832 #ifndef USE_CRT_DLL
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5833 extern int errno;
31093
6da961dff718 Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30720
diff changeset
5834 #endif
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5835 int old_errno = errno;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5836
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5837 get_frame_size (&width, &height);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5838
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5839 /* The frame size change obviously applies to a termcap-controlled
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5840 frame. Find such a frame in the list, and assume it's the only
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5841 one (since the redisplay code always writes to stdout, not a
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5842 FILE * specified in the frame structure). Record the new size,
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5843 but don't reallocate the data structures now. Let that be done
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5844 later outside of the signal handler. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5845
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5846 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2198
diff changeset
5847 Lisp_Object tail, frame;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5848
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2198
diff changeset
5849 FOR_EACH_FRAME (tail, frame)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5850 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2198
diff changeset
5851 if (FRAME_TERMCAP_P (XFRAME (frame)))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5852 {
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5853 change_frame_size (XFRAME (frame), height, width, 0, 1, 0);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5854 break;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5855 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5856 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5857 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5858
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5859 signal (SIGWINCH, window_change_signal);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5860 errno = old_errno;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5861 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5862 #endif /* SIGWINCH */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5863
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5864
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5865 /* Do any change in frame size that was requested by a signal. SAFE
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5866 non-zero means this function is called from a place where it is
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5867 safe to change frame sizes while a redisplay is in progress. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5868
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
5869 void
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5870 do_pending_window_change (safe)
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5871 int safe;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5872 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5873 /* If window_change_signal should have run before, run it now. */
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5874 if (redisplaying_p && !safe)
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5875 return;
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5876
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5877 while (delayed_size_change)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5878 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2198
diff changeset
5879 Lisp_Object tail, frame;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5880
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5881 delayed_size_change = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5882
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2198
diff changeset
5883 FOR_EACH_FRAME (tail, frame)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5884 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5885 struct frame *f = XFRAME (frame);
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2198
diff changeset
5886
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5887 int height = FRAME_NEW_HEIGHT (f);
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5888 int width = FRAME_NEW_WIDTH (f);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5889
3449
ad455da9b789 (do_pending_window_change): No need to clear
Richard M. Stallman <rms@gnu.org>
parents: 3357
diff changeset
5890 if (height != 0 || width != 0)
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5891 change_frame_size (f, height, width, 0, 0, safe);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5892 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5893 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5894 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5895
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5896
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5897 /* Change the frame height and/or width. Values may be given as zero to
960
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5898 indicate no change is to take place.
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5899
960
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5900 If DELAY is non-zero, then assume we're being called from a signal
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5901 handler, and queue the change for later - perhaps the next
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5902 redisplay. Since this tries to resize windows, we can't call it
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5903 from a signal handler.
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5904
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5905 SAFE non-zero means this function is called from a place where it's
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5906 safe to change frame sizes while a redisplay is in progress. */
960
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5907
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
5908 void
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5909 change_frame_size (f, newheight, newwidth, pretend, delay, safe)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5910 register struct frame *f;
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5911 int newheight, newwidth, pretend, delay, safe;
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5912 {
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5913 Lisp_Object tail, frame;
16881
245ba9f2781a (change_frame_size_1): Reject new sizes if they cause overflow.
Richard M. Stallman <rms@gnu.org>
parents: 16822
diff changeset
5914
15395
b584c2db055f (change_frame_size, remake_frame_glyphs): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15394
diff changeset
5915 if (! FRAME_WINDOW_P (f))
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5916 {
15394
8d01f71c4797 (Fredraw_frame, remake_frame_glyphs)
Richard M. Stallman <rms@gnu.org>
parents: 15282
diff changeset
5917 /* When using termcap, or on MS-DOS, all frames use
8d01f71c4797 (Fredraw_frame, remake_frame_glyphs)
Richard M. Stallman <rms@gnu.org>
parents: 15282
diff changeset
5918 the same screen, so a change in size affects all frames. */
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5919 FOR_EACH_FRAME (tail, frame)
15395
b584c2db055f (change_frame_size, remake_frame_glyphs): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15394
diff changeset
5920 if (! FRAME_WINDOW_P (XFRAME (frame)))
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5921 change_frame_size_1 (XFRAME (frame), newheight, newwidth,
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5922 pretend, delay, safe);
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5923 }
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5924 else
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5925 change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe);
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5926 }
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5927
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5928 static void
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5929 change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5930 register struct frame *f;
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5931 int newheight, newwidth, pretend, delay, safe;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5932 {
16256
1ce0cb94fa68 (preserve_other_columns, preserve_my_columns): Use new
Richard M. Stallman <rms@gnu.org>
parents: 16195
diff changeset
5933 int new_frame_window_width;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 44890
diff changeset
5934 int count = SPECPDL_INDEX ();
16881
245ba9f2781a (change_frame_size_1): Reject new sizes if they cause overflow.
Richard M. Stallman <rms@gnu.org>
parents: 16822
diff changeset
5935
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5936 /* If we can't deal with the change now, queue it for later. */
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5937 if (delay || (redisplaying_p && !safe))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5938 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5939 FRAME_NEW_HEIGHT (f) = newheight;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5940 FRAME_NEW_WIDTH (f) = newwidth;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5941 delayed_size_change = 1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5942 return;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5943 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5944
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5945 /* This size-change overrides any pending one for this frame. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5946 FRAME_NEW_HEIGHT (f) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5947 FRAME_NEW_WIDTH (f) = 0;
960
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5948
3449
ad455da9b789 (do_pending_window_change): No need to clear
Richard M. Stallman <rms@gnu.org>
parents: 3357
diff changeset
5949 /* If an argument is zero, set it to the current value. */
15896
3a3c30116313 (change_frame_size_1): Clean up conditional.
Erik Naggum <erik@naggum.no>
parents: 15687
diff changeset
5950 if (newheight == 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5951 newheight = FRAME_HEIGHT (f);
15896
3a3c30116313 (change_frame_size_1): Clean up conditional.
Erik Naggum <erik@naggum.no>
parents: 15687
diff changeset
5952 if (newwidth == 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5953 newwidth = FRAME_WIDTH (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5954
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5955 /* Compute width of windows in F.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5956 This is the width of the frame without vertical scroll bars. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5957 new_frame_window_width = FRAME_WINDOW_WIDTH_ARG (f, newwidth);
16881
245ba9f2781a (change_frame_size_1): Reject new sizes if they cause overflow.
Richard M. Stallman <rms@gnu.org>
parents: 16822
diff changeset
5958
960
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5959 /* Round up to the smallest acceptable size. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5960 check_frame_size (f, &newheight, &newwidth);
960
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5961
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5962 /* If we're not changing the frame size, quit now. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5963 if (newheight == FRAME_HEIGHT (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5964 && new_frame_window_width == FRAME_WINDOW_WIDTH (f))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5965 return;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5966
15078
a295c26b5d67 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 15065
diff changeset
5967 BLOCK_INPUT;
a295c26b5d67 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 15065
diff changeset
5968
14286
5d42664b4e74 (change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
5969 #ifdef MSDOS
5d42664b4e74 (change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
5970 /* We only can set screen dimensions to certain values supported
5d42664b4e74 (change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
5971 by our video hardware. Try to find the smallest size greater
5d42664b4e74 (change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
5972 or equal to the requested dimensions. */
5d42664b4e74 (change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
5973 dos_set_window_size (&newheight, &newwidth);
5d42664b4e74 (change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
5974 #endif
5d42664b4e74 (change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
5975
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5976 if (newheight != FRAME_HEIGHT (f))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5977 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5978 if (FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5979 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5980 /* Frame has both root and mini-buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5981 XSETFASTINT (XWINDOW (FRAME_ROOT_WINDOW (f))->top,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5982 FRAME_TOP_MARGIN (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5983 set_window_height (FRAME_ROOT_WINDOW (f),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5984 (newheight
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5985 - 1
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5986 - FRAME_TOP_MARGIN (f)),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5987 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5988 XSETFASTINT (XWINDOW (FRAME_MINIBUF_WINDOW (f))->top,
9303
3115ae493c30 (direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents: 9264
diff changeset
5989 newheight - 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5990 set_window_height (FRAME_MINIBUF_WINDOW (f), 1, 0);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5991 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5992 else
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5993 /* Frame has just one top-level window. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5994 set_window_height (FRAME_ROOT_WINDOW (f),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5995 newheight - FRAME_TOP_MARGIN (f), 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5996
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5997 if (FRAME_TERMCAP_P (f) && !pretend)
960
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5998 FrameRows = newheight;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5999 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6000
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6001 if (new_frame_window_width != FRAME_WINDOW_WIDTH (f))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6002 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6003 set_window_width (FRAME_ROOT_WINDOW (f), new_frame_window_width, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6004 if (FRAME_HAS_MINIBUF_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6005 set_window_width (FRAME_MINIBUF_WINDOW (f), new_frame_window_width, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6006
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6007 if (FRAME_TERMCAP_P (f) && !pretend)
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
6008 FrameCols = newwidth;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6009
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
6010 if (WINDOWP (f->tool_bar_window))
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
6011 XSETFASTINT (XWINDOW (f->tool_bar_window)->width, newwidth);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6012 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6013
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6014 FRAME_HEIGHT (f) = newheight;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6015 SET_FRAME_WIDTH (f, newwidth);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6016
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6017 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6018 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6019 int text_area_x, text_area_y, text_area_width, text_area_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6020
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6021 window_box (w, TEXT_AREA, &text_area_x, &text_area_y, &text_area_width,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6022 &text_area_height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6023 if (w->cursor.x >= text_area_x + text_area_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6024 w->cursor.hpos = w->cursor.x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6025 if (w->cursor.y >= text_area_y + text_area_height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6026 w->cursor.vpos = w->cursor.y = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6027 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6028
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6029 adjust_glyphs (f);
40512
d256f6fc9c05 (change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents: 40334
diff changeset
6030 calculate_costs (f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6031 SET_FRAME_GARBAGED (f);
40512
d256f6fc9c05 (change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents: 40334
diff changeset
6032 f->resized_p = 1;
15065
270020829d09 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 14964
diff changeset
6033
270020829d09 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 14964
diff changeset
6034 UNBLOCK_INPUT;
17282
5023bea28298 (change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents: 17015
diff changeset
6035
19627
c6343f7a9c6c (change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents: 19063
diff changeset
6036 record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
c6343f7a9c6c (change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents: 19063
diff changeset
6037
17282
5023bea28298 (change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents: 17015
diff changeset
6038 /* This isn't quite a no-op: it runs window-configuration-change-hook. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6039 Fset_window_buffer (FRAME_SELECTED_WINDOW (f),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6040 XWINDOW (FRAME_SELECTED_WINDOW (f))->buffer);
19627
c6343f7a9c6c (change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents: 19063
diff changeset
6041
c6343f7a9c6c (change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents: 19063
diff changeset
6042 unbind_to (count, Qnil);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6043 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6044
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6045
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6046
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6047 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6048 Terminal Related Lisp Functions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6049 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6050
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6051 DEFUN ("open-termscript", Fopen_termscript, Sopen_termscript,
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6052 1, 1, "FOpen termscript file: ",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6053 doc: /* Start writing all terminal output to FILE as well as the terminal.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6054 FILE = nil means just close any termscript file currently open. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6055 (file)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6056 Lisp_Object file;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6057 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6058 if (termscript != 0) fclose (termscript);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6059 termscript = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6060
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6061 if (! NILP (file))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6062 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6063 file = Fexpand_file_name (file, Qnil);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
6064 termscript = fopen (SDATA (file), "w");
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6065 if (termscript == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6066 report_file_error ("Opening termscript", Fcons (file, Qnil));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6067 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6068 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6069 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6070
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6071
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6072 DEFUN ("send-string-to-terminal", Fsend_string_to_terminal,
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6073 Ssend_string_to_terminal, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6074 doc: /* Send STRING to the terminal without alteration.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6075 Control characters in STRING will have terminal-dependent effects. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6076 (string)
14068
a3c83dde295e (Fsend_string_to_terminal, Fsit_for): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents: 13526
diff changeset
6077 Lisp_Object string;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6078 {
20618
d5acac3af6e3 (Fsend_string_to_terminal): Use size_byte.
Richard M. Stallman <rms@gnu.org>
parents: 19627
diff changeset
6079 /* ??? Perhaps we should do something special for multibyte strings here. */
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40512
diff changeset
6080 CHECK_STRING (string);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
6081 fwrite (SDATA (string), 1, SBYTES (string), stdout);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6082 fflush (stdout);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6083 if (termscript)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6084 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
6085 fwrite (SDATA (string), 1, SBYTES (string),
21244
50929073a0ba Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6086 termscript);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6087 fflush (termscript);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6088 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6089 return Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6090 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6091
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6092
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6093 DEFUN ("ding", Fding, Sding, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6094 doc: /* Beep, or flash the screen.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6095 Also, unless an argument is given,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6096 terminate any keyboard macro currently executing. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6097 (arg)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6098 Lisp_Object arg;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6099 {
493
8b101799ff37 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 451
diff changeset
6100 if (!NILP (arg))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6101 {
649
61deba7b73b6 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 587
diff changeset
6102 if (noninteractive)
61deba7b73b6 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 587
diff changeset
6103 putchar (07);
61deba7b73b6 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 587
diff changeset
6104 else
61deba7b73b6 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 587
diff changeset
6105 ring_bell ();
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6106 fflush (stdout);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6107 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6108 else
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6109 bitch_at_user ();
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6110
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6111 return Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6112 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6113
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
6114 void
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6115 bitch_at_user ()
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6116 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6117 if (noninteractive)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6118 putchar (07);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6119 else if (!INTERACTIVE) /* Stop executing a keyboard macro. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6120 error ("Keyboard macro terminated by a command ringing the bell");
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6121 else
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6122 ring_bell ();
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6123 fflush (stdout);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6124 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6125
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6126
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6127
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6128 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6129 Sleeping, Waiting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6130 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6131
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6132 DEFUN ("sleep-for", Fsleep_for, Ssleep_for, 1, 2, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6133 doc: /* Pause, without updating display, for SECONDS seconds.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6134 SECONDS may be a floating-point value, meaning that you can wait for a
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6135 fraction of a second. Optional second arg MILLISECONDS specifies an
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6136 additional wait period, in milliseconds; this may be useful if your
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6137 Emacs was built without floating point support.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6138 \(Not all operating systems support waiting for a fraction of a second.) */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6139 (seconds, milliseconds)
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6140 Lisp_Object seconds, milliseconds;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6141 {
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6142 int sec, usec;
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6143
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6144 if (NILP (milliseconds))
9264
9338a124ea84 (redraw_frame, Fsleep_for, sit_for, Fsit_for): Use new accessor macros instead
Karl Heuer <kwzh@gnu.org>
parents: 8903
diff changeset
6145 XSETINT (milliseconds, 0);
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6146 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40512
diff changeset
6147 CHECK_NUMBER (milliseconds);
2648
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6148 usec = XINT (milliseconds) * 1000;
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6149
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6150 {
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6151 double duration = extract_float (seconds);
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6152 sec = (int) duration;
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6153 usec += (duration - sec) * 1000000;
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6154 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6155
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6156 #ifndef EMACS_HAS_USECS
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6157 if (sec == 0 && usec != 0)
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6158 error ("millisecond `sleep-for' not supported on %s", SYSTEM_TYPE);
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6159 #endif
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6160
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6161 /* Assure that 0 <= usec < 1000000. */
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6162 if (usec < 0)
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6163 {
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
6164 /* We can't rely on the rounding being correct if usec is negative. */
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6165 if (-1000000 < usec)
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6166 sec--, usec += 1000000;
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6167 else
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6168 sec -= -usec / 1000000, usec = 1000000 - (-usec % 1000000);
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6169 }
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6170 else
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6171 sec += usec / 1000000, usec %= 1000000;
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6172
14646
68fe10d1abd0 (Fsleep_for): Accept sub-second intervals.
Erik Naggum <erik@naggum.no>
parents: 14459
diff changeset
6173 if (sec < 0 || (sec == 0 && usec == 0))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6174 return Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6175
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6176 {
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6177 Lisp_Object zero;
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6178
9303
3115ae493c30 (direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents: 9264
diff changeset
6179 XSETFASTINT (zero, 0);
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6180 wait_reading_process_input (sec, usec, zero, 0);
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6181 }
587
1c2d1836941a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 554
diff changeset
6182
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6183 /* We should always have wait_reading_process_input; we have a dummy
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6184 implementation for systems which don't support subprocesses. */
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6185 #if 0
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6186 /* No wait_reading_process_input */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6187 immediate_quit = 1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6188 QUIT;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6189
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6190 #ifdef VMS
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6191 sys_sleep (sec);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6192 #else /* not VMS */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6193 /* The reason this is done this way
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6194 (rather than defined (H_S) && defined (H_T))
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
6195 is because the VMS preprocessor doesn't grok `defined'. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6196 #ifdef HAVE_SELECT
554
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
6197 EMACS_GET_TIME (end_time);
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
6198 EMACS_SET_SECS_USECS (timeout, sec, usec);
587
1c2d1836941a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 554
diff changeset
6199 EMACS_ADD_TIME (end_time, end_time, timeout);
554
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
6200
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6201 while (1)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6202 {
554
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
6203 EMACS_GET_TIME (timeout);
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
6204 EMACS_SUB_TIME (timeout, end_time, timeout);
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
6205 if (EMACS_TIME_NEG_P (timeout)
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
6206 || !select (1, 0, 0, 0, &timeout))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6207 break;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6208 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6209 #else /* not HAVE_SELECT */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6210 sleep (sec);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6211 #endif /* HAVE_SELECT */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6212 #endif /* not VMS */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6213
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6214 immediate_quit = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6215 #endif /* no subprocesses */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6216
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6217 return Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6218 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6219
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6220
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6221 /* This is just like wait_reading_process_input, except that
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6222 it does the redisplay.
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6223
5223
db2e7e6a488e (Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents: 5218
diff changeset
6224 It's also much like Fsit_for, except that it can be used for
11411
91bcce2fd486 (Fframe_or_buffer_changed_p): Ignore buffers whose names start with space.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
6225 waiting for input as well. */
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6226
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6227 Lisp_Object
17961
86ae1679df19 (sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents: 17895
diff changeset
6228 sit_for (sec, usec, reading, display, initial_display)
86ae1679df19 (sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents: 17895
diff changeset
6229 int sec, usec, reading, display, initial_display;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6230 {
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6231 Lisp_Object read_kbd;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6232
14964
9938201005a3 (sit_for): Call swallow_events.
Richard M. Stallman <rms@gnu.org>
parents: 14903
diff changeset
6233 swallow_events (display);
9938201005a3 (sit_for): Call swallow_events.
Richard M. Stallman <rms@gnu.org>
parents: 14903
diff changeset
6234
43729
5b4c5b84bb9d (sit_for): Don't wait if executing a kbd macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 43713
diff changeset
6235 if (detect_input_pending_run_timers (display) || !NILP (Vexecuting_macro))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6236 return Qnil;
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6237
17961
86ae1679df19 (sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents: 17895
diff changeset
6238 if (initial_display)
35336
002c02db42d3 Call redisplay_preserve_echo_area with additional arg.
Gerd Moellmann <gerd@gnu.org>
parents: 35307
diff changeset
6239 redisplay_preserve_echo_area (2);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6240
673
6217fa6e2cab *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 650
diff changeset
6241 if (sec == 0 && usec == 0)
6217fa6e2cab *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 650
diff changeset
6242 return Qt;
6217fa6e2cab *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 650
diff changeset
6243
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6244 #ifdef SIGIO
1915
98ecf99d7b1a * dispnew.c (sit_for): Pass the correct number of arguments to
Jim Blandy <jimb@redhat.com>
parents: 1872
diff changeset
6245 gobble_input (0);
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6246 #endif
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6247
9264
9338a124ea84 (redraw_frame, Fsleep_for, sit_for, Fsit_for): Use new accessor macros instead
Karl Heuer <kwzh@gnu.org>
parents: 8903
diff changeset
6248 XSETINT (read_kbd, reading ? -1 : 1);
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6249 wait_reading_process_input (sec, usec, read_kbd, display);
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6250
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6251 return detect_input_pending () ? Qnil : Qt;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6252 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6253
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6254
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6255 DEFUN ("sit-for", Fsit_for, Ssit_for, 1, 3, 0,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6256 doc: /* Perform redisplay, then wait for SECONDS seconds or until input is available.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6257 SECONDS may be a floating-point value, meaning that you can wait for a
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6258 fraction of a second. Optional second arg MILLISECONDS specifies an
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6259 additional wait period, in milliseconds; this may be useful if your
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6260 Emacs was built without floating point support.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6261 \(Not all operating systems support waiting for a fraction of a second.)
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6262 Optional third arg NODISP non-nil means don't redisplay, just wait for input.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6263 Redisplay is preempted as always if input arrives, and does not happen
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6264 if input is available before it starts.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6265 Value is t if waited the full time with no input arriving. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6266 (seconds, milliseconds, nodisp)
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6267 Lisp_Object seconds, milliseconds, nodisp;
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6268 {
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6269 int sec, usec;
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6270
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6271 if (NILP (milliseconds))
9264
9338a124ea84 (redraw_frame, Fsleep_for, sit_for, Fsit_for): Use new accessor macros instead
Karl Heuer <kwzh@gnu.org>
parents: 8903
diff changeset
6272 XSETINT (milliseconds, 0);
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6273 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40512
diff changeset
6274 CHECK_NUMBER (milliseconds);
2648
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6275 usec = XINT (milliseconds) * 1000;
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6276
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6277 {
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6278 double duration = extract_float (seconds);
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6279 sec = (int) duration;
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6280 usec += (duration - sec) * 1000000;
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6281 }
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6282
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6283 #ifndef EMACS_HAS_USECS
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6284 if (usec != 0 && sec == 0)
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6285 error ("millisecond `sit-for' not supported on %s", SYSTEM_TYPE);
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6286 #endif
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6287
17961
86ae1679df19 (sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents: 17895
diff changeset
6288 return sit_for (sec, usec, 0, NILP (nodisp), NILP (nodisp));
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6289 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6290
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6291
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6292
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6293 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6294 Other Lisp Functions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6295 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6296
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6297 /* A vector of size >= 2 * NFRAMES + 3 * NBUFFERS + 1, containing the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6298 session's frames, frame names, buffers, buffer-read-only flags, and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6299 buffer-modified-flags, and a trailing sentinel (so we don't need to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6300 add length checks). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6301
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6302 static Lisp_Object frame_and_buffer_state;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6303
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6304
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6305 DEFUN ("frame-or-buffer-changed-p", Fframe_or_buffer_changed_p,
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6306 Sframe_or_buffer_changed_p, 0, 0, 0,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6307 doc: /* Return non-nil if the frame and buffer state appears to have changed.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6308 The state variable is an internal vector containing all frames and buffers,
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6309 aside from buffers whose names start with space,
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6310 along with the buffers' read-only and modified flags, which allows a fast
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6311 check to see whether the menu bars might need to be recomputed.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6312 If this function returns non-nil, it updates the internal vector to reflect
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6313 the current state. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6314 ()
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6315 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6316 Lisp_Object tail, frame, buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6317 Lisp_Object *vecp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6318 int n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6319
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6320 vecp = XVECTOR (frame_and_buffer_state)->contents;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6321 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6322 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6323 if (!EQ (*vecp++, frame))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6324 goto changed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6325 if (!EQ (*vecp++, XFRAME (frame)->name))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6326 goto changed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6327 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6328 /* Check that the buffer info matches.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6329 No need to test for the end of the vector
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6330 because the last element of the vector is lambda
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6331 and that will always cause a mismatch. */
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
6332 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6333 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
6334 buf = XCDR (XCAR (tail));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6335 /* Ignore buffers that aren't included in buffer lists. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
6336 if (SREF (XBUFFER (buf)->name, 0) == ' ')
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6337 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6338 if (!EQ (*vecp++, buf))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6339 goto changed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6340 if (!EQ (*vecp++, XBUFFER (buf)->read_only))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6341 goto changed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6342 if (!EQ (*vecp++, Fbuffer_modified_p (buf)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6343 goto changed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6344 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6345 /* Detect deletion of a buffer at the end of the list. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6346 if (EQ (*vecp, Qlambda))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6347 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6348 changed:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6349 /* Start with 1 so there is room for at least one lambda at the end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6350 n = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6351 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6352 n += 2;
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
6353 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6354 n += 3;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6355 /* Reallocate the vector if it's grown, or if it's shrunk a lot. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6356 if (n > XVECTOR (frame_and_buffer_state)->size
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6357 || n + 20 < XVECTOR (frame_and_buffer_state)->size / 2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6358 /* Add 20 extra so we grow it less often. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6359 frame_and_buffer_state = Fmake_vector (make_number (n + 20), Qlambda);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6360 vecp = XVECTOR (frame_and_buffer_state)->contents;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6361 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6362 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6363 *vecp++ = frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6364 *vecp++ = XFRAME (frame)->name;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6365 }
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
6366 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6367 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
6368 buf = XCDR (XCAR (tail));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6369 /* Ignore buffers that aren't included in buffer lists. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
6370 if (SREF (XBUFFER (buf)->name, 0) == ' ')
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6371 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6372 *vecp++ = buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6373 *vecp++ = XBUFFER (buf)->read_only;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6374 *vecp++ = Fbuffer_modified_p (buf);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6375 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6376 /* Fill up the vector with lambdas (always at least one). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6377 *vecp++ = Qlambda;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6378 while (vecp - XVECTOR (frame_and_buffer_state)->contents
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6379 < XVECTOR (frame_and_buffer_state)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6380 *vecp++ = Qlambda;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6381 /* Make sure we didn't overflow the vector. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6382 if (vecp - XVECTOR (frame_and_buffer_state)->contents
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6383 > XVECTOR (frame_and_buffer_state)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6384 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6385 return Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6386 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6387
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6388
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6389
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6390 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6391 Initialization
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6392 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6393
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6394 char *terminal_type;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6395
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6396 /* Initialization done when Emacs fork is started, before doing stty.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6397 Determine terminal type and set terminal_driver. Then invoke its
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6398 decoding routine to set up variables in the terminal package. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6399
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
6400 void
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6401 init_display ()
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6402 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6403 #ifdef HAVE_X_WINDOWS
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6404 extern int display_arg;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6405 #endif
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6406
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6407 /* Construct the space glyph. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6408 space_glyph.type = CHAR_GLYPH;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6409 SET_CHAR_GLYPH_FROM_GLYPH (space_glyph, ' ');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6410 space_glyph.charpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6411
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6412 meta_key = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6413 inverse_video = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6414 cursor_in_echo_area = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6415 terminal_type = (char *) 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6416
2339
a302de11debf * dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents: 2292
diff changeset
6417 /* Now is the time to initialize this; it's used by init_sys_modes
a302de11debf * dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents: 2292
diff changeset
6418 during startup. */
a302de11debf * dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents: 2292
diff changeset
6419 Vwindow_system = Qnil;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6420
2339
a302de11debf * dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents: 2292
diff changeset
6421 /* If the user wants to use a window system, we shouldn't bother
a302de11debf * dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents: 2292
diff changeset
6422 initializing the terminal. This is especially important when the
a302de11debf * dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents: 2292
diff changeset
6423 terminal is so dumb that emacs gives up before and doesn't bother
a302de11debf * dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents: 2292
diff changeset
6424 using the window system.
a302de11debf * dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents: 2292
diff changeset
6425
14125
2f222e8b06f5 (init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents: 14068
diff changeset
6426 If the DISPLAY environment variable is set and nonempty,
2f222e8b06f5 (init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents: 14068
diff changeset
6427 try to use X, and die with an error message if that doesn't work. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6428
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6429 #ifdef HAVE_X_WINDOWS
2359
90a5f91329f3 * dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents: 2339
diff changeset
6430 if (! display_arg)
90a5f91329f3 * dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents: 2339
diff changeset
6431 {
14125
2f222e8b06f5 (init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents: 14068
diff changeset
6432 char *display;
2359
90a5f91329f3 * dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents: 2339
diff changeset
6433 #ifdef VMS
14125
2f222e8b06f5 (init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents: 14068
diff changeset
6434 display = getenv ("DECW$DISPLAY");
2359
90a5f91329f3 * dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents: 2339
diff changeset
6435 #else
14125
2f222e8b06f5 (init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents: 14068
diff changeset
6436 display = getenv ("DISPLAY");
2359
90a5f91329f3 * dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents: 2339
diff changeset
6437 #endif
14125
2f222e8b06f5 (init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents: 14068
diff changeset
6438
2f222e8b06f5 (init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents: 14068
diff changeset
6439 display_arg = (display != 0 && *display != 0);
2364
9a8a5570e842 Fix typo.
Jim Blandy <jimb@redhat.com>
parents: 2359
diff changeset
6440 }
2359
90a5f91329f3 * dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents: 2339
diff changeset
6441
18774
95b4ac950a5d (init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents: 18015
diff changeset
6442 if (!inhibit_window_system && display_arg
95b4ac950a5d (init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents: 18015
diff changeset
6443 #ifndef CANNOT_DUMP
95b4ac950a5d (init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents: 18015
diff changeset
6444 && initialized
95b4ac950a5d (init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents: 18015
diff changeset
6445 #endif
95b4ac950a5d (init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents: 18015
diff changeset
6446 )
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6447 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6448 Vwindow_system = intern ("x");
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6449 #ifdef HAVE_X11
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6450 Vwindow_system_version = make_number (11);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6451 #else
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6452 Vwindow_system_version = make_number (10);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6453 #endif
41969
e669966d496e Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents: 41120
diff changeset
6454 #if defined (GNU_LINUX) && defined (HAVE_LIBNCURSES)
15273
db889dd732a1 (init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents: 15078
diff changeset
6455 /* In some versions of ncurses,
15282
7db3a832db9e Comment fix.
Karl Heuer <kwzh@gnu.org>
parents: 15273
diff changeset
6456 tputs crashes if we have not called tgetent.
15273
db889dd732a1 (init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents: 15078
diff changeset
6457 So call tgetent. */
db889dd732a1 (init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents: 15078
diff changeset
6458 { char b[2044]; tgetent (b, "xterm");}
db889dd732a1 (init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents: 15078
diff changeset
6459 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6460 adjust_frame_glyphs_initially ();
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6461 return;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6462 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6463 #endif /* HAVE_X_WINDOWS */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6464
13408
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6465 #ifdef HAVE_NTGUI
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6466 if (!inhibit_window_system)
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6467 {
16589
ec300a10e407 (init_display) [HAVE_NTGUI]: Use w32 for window-system.
Geoff Voelker <voelker@cs.washington.edu>
parents: 16412
diff changeset
6468 Vwindow_system = intern ("w32");
13408
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6469 Vwindow_system_version = make_number (1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6470 adjust_frame_glyphs_initially ();
13408
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6471 return;
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6472 }
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6473 #endif /* HAVE_NTGUI */
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6474
44890
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents: 44815
diff changeset
6475 #ifdef MAC_OS
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32468
diff changeset
6476 if (!inhibit_window_system)
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32468
diff changeset
6477 {
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32468
diff changeset
6478 Vwindow_system = intern ("mac");
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32468
diff changeset
6479 Vwindow_system_version = make_number (1);
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32468
diff changeset
6480 adjust_frame_glyphs_initially ();
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32468
diff changeset
6481 return;
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32468
diff changeset
6482 }
44890
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents: 44815
diff changeset
6483 #endif /* MAC_OS */
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32468
diff changeset
6484
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6485 /* If no window system has been specified, try to use the terminal. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6486 if (! isatty (0))
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6487 {
16896
b2c51d6de440 (init_display): Use `fatal'.
Richard M. Stallman <rms@gnu.org>
parents: 16891
diff changeset
6488 fatal ("standard input is not a tty");
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6489 exit (1);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6490 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6491
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
6492 /* Look at the TERM variable. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6493 terminal_type = (char *) getenv ("TERM");
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6494 if (!terminal_type)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6495 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6496 #ifdef VMS
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6497 fprintf (stderr, "Please specify your terminal type.\n\
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6498 For types defined in VMS, use set term /device=TYPE.\n\
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6499 For types not defined in VMS, use define emacs_term \"TYPE\".\n\
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6500 \(The quotation marks are necessary since terminal types are lower case.)\n");
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6501 #else
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6502 fprintf (stderr, "Please set the environment variable TERM; see tset(1).\n");
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6503 #endif
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6504 exit (1);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6505 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6506
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6507 #ifdef VMS
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6508 /* VMS DCL tends to up-case things, so down-case term type.
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6509 Hardly any uppercase letters in terminal types; should be none. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6510 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6511 char *new = (char *) xmalloc (strlen (terminal_type) + 1);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6512 char *p;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6513
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6514 strcpy (new, terminal_type);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6515
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6516 for (p = new; *p; p++)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6517 if (isupper (*p))
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6518 *p = tolower (*p);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6519
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6520 terminal_type = new;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6521 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6522 #endif /* VMS */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6523
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6524 term_init (terminal_type);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6525
16891
989845750a4d (init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents: 16881
diff changeset
6526 {
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6527 struct frame *sf = SELECTED_FRAME ();
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6528 int width = FRAME_WINDOW_WIDTH (sf);
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6529 int height = FRAME_HEIGHT (sf);
16891
989845750a4d (init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents: 16881
diff changeset
6530
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6531 unsigned int total_glyphs = height * (width + 2) * sizeof (struct glyph);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6532
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6533 /* If these sizes are so big they cause overflow, just ignore the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6534 change. It's not clear what better we could do. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6535 if (total_glyphs / sizeof (struct glyph) / height != width + 2)
16896
b2c51d6de440 (init_display): Use `fatal'.
Richard M. Stallman <rms@gnu.org>
parents: 16891
diff changeset
6536 fatal ("screen size %dx%d too big", width, height);
16891
989845750a4d (init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents: 16881
diff changeset
6537 }
989845750a4d (init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents: 16881
diff changeset
6538
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6539 adjust_frame_glyphs_initially ();
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6540 calculate_costs (XFRAME (selected_frame));
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6541
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6542 #ifdef SIGWINCH
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6543 #ifndef CANNOT_DUMP
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6544 if (initialized)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6545 #endif /* CANNOT_DUMP */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6546 signal (SIGWINCH, window_change_signal);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6547 #endif /* SIGWINCH */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6548
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6549 /* Set up faces of the initial terminal frame of a dumped Emacs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6550 if (initialized
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6551 && !noninteractive
25118
08ae9ffe6763 (init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents: 25012
diff changeset
6552 #ifdef MSDOS
08ae9ffe6763 (init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents: 25012
diff changeset
6553 /* The MSDOS terminal turns on its ``window system'' relatively
08ae9ffe6763 (init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents: 25012
diff changeset
6554 late into the startup, so we cannot do the frame faces'
08ae9ffe6763 (init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents: 25012
diff changeset
6555 initialization just yet. It will be done later by pc-win.el
08ae9ffe6763 (init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents: 25012
diff changeset
6556 and internal_terminal_init. */
08ae9ffe6763 (init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents: 25012
diff changeset
6557 && (strcmp (terminal_type, "internal") != 0 || inhibit_window_system)
08ae9ffe6763 (init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents: 25012
diff changeset
6558 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6559 && NILP (Vwindow_system))
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26591
diff changeset
6560 {
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26591
diff changeset
6561 /* For the initial frame, we don't have any way of knowing what
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26591
diff changeset
6562 are the foreground and background colors of the terminal. */
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26591
diff changeset
6563 struct frame *sf = SELECTED_FRAME();
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26591
diff changeset
6564
26902
264b83a3a688 Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents: 26851
diff changeset
6565 FRAME_FOREGROUND_PIXEL (sf) = FACE_TTY_DEFAULT_FG_COLOR;
264b83a3a688 Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents: 26851
diff changeset
6566 FRAME_BACKGROUND_PIXEL (sf) = FACE_TTY_DEFAULT_BG_COLOR;
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26591
diff changeset
6567 call0 (intern ("tty-set-up-initial-frame-faces"));
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26591
diff changeset
6568 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6569 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6570
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6571
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6572
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6573 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6574 Blinking cursor
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6575 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6576
26280
083835afced5 (Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents: 26164
diff changeset
6577 DEFUN ("internal-show-cursor", Finternal_show_cursor,
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6578 Sinternal_show_cursor, 2, 2, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6579 doc: /* Set the cursor-visibility flag of WINDOW to SHOW.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6580 WINDOW nil means use the selected window. SHOW non-nil means
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6581 show a cursor in WINDOW in the next redisplay. SHOW nil means
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6582 don't show a cursor. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6583 (window, show)
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6584 Lisp_Object window, show;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6585 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6586 /* Don't change cursor state while redisplaying. This could confuse
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6587 output routines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6588 if (!redisplaying_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6589 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6590 if (NILP (window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6591 window = selected_window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6592 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40512
diff changeset
6593 CHECK_WINDOW (window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6594
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6595 XWINDOW (window)->cursor_off_p = NILP (show);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6596 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6597
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6598 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6599 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6600
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6601
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6602 DEFUN ("internal-show-cursor-p", Finternal_show_cursor_p,
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6603 Sinternal_show_cursor_p, 0, 1, 0,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6604 doc: /* Value is non-nil if next redisplay will display a cursor in WINDOW.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6605 WINDOW nil or omitted means report on the selected window. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6606 (window)
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6607 Lisp_Object window;
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6608 {
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6609 struct window *w;
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6610
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6611 if (NILP (window))
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6612 window = selected_window;
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6613 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40512
diff changeset
6614 CHECK_WINDOW (window);
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6615
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6616 w = XWINDOW (window);
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6617 return w->cursor_off_p ? Qnil : Qt;
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6618 }
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6619
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6620
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6621 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6622 Initialization
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6623 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6624
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
6625 void
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6626 syms_of_display ()
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6627 {
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
6628 defsubr (&Sredraw_frame);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6629 defsubr (&Sredraw_display);
7810
15c0bf73737e (Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7808
diff changeset
6630 defsubr (&Sframe_or_buffer_changed_p);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6631 defsubr (&Sopen_termscript);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6632 defsubr (&Sding);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6633 defsubr (&Ssit_for);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6634 defsubr (&Ssleep_for);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6635 defsubr (&Ssend_string_to_terminal);
26280
083835afced5 (Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents: 26164
diff changeset
6636 defsubr (&Sinternal_show_cursor);
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6637 defsubr (&Sinternal_show_cursor_p);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6638
34893
779bd3fa820e Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents: 34866
diff changeset
6639 #if GLYPH_DEBUG
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
6640 defsubr (&Sdump_redisplay_history);
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
6641 #endif
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
6642
12186
6811992e871c (Fframe_or_buffer_changed_p): Calculate vector size right.
Karl Heuer <kwzh@gnu.org>
parents: 11919
diff changeset
6643 frame_and_buffer_state = Fmake_vector (make_number (20), Qlambda);
7810
15c0bf73737e (Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7808
diff changeset
6644 staticpro (&frame_and_buffer_state);
15c0bf73737e (Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7808
diff changeset
6645
13220
2e9014617492 (Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13105
diff changeset
6646 Qdisplay_table = intern ("display-table");
2e9014617492 (Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13105
diff changeset
6647 staticpro (&Qdisplay_table);
30720
64f3338f72d8 (Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30713
diff changeset
6648 Qredisplay_dont_pause = intern ("redisplay-dont-pause");
64f3338f72d8 (Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30713
diff changeset
6649 staticpro (&Qredisplay_dont_pause);
13220
2e9014617492 (Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13105
diff changeset
6650
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6651 DEFVAR_INT ("baud-rate", &baud_rate,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6652 doc: /* *The output baud rate of the terminal.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6653 On most systems, changing this value will affect the amount of padding
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6654 and the other strategic decisions made during redisplay. */);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6655
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6656 DEFVAR_BOOL ("inverse-video", &inverse_video,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6657 doc: /* *Non-nil means invert the entire frame display.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6658 This means everything is in inverse video which otherwise would not be. */);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6659
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6660 DEFVAR_BOOL ("visible-bell", &visible_bell,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6661 doc: /* *Non-nil means try to flash the frame to represent a bell.
40334
bee6cc2e8a90 (syms_of_display) <visible-bell>: Add a reference to
Eli Zaretskii <eliz@gnu.org>
parents: 40271
diff changeset
6662
bee6cc2e8a90 (syms_of_display) <visible-bell>: Add a reference to
Eli Zaretskii <eliz@gnu.org>
parents: 40271
diff changeset
6663 See also `ring-bell-function'. */);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6664
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6665 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6666 doc: /* *Non-nil means no need to redraw entire frame after suspending.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6667 A non-nil value is useful if the terminal can automatically preserve
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6668 Emacs's frame display when you reenter Emacs.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6669 It is up to you to set this variable if your terminal can do that. */);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6670
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6671 DEFVAR_LISP ("window-system", &Vwindow_system,
41025
4feeae90afa4 (syms_of_display): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 40979
diff changeset
6672 doc: /* Name of window system that Emacs is displaying through.
4feeae90afa4 (syms_of_display): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 40979
diff changeset
6673 The value is a symbol--for instance, `x' for X windows.
4feeae90afa4 (syms_of_display): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 40979
diff changeset
6674 The value is nil if Emacs is using a text-only terminal. */);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6675
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6676 DEFVAR_LISP ("window-system-version", &Vwindow_system_version,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6677 doc: /* The version number of the window system in use.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6678 For X windows, this is 10 or 11. */);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6679
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6680 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6681 doc: /* Non-nil means put cursor in minibuffer, at end of any message there. */);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6682
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6683 DEFVAR_LISP ("glyph-table", &Vglyph_table,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6684 doc: /* Table defining how to output a glyph code to the frame.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6685 If not nil, this is a vector indexed by glyph code to define the glyph.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6686 Each element can be:
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6687 integer: a glyph code which this glyph is an alias for.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6688 string: output this glyph using that string (not impl. in X windows).
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6689 nil: this glyph mod 524288 is the code of a character to output,
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6690 and this glyph / 524288 is the face number (see `face-id') to use
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6691 while outputting it. */);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6692 Vglyph_table = Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6693
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6694 DEFVAR_LISP ("standard-display-table", &Vstandard_display_table,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6695 doc: /* Display table to use for buffers that specify none.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6696 See `buffer-display-table' for more information. */);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6697 Vstandard_display_table = Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6698
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6699 DEFVAR_BOOL ("redisplay-dont-pause", &redisplay_dont_pause,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6700 doc: /* *Non-nil means update isn't paused when input is detected. */);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6701 redisplay_dont_pause = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6702
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6703 /* Initialize `window-system', unless init_display already decided it. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6704 #ifdef CANNOT_DUMP
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6705 if (noninteractive)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6706 #endif
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6707 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6708 Vwindow_system = Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6709 Vwindow_system_version = Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6710 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6711 }