annotate src/dispnew.c @ 108104:17710e3a17df

Remove conflict markers.
author Juanma Barranquero <lekktu@gmail.com>
date Sat, 24 Apr 2010 14:33:31 +0200
parents 74557d25410e
children 0b28d05fa415
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.
64770
a0d1312ede66 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64084
diff changeset
2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995,
a0d1312ede66 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64084
diff changeset
3 1997, 1998, 1999, 2000, 2001, 2002, 2003,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 106765
diff changeset
4 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6 This file is part of GNU Emacs.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94946
diff changeset
8 GNU Emacs is free software: you can redistribute it and/or modify
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9 it under the terms of the GNU General Public License as published by
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94946
diff changeset
10 the Free Software Foundation, either version 3 of the License, or
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94946
diff changeset
11 (at your option) any later version.
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 GNU Emacs is distributed in the hope that it will be useful,
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 but WITHOUT ANY WARRANTY; without even the implied warranty of
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16 GNU General Public License for more details.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94946
diff changeset
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
20
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 25781
diff changeset
21 #include <config.h>
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
22 #include <signal.h>
7900
60795e826dad Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents: 7814
diff changeset
23 #include <stdio.h>
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
24 #include <ctype.h>
105669
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104957
diff changeset
25 #include <setjmp.h>
314
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"
13526
34382f4e23cb Always include dispextern.h before cm.h.
Richard M. Stallman <rms@gnu.org>
parents: 13448
diff changeset
34 /* 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
35 #include "dispextern.h"
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
36 #include "cm.h"
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
37 #include "buffer.h"
88351
aac41b50c875 Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents: 42835
diff changeset
38 #include "character.h"
31093
6da961dff718 Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30720
diff changeset
39 #include "keyboard.h"
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
40 #include "frame.h"
83004
7900111db01c Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82995
diff changeset
41 #include "termhooks.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
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96236
diff changeset
63 #ifdef HAVE_NS
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96236
diff changeset
64 #include "nsterm.h"
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96236
diff changeset
65 #endif
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96236
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 *));
77267
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
122 static int showing_window_margins_p P_ ((struct window *));
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
123 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
124 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
125 static void redraw_overlapped_rows P_ ((struct window *, int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
126 static int count_blanks P_ ((struct glyph *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
127 static int count_match P_ ((struct glyph *, struct glyph *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
128 struct glyph *, struct glyph *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
129 static unsigned line_draw_cost P_ ((struct glyph_matrix *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
130 static void update_frame_line P_ ((struct frame *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
131 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
132 P_ ((Lisp_Object, int, int, int, int *));
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
133 static void allocate_matrices_for_window_redisplay P_ ((struct window *));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
134 static int realloc_glyph_pool P_ ((struct glyph_pool *, struct dim));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
135 static void adjust_frame_glyphs P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
136 struct glyph_matrix *new_glyph_matrix P_ ((struct glyph_pool *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
137 static void free_glyph_matrix P_ ((struct glyph_matrix *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
138 static void adjust_glyph_matrix P_ ((struct window *, struct glyph_matrix *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
139 int, int, struct dim));
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
140 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
141 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
142 #if GLYPH_DEBUG
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
143 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
144 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
145 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
146 static void build_frame_matrix_from_window_tree P_ ((struct glyph_matrix *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
147 struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
148 static void build_frame_matrix_from_leaf_window P_ ((struct glyph_matrix *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
149 struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
150 static struct glyph_pool *new_glyph_pool P_ ((void));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
151 static void free_glyph_pool P_ ((struct glyph_pool *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
152 static void adjust_frame_glyphs_initially P_ ((void));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
153 static void adjust_frame_message_buffer P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
154 static void adjust_decode_mode_spec_buffer P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
155 static void fill_up_glyph_row_with_spaces P_ ((struct glyph_row *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
156 static void build_frame_matrix P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
157 void clear_current_matrices P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
158 void scroll_glyph_matrix_range P_ ((struct glyph_matrix *, int, int,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
159 int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
160 static void clear_window_matrices P_ ((struct window *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
161 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
162 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
163 static int update_window_line P_ ((struct window *, int, int *));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
164 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
165 static int update_text_area P_ ((struct window *, int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
166 static void make_current P_ ((struct glyph_matrix *, struct glyph_matrix *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
167 int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
168 static void mirror_make_current P_ ((struct window *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
169 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
170 #if GLYPH_DEBUG
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
171 static void check_matrix_pointers P_ ((struct glyph_matrix *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
172 struct glyph_matrix *));
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
173 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
174 static void mirror_line_dance P_ ((struct window *, int, int, int *, char *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
175 static int update_window_tree P_ ((struct window *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
176 static int update_window P_ ((struct window *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
177 static int update_frame_1 P_ ((struct frame *, int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
178 static void set_window_cursor_after_update P_ ((struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
179 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
180 struct glyph_row *, int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
181 static void adjust_frame_glyphs_for_window_redisplay P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
182 static void adjust_frame_glyphs_for_frame_redisplay P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
183 static void reverse_rows P_ ((struct glyph_matrix *, int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
184 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
185 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
186 struct window *frame_row_to_window P_ ((struct window *, int));
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
189 /* Non-zero means don't pause redisplay for pending input. (This is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
190 for debugging and for a future implementation of EDT-like
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
191 scrolling. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
192
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
193 int redisplay_dont_pause;
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
194
71323
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
195 /* Define PERIODIC_PREEMPTION_CHECKING to 1, if micro-second timers
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
196 are supported, so we can check for input during redisplay at
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
197 regular intervals. */
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
198 #ifdef EMACS_HAS_USECS
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
199 #define PERIODIC_PREEMPTION_CHECKING 1
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
200 #else
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
201 #define PERIODIC_PREEMPTION_CHECKING 0
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
202 #endif
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
203
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
204 #if PERIODIC_PREEMPTION_CHECKING
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
205
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
206 /* If a number (float), check for user input every N seconds. */
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
207
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
208 Lisp_Object Vredisplay_preemption_period;
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
209
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
210 /* Redisplay preemption timers. */
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
211
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
212 static EMACS_TIME preemption_period;
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
213 static EMACS_TIME preemption_next_check;
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
214
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
215 #endif
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
216
554
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
217 /* 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
218 current contents of actual terminal frame; clear and redraw it. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
219
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
220 int frame_garbaged;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
221
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
222 /* Nonzero means last display completed. Zero means it was preempted. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
223
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
224 int display_completed;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
225
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
226 /* Lisp variable visible-bell; enables use of screen-flash instead of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
227 audible bell. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
228
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
229 int visible_bell;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
230
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
231 /* Invert the color of the whole frame, at a low level. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
232
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
233 int inverse_video;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
234
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
235 /* Line speed of the terminal. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
236
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
237 EMACS_INT baud_rate;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
238
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
239 /* Either nil or a symbol naming the window system under which Emacs
83014
f5cadabb36dd Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents: 83010
diff changeset
240 creates the first frame. */
f5cadabb36dd Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents: 83010
diff changeset
241
f5cadabb36dd Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents: 83010
diff changeset
242 Lisp_Object Vinitial_window_system;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
243
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
244 /* Version number of X windows: 10, 11 or nil. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
245
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
246 Lisp_Object Vwindow_system_version;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
247
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
248 /* Vector of glyph definitions. Indexed by glyph number, the contents
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
249 are a string which is how to output the glyph.
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
250
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
251 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
252 as a character code.
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 This is an obsolete feature that is no longer used. The variable
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
255 is retained for compatibility. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
256
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
257 Lisp_Object Vglyph_table;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
258
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
259 /* Display table to use for vectors that don't specify their own. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
260
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
261 Lisp_Object Vstandard_display_table;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
262
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
263 /* 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
264 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
265 text in echo area; negative means at beginning of line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
266
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
267 int cursor_in_echo_area;
13220
2e9014617492 (Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13105
diff changeset
268
30720
64f3338f72d8 (Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30713
diff changeset
269 Lisp_Object Qdisplay_table, Qredisplay_dont_pause;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
270
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
271
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
272 /* 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
273 variable always equals the_only_frame. */
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
274
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
275 Lisp_Object selected_frame;
25012
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 /* 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
278 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
279 selected. In a single-frame version, this variable always holds
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9303
diff changeset
280 the address of the_only_frame. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
281
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
282 struct frame *last_nonminibuf_frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
283
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
284 /* 1 means SIGWINCH happened when not safe. */
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 int delayed_size_change;
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 /* 1 means glyph initialization has been completed at startup. */
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 static int glyphs_initialized_initially_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
291
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
292 /* Updated window if != 0. Set by update_window. */
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 struct window *updated_window;
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 /* Glyph row updated in update_window_line, and area that is updated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
297
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
298 struct glyph_row *updated_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
299 int updated_area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
300
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
301 /* A glyph for a space. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
302
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
303 struct glyph space_glyph;
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 /* Counts of allocated structures. These counts serve to diagnose
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
306 memory leaks and double frees. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
307
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
308 int glyph_matrix_count;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
309 int glyph_pool_count;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
310
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
311 /* If non-null, the frame whose frame matrices are manipulated. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
312 null, window matrices are worked on. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
313
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
314 static struct frame *frame_matrix_frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
315
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
316 /* Non-zero means that fonts have been loaded since the last glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
317 matrix adjustments. Redisplay must stop, and glyph matrices must
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
318 be adjusted when this flag becomes non-zero during display. The
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
319 reason fonts can be loaded so late is that fonts of fontsets are
94946
6009a07ef854 (fonts_changed_p): Comment improved.
Kenichi Handa <handa@m17n.org>
parents: 94909
diff changeset
320 loaded on demand. Another reason is that a line contains many
6009a07ef854 (fonts_changed_p): Comment improved.
Kenichi Handa <handa@m17n.org>
parents: 94909
diff changeset
321 characters displayed by zero width or very narrow glyphs of
6009a07ef854 (fonts_changed_p): Comment improved.
Kenichi Handa <handa@m17n.org>
parents: 94909
diff changeset
322 variable-width fonts. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
323
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
324 int fonts_changed_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
325
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
326 /* Convert vpos and hpos from frame to window and vice versa.
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
327 This may only be used for terminal frames. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
328
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
329 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
330
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
331 static int window_to_frame_vpos P_ ((struct window *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
332 static int window_to_frame_hpos P_ ((struct window *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
333 #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
334 #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
335
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
336 /* 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
337 information. */
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
338
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
339 struct redisplay_history
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
340 {
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
341 char trace[512 + 100];
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
342 };
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 /* The size of the history buffer. */
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 #define REDISPLAY_HISTORY_SIZE 30
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 /* The redisplay history buffer. */
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 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
351
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
352 /* Next free entry in redisplay_history. */
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
353
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
354 static int history_idx;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
355
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
356 /* 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
357 history. */
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 static unsigned history_tick;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
360
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
361 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
362 static void add_window_display_history P_ ((struct window *, char *, int));
71141
8b67793e19f3 Whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 71138
diff changeset
363
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
364 /* 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
365 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
366 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
367 has been interrupted for pending input. */
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
368
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
369 static void
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
370 add_window_display_history (w, msg, paused_p)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
371 struct window *w;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
372 char *msg;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
373 int paused_p;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
374 {
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
375 char *buf;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
376
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
377 if (history_idx >= REDISPLAY_HISTORY_SIZE)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
378 history_idx = 0;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
379 buf = redisplay_history[history_idx].trace;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
380 ++history_idx;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
381
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
382 sprintf (buf, "%d: window %p (`%s')%s\n",
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
383 history_tick++,
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
384 w,
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
385 ((BUFFERP (w->buffer)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
386 && 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
387 ? (char *) SDATA (XBUFFER (w->buffer)->name)
34866
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 paused_p ? " ***paused***" : "");
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
390 strcat (buf, msg);
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
391 }
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
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
394 /* 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
395 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
396 pending input. */
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 static void
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
399 add_frame_display_history (f, paused_p)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
400 struct frame *f;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
401 int paused_p;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
402 {
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
403 char *buf;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
404
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
405 if (history_idx >= REDISPLAY_HISTORY_SIZE)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
406 history_idx = 0;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
407 buf = redisplay_history[history_idx].trace;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
408 ++history_idx;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
409
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
410 sprintf (buf, "%d: update frame %p%s",
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
411 history_tick++,
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
412 f, paused_p ? " ***paused***" : "");
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
413 }
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
414
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 DEFUN ("dump-redisplay-history", Fdump_redisplay_history,
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
417 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
418 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
419 ()
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
420 {
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
421 int i;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
422
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
423 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
424 {
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
425 if (i < 0)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
426 i = REDISPLAY_HISTORY_SIZE - 1;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
427 fprintf (stderr, "%s\n", redisplay_history[i].trace);
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
428 }
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
429
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
430 return Qnil;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
431 }
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
432
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
433
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
434 #else /* GLYPH_DEBUG == 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
435
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
436 #define WINDOW_TO_FRAME_VPOS(W, VPOS) ((VPOS) + WINDOW_TOP_EDGE_LINE (W))
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
437 #define WINDOW_TO_FRAME_HPOS(W, HPOS) ((HPOS) + WINDOW_LEFT_EDGE_COL (W))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
438
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
439 #endif /* GLYPH_DEBUG == 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
440
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
441
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
442 /* Like bcopy except never gets confused by overlap. Let this be the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
443 first function defined in this file, or change emacs.c where the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
444 address of this function is used. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
445
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
446 void
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
447 safe_bcopy (from, to, size)
46551
227785e3e29f (safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents: 46370
diff changeset
448 const char *from;
227785e3e29f (safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents: 46370
diff changeset
449 char *to;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
450 int size;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
451 {
1588
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
452 if (size <= 0 || from == to)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
453 return;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
454
1588
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
455 /* 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
456 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
457 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
458 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
459 bcopy (from, to, size);
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
460
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
461 /* 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
462 else
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
463 {
46551
227785e3e29f (safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents: 46370
diff changeset
464 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
465 register char *endt = to + size;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
466
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
467 /* If TO - FROM is large, then we should break the copy into
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
468 nonoverlapping chunks of TO - FROM bytes each. However, if
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
469 TO - FROM is small, then the bcopy function call overhead
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
470 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
471 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
472 bad, I'm trying to err in its favor. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
473 if (to - from < 64)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
474 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
475 do
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
476 *--endt = *--endf;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
477 while (endf != from);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
478 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
479 else
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 for (;;)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
482 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
483 endt -= (to - from);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
484 endf -= (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 if (endt < to)
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
487 break;
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
488
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
489 bcopy (endf, endt, to - from);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
490 }
1588
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
491
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
492 /* 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
493 little left over. The amount left over is (endt + (to -
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
494 from)) - to, which is endt - from. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
495 bcopy (from, to, endt - from);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
496 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
497 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
498 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
499
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
502 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
503 Glyph Matrices
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
504 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
505
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
506 /* Allocate and return a glyph_matrix structure. POOL is the glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
507 pool from which memory for the matrix should be allocated, or null
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
508 for window-based redisplay where no glyph pools are used. The
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
509 member `pool' of the glyph matrix structure returned is set to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
510 POOL, the structure is otherwise zeroed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
511
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
512 struct glyph_matrix *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
513 new_glyph_matrix (pool)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
514 struct glyph_pool *pool;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
515 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
516 struct glyph_matrix *result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
517
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
518 /* Allocate and clear. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
519 result = (struct glyph_matrix *) xmalloc (sizeof *result);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
520 bzero (result, sizeof *result);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
521
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
522 /* Increment number of allocated matrices. This count is used
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
523 to detect memory leaks. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
524 ++glyph_matrix_count;
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 /* Set pool and return. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
527 result->pool = pool;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
528 return result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
529 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
530
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
531
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
532 /* Free glyph matrix MATRIX. Passing in a null MATRIX is allowed.
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 The global counter glyph_matrix_count is decremented when a matrix
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
535 is freed. If the count gets negative, more structures were freed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
536 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
537 pointer was passed to this function.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
538
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
539 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
540 glyph memory---this is done for matrices on X frames. Freeing the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
541 matrix also frees the glyph memory in this case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
542
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
543 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
544 free_glyph_matrix (matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
545 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
546 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
547 if (matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
548 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
549 int i;
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 /* Detect the case that more matrices are freed than were
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
552 allocated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
553 if (--glyph_matrix_count < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
554 abort ();
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 glyph memory if MATRIX owns it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
557 if (matrix->pool == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
558 for (i = 0; i < matrix->rows_allocated; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
559 xfree (matrix->rows[i].glyphs[LEFT_MARGIN_AREA]);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
560
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
561 /* Free row structures and the matrix itself. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
562 xfree (matrix->rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
563 xfree (matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
564 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
565 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
566
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
567
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
568 /* Return the number of glyphs to reserve for a marginal area of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
569 window W. TOTAL_GLYPHS is the number of glyphs in a complete
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
570 display line of window W. MARGIN gives the width of the marginal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
571 area in canonical character units. MARGIN should be an integer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
572 or a float. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
573
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
574 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
575 margin_glyphs_to_reserve (w, total_glyphs, margin)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
576 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
577 int total_glyphs;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
578 Lisp_Object margin;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
579 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
580 int n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
581
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
582 if (NUMBERP (margin))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
583 {
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
584 int width = XFASTINT (w->total_cols);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
585 double d = max (0, XFLOATINT (margin));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
586 d = min (width / 2 - 1, d);
57808
a1c4ff636947 (margin_glyphs_to_reserve): Don't use ncols_scale_factor.
Kim F. Storm <storm@cua.dk>
parents: 56727
diff changeset
587 n = (int) ((double) total_glyphs / width * d);
25012
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
590 n = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
591
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
592 return n;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
595
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
596 /* 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
597 window sizes.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
598
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
599 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
600 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
601 indices of the first column and row of MATRIX within the frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
602 matrix, if such a matrix exists. They are zero for purely
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
603 window-based redisplay. DIM is the needed size of the matrix.
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 In window-based redisplay, where no frame matrices exist, glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
606 matrices manage their own glyph storage. Otherwise, they allocate
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
607 storage from a common frame glyph pool which can be found in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
608 MATRIX->pool.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
609
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
610 The reason for this memory management strategy is to avoid complete
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
611 frame redraws if possible. When we allocate from a common pool, a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
612 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
613 requires a complete redisplay of the frame because we cannot easily
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
614 make sure that the current matrices of all windows still agree with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
615 what is displayed on the screen. While this is usually fast, it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
616 leads to screen flickering. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
617
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
618 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
619 adjust_glyph_matrix (w, matrix, x, y, dim)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
620 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
621 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
622 int x, y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
623 struct dim dim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
624 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
625 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
626 int new_rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
627 int marginal_areas_changed_p = 0;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
628 int header_line_changed_p = 0;
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
629 int header_line_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
630 int left = -1, right = -1;
80274
b818bce5757f (adjust_glyph_matrix): Initialize window_height.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
631 int window_width = -1, window_height = -1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
632
52377
a90dea69e764 (adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 51413
diff changeset
633 /* See if W had a header line that has disappeared now, or vice versa.
a90dea69e764 (adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 51413
diff changeset
634 Get W's size. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
635 if (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
636 {
52377
a90dea69e764 (adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 51413
diff changeset
637 window_box (w, -1, 0, 0, &window_width, &window_height);
a90dea69e764 (adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 51413
diff changeset
638
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
639 header_line_p = WINDOW_WANTS_HEADER_LINE_P (w);
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
640 header_line_changed_p = header_line_p != matrix->header_line_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
641 }
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
642 matrix->header_line_p = header_line_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
643
52377
a90dea69e764 (adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 51413
diff changeset
644 /* If POOL is null, MATRIX is a window matrix for window-based redisplay.
a90dea69e764 (adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 51413
diff changeset
645 Do nothing if MATRIX' size, position, vscroll, and marginal areas
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
646 haven't changed. This optimization is important because preserving
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
647 the matrix means preventing redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
648 if (matrix->pool == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
649 {
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
650 left = margin_glyphs_to_reserve (w, dim.width, w->left_margin_cols);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
651 right = margin_glyphs_to_reserve (w, dim.width, w->right_margin_cols);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
652 xassert (left >= 0 && right >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
653 marginal_areas_changed_p = (left != matrix->left_margin_glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
654 || right != matrix->right_margin_glyphs);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
655
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
656 if (!marginal_areas_changed_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
657 && !fonts_changed_p
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
658 && !header_line_changed_p
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
659 && matrix->window_left_col == WINDOW_LEFT_EDGE_COL (w)
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
660 && matrix->window_top_line == WINDOW_TOP_EDGE_LINE (w)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
661 && matrix->window_height == window_height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
662 && matrix->window_vscroll == w->vscroll
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
663 && matrix->window_width == window_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
664 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
665 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
666
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
667 /* Enlarge MATRIX->rows if necessary. New rows are cleared. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
668 if (matrix->rows_allocated < dim.height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
669 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
670 int size = dim.height * sizeof (struct glyph_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
671 new_rows = dim.height - matrix->rows_allocated;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
672 matrix->rows = (struct glyph_row *) xrealloc (matrix->rows, size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
673 bzero (matrix->rows + matrix->rows_allocated,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
674 new_rows * sizeof *matrix->rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
675 matrix->rows_allocated = dim.height;
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
678 new_rows = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
679
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
680 /* 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
681 on a frame not using window-based redisplay. Set up pointers for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
682 each row into the glyph pool. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
683 if (matrix->pool)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
684 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
685 xassert (matrix->pool->glyphs);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
686
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
687 if (w)
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 left = margin_glyphs_to_reserve (w, dim.width,
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
690 w->left_margin_cols);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
691 right = margin_glyphs_to_reserve (w, dim.width,
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
692 w->right_margin_cols);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
693 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
694 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
695 left = right = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
696
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
697 for (i = 0; i < dim.height; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
698 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
699 struct glyph_row *row = &matrix->rows[i];
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
700
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
701 row->glyphs[LEFT_MARGIN_AREA]
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
702 = (matrix->pool->glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
703 + (y + i) * matrix->pool->ncolumns
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
704 + x);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
705
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
706 if (w == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
707 || row == matrix->rows + dim.height - 1
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
708 || (row == matrix->rows && matrix->header_line_p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
709 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
710 row->glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
711 = row->glyphs[LEFT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
712 row->glyphs[RIGHT_MARGIN_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
713 = row->glyphs[TEXT_AREA] + dim.width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
714 row->glyphs[LAST_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
715 = row->glyphs[RIGHT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
716 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
717 else
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 row->glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
720 = row->glyphs[LEFT_MARGIN_AREA] + left;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
721 row->glyphs[RIGHT_MARGIN_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
722 = row->glyphs[TEXT_AREA] + dim.width - left - right;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
723 row->glyphs[LAST_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
724 = row->glyphs[LEFT_MARGIN_AREA] + dim.width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
725 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
726 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
727
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
728 matrix->left_margin_glyphs = left;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
729 matrix->right_margin_glyphs = right;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
730 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
731 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
732 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
733 /* If MATRIX->pool is null, MATRIX is responsible for managing
52377
a90dea69e764 (adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 51413
diff changeset
734 its own memory. It is a window matrix for window-based redisplay.
a90dea69e764 (adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 51413
diff changeset
735 Allocate glyph memory from the heap. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
736 if (dim.width > matrix->matrix_w
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
737 || new_rows
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
738 || header_line_changed_p
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
739 || marginal_areas_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
740 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
741 struct glyph_row *row = matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
742 struct glyph_row *end = row + matrix->rows_allocated;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
743
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
744 while (row < end)
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[LEFT_MARGIN_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
747 = (struct glyph *) xrealloc (row->glyphs[LEFT_MARGIN_AREA],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
748 (dim.width
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
749 * sizeof (struct glyph)));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
750
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
751 /* The mode line never has marginal areas. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
752 if (row == matrix->rows + dim.height - 1
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
753 || (row == matrix->rows && matrix->header_line_p))
25012
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];
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;
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[RIGHT_MARGIN_AREA];
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 else
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 row->glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
765 = row->glyphs[LEFT_MARGIN_AREA] + left;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
766 row->glyphs[RIGHT_MARGIN_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
767 = row->glyphs[TEXT_AREA] + dim.width - left - right;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
768 row->glyphs[LAST_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
769 = row->glyphs[LEFT_MARGIN_AREA] + dim.width;
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 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
772 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
773 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
774
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
775 xassert (left >= 0 && right >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
776 matrix->left_margin_glyphs = left;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
777 matrix->right_margin_glyphs = right;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
778 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
779
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
780 /* Number of rows to be used by MATRIX. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
781 matrix->nrows = dim.height;
31932
081edde76197 (adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents: 31850
diff changeset
782 xassert (matrix->nrows >= 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
783
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
784 if (w)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
785 {
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
786 if (matrix == w->current_matrix)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
787 {
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
788 /* 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
789 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
790 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
791 building desired matrices when this function runs. */
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
792 if (window_width < 0)
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
793 window_width = window_box_width (w, -1);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
794
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
795 /* 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
796 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
797 of the window. */
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
798 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
799 && !header_line_changed_p
e293840c7332 (adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents: 36697
diff changeset
800 && new_rows == 0
e293840c7332 (adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents: 36697
diff changeset
801 && dim.width == matrix->matrix_w
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
802 && matrix->window_left_col == WINDOW_LEFT_EDGE_COL (w)
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
803 && matrix->window_top_line == WINDOW_TOP_EDGE_LINE (w)
37098
e293840c7332 (adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents: 36697
diff changeset
804 && matrix->window_width == window_width)
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
805 {
38528
c867615c6a26 (adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents: 38489
diff changeset
806 /* Find the last row in the window. */
c867615c6a26 (adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents: 38489
diff changeset
807 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
808 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
809 {
38748
bb32ae33769e (adjust_glyph_matrix): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents: 38734
diff changeset
810 ++i;
38528
c867615c6a26 (adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents: 38489
diff changeset
811 break;
c867615c6a26 (adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents: 38489
diff changeset
812 }
35609
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 /* 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
815 are invalidated below. */
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
816 if (INTEGERP (w->window_end_vpos)
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
817 && XFASTINT (w->window_end_vpos) >= i)
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
818 w->window_end_valid = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
819
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
820 while (i < matrix->nrows)
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
821 matrix->rows[i++].enabled_p = 0;
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
822 }
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
823 else
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
824 {
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
825 for (i = 0; i < matrix->nrows; ++i)
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
826 matrix->rows[i].enabled_p = 0;
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
827 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
828 }
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
829 else if (matrix == w->desired_matrix)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
830 {
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
831 /* 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
832 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
833 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
834 redisplays. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
835 for (i = 0; i < matrix->nrows; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
836 matrix->rows[i].enabled_p = 0;
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 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
839
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
840
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
841 /* Remember last values to be able to optimize frame redraws. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
842 matrix->matrix_x = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
843 matrix->matrix_y = y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
844 matrix->matrix_w = dim.width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
845 matrix->matrix_h = dim.height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
846
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
847 /* 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
848 was last adjusted. This is used to optimize redisplay above. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
849 if (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
850 {
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
851 matrix->window_left_col = WINDOW_LEFT_EDGE_COL (w);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
852 matrix->window_top_line = WINDOW_TOP_EDGE_LINE (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
853 matrix->window_height = window_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
854 matrix->window_width = window_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
855 matrix->window_vscroll = w->vscroll;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
856 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
857 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
858
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
859
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
860 /* Reverse the contents of rows in MATRIX between START and END. The
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
861 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
862 1 etc. This is part of the implementation of rotate_matrix (see
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
863 below). */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
864
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
865 static void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
866 reverse_rows (matrix, start, end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
867 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
868 int start, end;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
869 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
870 int i, j;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
871
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
872 for (i = start, j = end - 1; i < j; ++i, --j)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
873 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
874 /* Non-ISO HP/UX compiler doesn't like auto struct
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
875 initialization. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
876 struct glyph_row temp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
877 temp = matrix->rows[i];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
878 matrix->rows[i] = matrix->rows[j];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
879 matrix->rows[j] = temp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
880 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
881 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
882
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
883
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
884 /* Rotate the contents of rows in MATRIX in the range FIRST .. LAST -
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
885 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
886 indices. (Note: this does not copy glyphs, only glyph pointers in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
887 row structures are moved around).
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
888
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
889 The algorithm used for rotating the vector was, I believe, first
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
890 described by Kernighan. See the vector R as consisting of two
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
891 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
892 after rotating is then BA. Reverse both sub-vectors to get ArBr
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
893 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
894 rotating right. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
895
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
896 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
897 rotate_matrix (matrix, first, last, by)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
898 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
899 int first, last, by;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
900 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
901 if (by < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
902 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
903 /* Up (rotate left, i.e. towards lower indices). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
904 by = -by;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
905 reverse_rows (matrix, first, first + by);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
906 reverse_rows (matrix, first + by, last);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
907 reverse_rows (matrix, first, last);
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 else if (by > 0)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
910 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
911 /* Down (rotate right, i.e. towards higher indices). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
912 reverse_rows (matrix, last - by, last);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
913 reverse_rows (matrix, first, last - by);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
914 reverse_rows (matrix, first, last);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
915 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
916 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
917
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 /* Increment buffer positions in glyph rows of MATRIX. Do it for rows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
920 with indices START <= index < END. Increment positions by DELTA/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
921 DELTA_BYTES. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
922
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
923 void
28708
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
924 increment_matrix_positions (matrix, start, end, delta, delta_bytes)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
925 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
926 int start, end, delta, delta_bytes;
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 /* Check that START and END are reasonable values. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
929 xassert (start >= 0 && start <= matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
930 xassert (end >= 0 && end <= matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
931 xassert (start <= end);
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 for (; start < end; ++start)
28708
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
934 increment_row_positions (matrix->rows + start, delta, delta_bytes);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
935 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
936
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
937
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
938 /* 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
939 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
940 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
941
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
942 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
943 enable_glyph_matrix_rows (matrix, start, end, enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
944 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
945 int start, end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
946 int enabled_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
947 {
31932
081edde76197 (adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents: 31850
diff changeset
948 xassert (start <= end);
081edde76197 (adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents: 31850
diff changeset
949 xassert (start >= 0 && start < matrix->nrows);
081edde76197 (adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents: 31850
diff changeset
950 xassert (end >= 0 && end <= matrix->nrows);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
951
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
952 for (; start < end; ++start)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
953 matrix->rows[start].enabled_p = enabled_p != 0;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
956
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
957 /* Clear MATRIX.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
958
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
959 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
960 all rows of the matrix to zero. The function prepare_desired_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
961 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
962 enabled_p flag.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
963
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
964 Resets update hints to defaults value. The only update hint
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
965 currently present is the flag MATRIX->no_scrolling_p. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
966
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
967 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
968 clear_glyph_matrix (matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
969 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
970 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
971 if (matrix)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
972 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
973 enable_glyph_matrix_rows (matrix, 0, matrix->nrows, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
974 matrix->no_scrolling_p = 0;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
975 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
976 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
977
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
978
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
979 /* 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
980 Increment y-positions in glyph rows between START and END by DY,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
981 and recompute their visible height. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
982
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
983 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
984 shift_glyph_matrix (w, matrix, start, end, dy)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
985 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
986 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
987 int start, end, dy;
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 int min_y, max_y;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
990
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
991 xassert (start <= end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
992 xassert (start >= 0 && start < matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
993 xassert (end >= 0 && end <= matrix->nrows);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
994
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
995 min_y = WINDOW_HEADER_LINE_HEIGHT (w);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
996 max_y = WINDOW_BOX_HEIGHT_NO_MODE_LINE (w);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
997
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
998 for (; start < end; ++start)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
999 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1000 struct glyph_row *row = &matrix->rows[start];
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1001
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1002 row->y += dy;
38587
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1003 row->visible_height = row->height;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1004
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1005 if (row->y < min_y)
38587
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1006 row->visible_height -= min_y - row->y;
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1007 if (row->y + row->height > max_y)
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1008 row->visible_height -= row->y + row->height - max_y;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1009 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1010 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1013 /* Mark all rows in current matrices of frame F as invalid. Marking
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1014 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
1015 current matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1016
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1017 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1018 clear_current_matrices (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1019 register struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1020 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1021 /* Clear frame current matrix, if we have one. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1022 if (f->current_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1023 clear_glyph_matrix (f->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1024
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1025 /* 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
1026 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
1027 no toolkit support is compiled in. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1028 if (WINDOWP (f->menu_bar_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1029 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1030
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
1031 /* 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
1032 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
1033 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1034
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1035 /* Clear current window matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1036 xassert (WINDOWP (FRAME_ROOT_WINDOW (f)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1037 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1038 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1039
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 /* Clear out all display lines of F for a coming redisplay. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1042
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
1043 void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1044 clear_desired_matrices (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1045 register struct frame *f;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1046 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1047 if (f->desired_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1048 clear_glyph_matrix (f->desired_matrix);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1049
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1050 if (WINDOWP (f->menu_bar_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1051 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1052
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
1053 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
1054 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->desired_matrix);
25012
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 /* Do it for window matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1057 xassert (WINDOWP (FRAME_ROOT_WINDOW (f)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1058 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1059 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1062 /* Clear matrices in window tree rooted in W. If DESIRED_P is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1063 non-zero clear desired matrices, otherwise clear current matrices. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1066 clear_window_matrices (w, desired_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1067 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1068 int desired_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1069 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1070 while (w)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1071 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1072 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1073 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1074 xassert (WINDOWP (w->hchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1075 clear_window_matrices (XWINDOW (w->hchild), desired_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1076 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1077 else if (!NILP (w->vchild))
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 xassert (WINDOWP (w->vchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1080 clear_window_matrices (XWINDOW (w->vchild), desired_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1081 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1082 else
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 if (desired_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1085 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1086 else
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1087 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1088 clear_glyph_matrix (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1089 w->window_end_valid = Qnil;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1090 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1091 }
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 w = NILP (w->next) ? 0 : XWINDOW (w->next);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1097
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1098
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1099 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1100 Glyph Rows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1101
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1102 See dispextern.h for an overall explanation of glyph rows.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1103 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1104
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1105 /* 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
1106 changes in the glyph_row structure, i.e. addition or removal of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1107 structure members. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1108
33527
c4c7abc48752 (null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents: 33101
diff changeset
1109 static struct glyph_row null_row;
c4c7abc48752 (null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents: 33101
diff changeset
1110
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1111 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1112 clear_glyph_row (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1113 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1114 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1115 struct glyph *p[1 + LAST_AREA];
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 /* Save pointers. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1118 p[LEFT_MARGIN_AREA] = row->glyphs[LEFT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1119 p[TEXT_AREA] = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1120 p[RIGHT_MARGIN_AREA] = row->glyphs[RIGHT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1121 p[LAST_AREA] = row->glyphs[LAST_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1122
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1123 /* Clear. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1124 *row = null_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1125
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1126 /* Restore pointers. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1127 row->glyphs[LEFT_MARGIN_AREA] = p[LEFT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1128 row->glyphs[TEXT_AREA] = p[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1129 row->glyphs[RIGHT_MARGIN_AREA] = p[RIGHT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1130 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
1131
b20d72b7aa4b (clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 29980
diff changeset
1132 #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
1133 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
1134 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
1135 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
1136 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
1137 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
1138 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
1139 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
1140 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1141 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1142
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 /* Make ROW an empty, enabled row of canonical character height,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1145 in window W starting at y-position Y. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1146
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1147 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1148 blank_row (w, row, y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1149 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1150 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1151 int y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1152 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1153 int min_y, max_y;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1154
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
1155 min_y = WINDOW_HEADER_LINE_HEIGHT (w);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
1156 max_y = WINDOW_BOX_HEIGHT_NO_MODE_LINE (w);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1157
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1158 clear_glyph_row (row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1159 row->y = y;
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
1160 row->ascent = row->phys_ascent = 0;
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
1161 row->height = row->phys_height = FRAME_LINE_HEIGHT (XFRAME (w->frame));
38587
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1162 row->visible_height = row->height;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1163
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1164 if (row->y < min_y)
38587
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1165 row->visible_height -= min_y - row->y;
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1166 if (row->y + row->height > max_y)
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1167 row->visible_height -= row->y + row->height - max_y;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1168
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1169 row->enabled_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1170 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1171
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1172
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1173 /* Increment buffer positions in glyph row ROW. DELTA and DELTA_BYTES
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1174 are the amounts by which to change positions. Note that the first
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1175 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
1176 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
1177 ends. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1178
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1179 void
28708
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
1180 increment_row_positions (row, delta, delta_bytes)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1181 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1182 int delta, delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1183 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1184 int area, i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1185
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1186 /* Increment start and end positions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1187 MATRIX_ROW_START_CHARPOS (row) += delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1188 MATRIX_ROW_START_BYTEPOS (row) += delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1189 MATRIX_ROW_END_CHARPOS (row) += delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1190 MATRIX_ROW_END_BYTEPOS (row) += delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1191
65003
74ab28cf1192 (increment_row_positions): Skip non-enabled rows.
Kim F. Storm <storm@cua.dk>
parents: 64776
diff changeset
1192 if (!row->enabled_p)
74ab28cf1192 (increment_row_positions): Skip non-enabled rows.
Kim F. Storm <storm@cua.dk>
parents: 64776
diff changeset
1193 return;
74ab28cf1192 (increment_row_positions): Skip non-enabled rows.
Kim F. Storm <storm@cua.dk>
parents: 64776
diff changeset
1194
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1195 /* Increment positions in glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1196 for (area = 0; area < LAST_AREA; ++area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1197 for (i = 0; i < row->used[area]; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1198 if (BUFFERP (row->glyphs[area][i].object)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1199 && row->glyphs[area][i].charpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1200 row->glyphs[area][i].charpos += delta;
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 /* Capture the case of rows displaying a line end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1203 if (row->used[TEXT_AREA] == 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1204 && MATRIX_ROW_DISPLAYS_TEXT_P (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1205 row->glyphs[TEXT_AREA]->charpos += delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1206 }
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
29336
5ccfe8a1638f (find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28708
diff changeset
1209 #if 0
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1210 /* Swap glyphs between two glyph rows A and B. This exchanges glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1211 contents, i.e. glyph structure contents are exchanged between A and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1212 B without changing glyph pointers in A and B. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1213
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1214 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1215 swap_glyphs_in_rows (a, b)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1216 struct glyph_row *a, *b;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1217 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1218 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1219
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1220 for (area = 0; area < LAST_AREA; ++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 /* Number of glyphs to swap. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1223 int max_used = max (a->used[area], b->used[area]);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1224
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1225 /* Start of glyphs in area of row A. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1226 struct glyph *glyph_a = a->glyphs[area];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1227
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1228 /* End + 1 of glyphs in area of row A. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1229 struct glyph *glyph_a_end = a->glyphs[max_used];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1230
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1231 /* Start of glyphs in area of row B. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1232 struct glyph *glyph_b = b->glyphs[area];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1233
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1234 while (glyph_a < glyph_a_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1235 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1236 /* Non-ISO HP/UX compiler doesn't like auto struct
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1237 initialization. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1238 struct glyph temp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1239 temp = *glyph_a;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1240 *glyph_a = *glyph_b;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1241 *glyph_b = temp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1242 ++glyph_a;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1243 ++glyph_b;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1244 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1245 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1246 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1247
29336
5ccfe8a1638f (find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28708
diff changeset
1248 #endif /* 0 */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1249
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1250 /* Exchange pointers to glyph memory between glyph rows A and B. */
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 static INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1253 swap_glyph_pointers (a, b)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1254 struct glyph_row *a, *b;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1255 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1256 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1257 for (i = 0; i < LAST_AREA + 1; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1258 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1259 struct glyph *temp = a->glyphs[i];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1260 a->glyphs[i] = b->glyphs[i];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1261 b->glyphs[i] = temp;
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 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1264
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 /* Copy glyph row structure FROM to glyph row structure TO, except
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1267 that glyph pointers in the structures are left unchanged. */
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 INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1270 copy_row_except_pointers (to, from)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1271 struct glyph_row *to, *from;
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 struct glyph *pointers[1 + LAST_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1274
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1275 /* Save glyph pointers of TO. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1276 bcopy (to->glyphs, pointers, sizeof to->glyphs);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1277
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1278 /* Do a structure assignment. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1279 *to = *from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1280
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1281 /* Restore original pointers of TO. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1282 bcopy (pointers, to->glyphs, sizeof to->glyphs);
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
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 /* 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
1287 TO and FROM are left unchanged. Glyph contents are copied from the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1288 glyph memory of FROM to the glyph memory of TO. Increment buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1289 positions in row TO by DELTA/ DELTA_BYTES. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1290
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1291 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1292 copy_glyph_row_contents (to, from, delta, delta_bytes)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1293 struct glyph_row *to, *from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1294 int delta, delta_bytes;
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 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1297
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1298 /* This is like a structure assignment TO = FROM, except that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1299 glyph pointers in the rows are left unchanged. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1300 copy_row_except_pointers (to, from);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1301
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1302 /* Copy glyphs from FROM to TO. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1303 for (area = 0; area < LAST_AREA; ++area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1304 if (from->used[area])
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1305 bcopy (from->glyphs[area], to->glyphs[area],
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1306 from->used[area] * sizeof (struct glyph));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1307
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1308 /* Increment buffer positions in TO by DELTA. */
28708
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
1309 increment_row_positions (to, delta, delta_bytes);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1310 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1311
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 /* 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
1314 assignment TO = FROM, except that glyph pointers are not copied but
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1315 exchanged between TO and FROM. Pointers must be exchanged to avoid
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1316 a memory leak. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1317
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1318 static INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1319 assign_row (to, from)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1320 struct glyph_row *to, *from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1321 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1322 swap_glyph_pointers (to, from);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1323 copy_row_except_pointers (to, from);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1324 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1325
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 /* 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
1328 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
1329 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
1330 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
1331 memory of FRAME_ROW. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1332
34893
779bd3fa820e Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents: 34866
diff changeset
1333 #if GLYPH_DEBUG
30323
4cd1b8fe118c (direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents: 30307
diff changeset
1334
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1335 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1336 glyph_row_slice_p (window_row, frame_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1337 struct glyph_row *window_row, *frame_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1338 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1339 struct glyph *window_glyph_start = window_row->glyphs[0];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1340 struct glyph *frame_glyph_start = frame_row->glyphs[0];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1341 struct glyph *frame_glyph_end = frame_row->glyphs[LAST_AREA];
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 return (frame_glyph_start <= window_glyph_start
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1344 && window_glyph_start < frame_glyph_end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1345 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1346
30323
4cd1b8fe118c (direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents: 30307
diff changeset
1347 #endif /* GLYPH_DEBUG */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1348
29336
5ccfe8a1638f (find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28708
diff changeset
1349 #if 0
5ccfe8a1638f (find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28708
diff changeset
1350
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1351 /* 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
1352 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
1353 in WINDOW_MATRIX is found satisfying the condition. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1354
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1355 static struct glyph_row *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1356 find_glyph_row_slice (window_matrix, frame_matrix, row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1357 struct glyph_matrix *window_matrix, *frame_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1358 int row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1359 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1360 int i;
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 xassert (row >= 0 && row < frame_matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1363
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1364 for (i = 0; i < window_matrix->nrows; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1365 if (glyph_row_slice_p (window_matrix->rows + i,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1366 frame_matrix->rows + row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1367 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1368
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1369 return i < window_matrix->nrows ? window_matrix->rows + i : 0;
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
29336
5ccfe8a1638f (find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28708
diff changeset
1372 #endif /* 0 */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1373
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1374 /* Prepare ROW for display. Desired rows are cleared lazily,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1375 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
1376 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
1377 call to this function really clears it. */
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 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1380 prepare_desired_row (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1381 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1382 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1383 if (!row->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1384 {
107624
552007beee69 Finish and debug display of invisible text.
Eli Zaretskii <eliz@gnu.org>
parents: 107617
diff changeset
1385 unsigned rp = row->reversed_p;
552007beee69 Finish and debug display of invisible text.
Eli Zaretskii <eliz@gnu.org>
parents: 107617
diff changeset
1386
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1387 clear_glyph_row (row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1388 row->enabled_p = 1;
107624
552007beee69 Finish and debug display of invisible text.
Eli Zaretskii <eliz@gnu.org>
parents: 107617
diff changeset
1389 row->reversed_p = rp;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1390 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1391 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1392
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1393
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1394 /* Return a hash code for glyph row ROW. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1395
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1396 int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1397 line_hash_code (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1398 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1399 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1400 int hash = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1401
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1402 if (row->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1403 {
40075
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1404 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
1405 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
1406
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1407 while (glyph < end)
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1408 {
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1409 int c = glyph->u.ch;
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1410 int face_id = glyph->face_id;
82990
2ecd1f669db9 Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents: 82989
diff changeset
1411 if (FRAME_MUST_WRITE_SPACES (SELECTED_FRAME ())) /* XXX Is SELECTED_FRAME OK here? */
40075
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1412 c -= SPACEGLYPH;
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1413 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
1414 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
1415 ++glyph;
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1416 }
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1417
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1418 if (hash == 0)
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1419 hash = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1420 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1421
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1422 return hash;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1423 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1424
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1425
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
1426 /* 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
1427 the number of characters in the line. If must_write_spaces is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1428 zero, leading and trailing spaces are ignored. */
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 static unsigned int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1431 line_draw_cost (matrix, vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1432 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1433 int vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1434 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1435 struct glyph_row *row = matrix->rows + vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1436 struct glyph *beg = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1437 struct glyph *end = beg + row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1438 int len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1439 Lisp_Object *glyph_table_base = GLYPH_TABLE_BASE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1440 int glyph_table_len = GLYPH_TABLE_LENGTH;
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 /* Ignore trailing and leading spaces if we can. */
82990
2ecd1f669db9 Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents: 82989
diff changeset
1443 if (!FRAME_MUST_WRITE_SPACES (SELECTED_FRAME ())) /* XXX Is SELECTED_FRAME OK here? */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1444 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1445 /* 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
1446 while (end > beg && CHAR_GLYPH_SPACE_P (*(end - 1)))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1447 --end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1448
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1449 /* All blank line. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1450 if (end == beg)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1451 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1452
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1453 /* Skip over leading spaces. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1454 while (CHAR_GLYPH_SPACE_P (*beg))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1455 ++beg;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1456 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1457
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1458 /* 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
1459 so return the number of glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1460 if (glyph_table_base == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1461 len = end - beg;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1462 else
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 /* Otherwise, scan the glyphs and accumulate their total length
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1465 in LEN. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1466 len = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1467 while (beg < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1468 {
92276
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
1469 GLYPH g;
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
1470
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
1471 SET_GLYPH_FROM_CHAR_GLYPH (g, *beg);
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
1472
92387
41d029d73eac (line_draw_cost): Fix invalid glyph check.
Kim F. Storm <storm@cua.dk>
parents: 92276
diff changeset
1473 if (GLYPH_INVALID_P (g)
26998
02e902f732d1 (line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents: 26902
diff changeset
1474 || GLYPH_SIMPLE_P (glyph_table_base, glyph_table_len, g))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1475 len += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1476 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1477 len += GLYPH_LENGTH (glyph_table_base, g);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1478
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1479 ++beg;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1480 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1481 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1482
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1483 return len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1484 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1485
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1486
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1487 /* 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
1488 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
1489 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
1490 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
1491 flags of A and B, too. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1492
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1493 static INLINE int
30152
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
1494 row_equal_p (w, a, b, mouse_face_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1495 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1496 struct glyph_row *a, *b;
30152
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
1497 int mouse_face_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1498 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1499 if (a == b)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1500 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1501 else if (a->hash != b->hash)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1502 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1503 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1504 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1505 struct glyph *a_glyph, *b_glyph, *a_end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1506 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1507
30152
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
1508 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
1509 return 0;
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
1510
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1511 /* Compare glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1512 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1513 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1514 if (a->used[area] != b->used[area])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1515 return 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1516
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1517 a_glyph = a->glyphs[area];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1518 a_end = a_glyph + a->used[area];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1519 b_glyph = b->glyphs[area];
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1520
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1521 while (a_glyph < a_end
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1522 && GLYPH_EQUAL_P (a_glyph, b_glyph))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1523 ++a_glyph, ++b_glyph;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1524
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1525 if (a_glyph != a_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1526 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1527 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1528
53605
7dfd96e25ec6 (row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents: 53514
diff changeset
1529 if (a->fill_line_p != b->fill_line_p
7dfd96e25ec6 (row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents: 53514
diff changeset
1530 || a->cursor_in_fringe_p != b->cursor_in_fringe_p
7dfd96e25ec6 (row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents: 53514
diff changeset
1531 || a->left_fringe_bitmap != b->left_fringe_bitmap
53881
ccacbf7f76b2 (row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents: 53612
diff changeset
1532 || a->left_fringe_face_id != b->left_fringe_face_id
53605
7dfd96e25ec6 (row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents: 53514
diff changeset
1533 || a->right_fringe_bitmap != b->right_fringe_bitmap
53881
ccacbf7f76b2 (row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents: 53612
diff changeset
1534 || a->right_fringe_face_id != b->right_fringe_face_id
61633
a76a30ee7c89 (row_equal_p, update_window_line, scrolling_window):
Kim F. Storm <storm@cua.dk>
parents: 61416
diff changeset
1535 || a->overlay_arrow_bitmap != b->overlay_arrow_bitmap
53605
7dfd96e25ec6 (row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents: 53514
diff changeset
1536 || a->exact_window_width_line_p != b->exact_window_width_line_p
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
1537 || a->overlapped_p != b->overlapped_p
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1538 || (MATRIX_ROW_CONTINUATION_LINE_P (a)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1539 != MATRIX_ROW_CONTINUATION_LINE_P (b))
107636
b5cb7368c1bc Continue work on continuation lines.
Eli Zaretskii <eliz@gnu.org>
parents: 107624
diff changeset
1540 || a->reversed_p != b->reversed_p
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1541 /* Different partially visible characters on left margin. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1542 || a->x != b->x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1543 /* Different height. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1544 || a->ascent != b->ascent
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
1545 || a->phys_ascent != b->phys_ascent
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
1546 || a->phys_height != b->phys_height
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1547 || a->visible_height != b->visible_height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1548 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1549 }
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 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1552 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1553
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1554
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1555
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1556 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1557 Glyph Pool
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1558
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1559 See dispextern.h for an overall explanation of glyph pools.
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 /* Allocate a glyph_pool structure. The structure returned is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1563 initialized with zeros. The global variable glyph_pool_count is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1564 incremented for each pool allocated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1565
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1566 static struct glyph_pool *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1567 new_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 struct glyph_pool *result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1570
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1571 /* Allocate a new glyph_pool and clear it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1572 result = (struct glyph_pool *) xmalloc (sizeof *result);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1573 bzero (result, sizeof *result);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1574
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1575 /* For memory leak and double deletion checking. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1576 ++glyph_pool_count;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1577
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1578 return result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1579 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1580
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 /* Free a glyph_pool structure POOL. The function may be called with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1583 a null POOL pointer. The global variable glyph_pool_count is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1584 decremented with every pool structure freed. If this count gets
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1585 negative, more structures were freed than allocated, i.e. one
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1586 structure must have been freed more than once or a bogus pointer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1587 was passed to free_glyph_pool. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1588
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1589 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1590 free_glyph_pool (pool)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1591 struct glyph_pool *pool;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1592 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1593 if (pool)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1594 {
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
1595 /* More freed than allocated? */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1596 --glyph_pool_count;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1597 xassert (glyph_pool_count >= 0);
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 xfree (pool->glyphs);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1600 xfree (pool);
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 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1603
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1604
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1605 /* 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
1606 columns we need. This function never shrinks a pool. The only
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1607 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
1608 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
1609 does it once, we can expect that he will do it again.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1610
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1611 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
1612 re-adjusting window glyph matrices necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1613
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1614 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1615 realloc_glyph_pool (pool, matrix_dim)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1616 struct glyph_pool *pool;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1617 struct dim matrix_dim;
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 int needed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1620 int changed_p;
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 changed_p = (pool->glyphs == 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1623 || matrix_dim.height != pool->nrows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1624 || matrix_dim.width != pool->ncolumns);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1625
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1626 /* Enlarge the glyph pool. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1627 needed = matrix_dim.width * matrix_dim.height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1628 if (needed > pool->nglyphs)
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 int size = needed * sizeof (struct glyph);
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 if (pool->glyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1633 pool->glyphs = (struct glyph *) xrealloc (pool->glyphs, size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1634 else
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 pool->glyphs = (struct glyph *) xmalloc (size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1637 bzero (pool->glyphs, size);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1640 pool->nglyphs = needed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1641 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1642
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
1643 /* 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
1644 to do sanity checks, and (b) the number of columns determines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1645 where rows in the frame matrix start---this must be available to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1646 determine pointers to rows of window sub-matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1647 pool->nrows = matrix_dim.height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1648 pool->ncolumns = matrix_dim.width;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1649
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1650 return changed_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1651 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1652
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1653
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1654
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1655 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1656 Debug Code
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1657 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1658
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1659 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1660
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1661
53226
dd3018b4785b Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents: 53225
diff changeset
1662 /* Flush standard output. This is sometimes useful to call from the debugger.
dd3018b4785b Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents: 53225
diff changeset
1663 XXX Maybe this should be changed to flush the current terminal instead of
dd3018b4785b Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents: 53225
diff changeset
1664 stdout.
dd3018b4785b Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents: 53225
diff changeset
1665 */
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1666
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1667 void
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1668 flush_stdout ()
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1669 {
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1670 fflush (stdout);
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1671 }
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1672
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1673
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1674 /* Check that no glyph pointers have been lost in MATRIX. If a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1675 pointer has been lost, e.g. by using a structure assignment between
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1676 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
1677 MATRIX. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1678
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1679 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1680 check_matrix_pointer_lossage (matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1681 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1682 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1683 int i, j;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1684
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1685 for (i = 0; i < matrix->nrows; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1686 for (j = 0; j < matrix->nrows; ++j)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1687 xassert (i == j
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1688 || (matrix->rows[i].glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1689 != matrix->rows[j].glyphs[TEXT_AREA]));
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1693 /* Get a pointer to glyph row ROW in MATRIX, with bounds checks. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1694
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1695 struct glyph_row *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1696 matrix_row (matrix, row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1697 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1698 int row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1699 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1700 xassert (matrix && matrix->rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1701 xassert (row >= 0 && row < matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1702
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1703 /* That's really too slow for normal testing because this function
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1704 is called almost everywhere. Although---it's still astonishingly
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1705 fast, so it is valuable to have for debugging purposes. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1706 #if 0
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1707 check_matrix_pointer_lossage (matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1708 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1709
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1710 return matrix->rows + row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1711 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1712
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1713
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1714 #if 0 /* This function makes invalid assumptions when text is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1715 partially invisible. But it might come handy for debugging
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1716 nevertheless. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1717
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1718 /* 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
1719 window W. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1722 check_matrix_invariants (w)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1723 struct window *w;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1724 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1725 struct glyph_matrix *matrix = w->current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1726 int yb = window_text_bottom_y (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1727 struct glyph_row *row = matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1728 struct glyph_row *last_text_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1729 struct buffer *saved = current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1730 struct buffer *buffer = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1731 int c;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1732
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1733 /* This can sometimes happen for a fresh window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1734 if (matrix->nrows < 2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1735 return;
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 set_buffer_temp (buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1738
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1739 /* Note: last row is always reserved for the mode line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1740 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1741 && MATRIX_ROW_BOTTOM_Y (row) < yb)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1742 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1743 struct glyph_row *next = row + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1744
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1745 if (MATRIX_ROW_DISPLAYS_TEXT_P (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1746 last_text_row = row;
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 /* Check that character and byte positions are in sync. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1749 xassert (MATRIX_ROW_START_BYTEPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1750 == CHAR_TO_BYTE (MATRIX_ROW_START_CHARPOS (row)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1751
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1752 /* CHAR_TO_BYTE aborts when invoked for a position > Z. We can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1753 have such a position temporarily in case of a minibuffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1754 displaying something like `[Sole completion]' at its end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1755 if (MATRIX_ROW_END_CHARPOS (row) < BUF_ZV (current_buffer))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1756 xassert (MATRIX_ROW_END_BYTEPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1757 == CHAR_TO_BYTE (MATRIX_ROW_END_CHARPOS (row)));
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 /* Check that end position of `row' is equal to start position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1760 of next row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1761 if (next->enabled_p && MATRIX_ROW_DISPLAYS_TEXT_P (next))
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 xassert (MATRIX_ROW_END_CHARPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1764 == MATRIX_ROW_START_CHARPOS (next));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1765 xassert (MATRIX_ROW_END_BYTEPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1766 == MATRIX_ROW_START_BYTEPOS (next));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1767 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1768 row = next;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1769 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1770
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1771 xassert (w->current_matrix->nrows == w->desired_matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1772 xassert (w->desired_matrix->rows != NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1773 set_buffer_temp (saved);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1776 #endif /* 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1777
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1778 #endif /* GLYPH_DEBUG != 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1779
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1782 /**********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1783 Allocating/ Adjusting Glyph Matrices
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1784 **********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1785
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1786 /* Allocate glyph matrices over a window tree for a frame-based
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1787 redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1788
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1789 X and Y are column/row within the frame glyph matrix where
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1790 sub-matrices for the window tree rooted at WINDOW must be
73383
015a870c0c9a (adjust_frame_glyphs_for_frame_redisplay): Remove unused variable ch_dim.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73318
diff changeset
1791 allocated. DIM_ONLY_P non-zero means that the caller of this
015a870c0c9a (adjust_frame_glyphs_for_frame_redisplay): Remove unused variable ch_dim.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73318
diff changeset
1792 function is only interested in the result matrix dimension, and
015a870c0c9a (adjust_frame_glyphs_for_frame_redisplay): Remove unused variable ch_dim.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73318
diff changeset
1793 matrix adjustments should not be performed.
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1794
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1795 The function returns the total width/height of the sub-matrices of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1796 the window tree. If called on a frame root window, the computation
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1797 will take the mini-buffer window into account.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1798
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1799 *WINDOW_CHANGE_FLAGS is set to a bit mask with bits
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 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
1802 glyph matrices yet, and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1803
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1804 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
1805 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
1806 DIM_ONLY_P)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1807
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1808 *WINDOW_CHANGE_FLAGS must be initialized by the caller of this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1809 function.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1810
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1811 Windows are arranged into chains of windows on the same level
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1812 through the next fields of window structures. Such a level can be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1813 either a sequence of horizontally adjacent windows from left to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1814 right, or a sequence of vertically adjacent windows from top to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1815 bottom. Each window in a horizontal sequence can be either a leaf
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1816 window or a vertical sequence; a window in a vertical sequence can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1817 be either a leaf or a horizontal sequence. All windows in a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1818 horizontal sequence have the same height, and all windows in a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1819 vertical sequence have the same width.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1820
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1821 This function uses, for historical reasons, a more general
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1822 algorithm to determine glyph matrix dimensions that would be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1823 necessary.
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 The matrix height of a horizontal sequence is determined by the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1826 maximum height of any matrix in the sequence. The matrix width of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1827 a horizontal sequence is computed by adding up matrix widths of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1828 windows in the sequence.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1829
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1830 |<------- result width ------->|
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 +---------+ | | result height
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 | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1837 +----------+ ---
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 The matrix width of a vertical sequence is the maximum matrix width
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1840 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
1841 matrix heights of windows in the sequence.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1842
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1843 |<---- result width -->|
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1844 +---------+ ---
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 | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1847 +---------+--+ |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1848 | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1849 | | result height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1850 | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1851 +------------+---------+ |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1852 | | |
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 +------------+---------+ --- */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1855
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1856 /* Bit indicating that a new matrix will be allocated or has been
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1857 allocated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1858
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1859 #define NEW_LEAF_MATRIX (1 << 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1860
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1861 /* Bit indicating that a matrix will or has changed its location or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1862 size. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1863
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1864 #define CHANGED_LEAF_MATRIX (1 << 1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1865
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1866 static struct dim
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1867 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
1868 window_change_flags)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1869 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1870 int x, y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1871 int dim_only_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1872 int *window_change_flags;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1873 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1874 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1875 int x0 = x, y0 = y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1876 int wmax = 0, hmax = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1877 struct dim total;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1878 struct dim dim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1879 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1880 int in_horz_combination_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1881
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1882 /* What combination is WINDOW part of? Compute this once since the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1883 result is the same for all windows in the `next' chain. The
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1884 special case of a root window (parent equal to nil) is treated
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1885 like a vertical combination because a root window's `next'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1886 points to the mini-buffer window, if any, which is arranged
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1887 vertically below other windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1888 in_horz_combination_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1889 = (!NILP (XWINDOW (window)->parent)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1890 && !NILP (XWINDOW (XWINDOW (window)->parent)->hchild));
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 /* For WINDOW and all windows on the same level. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1893 do
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1894 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1895 w = XWINDOW (window);
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 /* 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
1898 on whether this is a combination or a leaf window. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1899 if (!NILP (w->hchild))
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1900 dim = allocate_matrices_for_frame_redisplay (w->hchild, x, y,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1901 dim_only_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1902 window_change_flags);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1903 else if (!NILP (w->vchild))
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1904 dim = allocate_matrices_for_frame_redisplay (w->vchild, x, y,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1905 dim_only_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1906 window_change_flags);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1907 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1908 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1909 /* If not already done, allocate sub-matrix structures. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1910 if (w->desired_matrix == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1911 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1912 w->desired_matrix = new_glyph_matrix (f->desired_pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1913 w->current_matrix = new_glyph_matrix (f->current_pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1914 *window_change_flags |= NEW_LEAF_MATRIX;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1915 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1916
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1917 /* Width and height MUST be chosen so that there are no
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1918 holes in the frame matrix. */
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1919 dim.width = required_matrix_width (w);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1920 dim.height = required_matrix_height (w);
25012
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 /* Will matrix be re-allocated? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1923 if (x != w->desired_matrix->matrix_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1924 || y != w->desired_matrix->matrix_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1925 || dim.width != w->desired_matrix->matrix_w
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1926 || dim.height != w->desired_matrix->matrix_h
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1927 || (margin_glyphs_to_reserve (w, dim.width,
56496
069e4841ceb2 (margin_glyphs_to_reserve): Apply ncols_scale_factor.
Kim F. Storm <storm@cua.dk>
parents: 55021
diff changeset
1928 w->left_margin_cols)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1929 != w->desired_matrix->left_margin_glyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1930 || (margin_glyphs_to_reserve (w, dim.width,
56496
069e4841ceb2 (margin_glyphs_to_reserve): Apply ncols_scale_factor.
Kim F. Storm <storm@cua.dk>
parents: 55021
diff changeset
1931 w->right_margin_cols)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1932 != w->desired_matrix->right_margin_glyphs))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1933 *window_change_flags |= CHANGED_LEAF_MATRIX;
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 /* Actually change matrices, if allowed. Do not consider
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1936 CHANGED_LEAF_MATRIX computed above here because the pool
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1937 may have been changed which we don't now here. We trust
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1938 that we only will be called with DIM_ONLY_P != 0 when
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1939 necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1940 if (!dim_only_p)
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 adjust_glyph_matrix (w, w->desired_matrix, x, y, dim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1943 adjust_glyph_matrix (w, w->current_matrix, x, y, dim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1944 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1945 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1946
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1947 /* If we are part of a horizontal combination, advance x for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1948 windows to the right of W; otherwise advance y for windows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1949 below W. */
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 x += dim.width;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1952 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1953 y += dim.height;
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 /* Remember maximum glyph matrix dimensions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1956 wmax = max (wmax, dim.width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1957 hmax = max (hmax, dim.height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1958
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1959 /* Next window on same level. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1960 window = w->next;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1961 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1962 while (!NILP (window));
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 /* Set `total' to the total glyph matrix dimension of this window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1965 level. In a vertical combination, the width is the width of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1966 widest window; the height is the y we finally reached, corrected
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1967 by the y we started with. In a horizontal combination, the total
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1968 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
1969 x we finally reached, corrected by the x we started with. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1970 if (in_horz_combination_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1971 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1972 total.width = x - x0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1973 total.height = hmax;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1974 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1975 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1976 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1977 total.width = wmax;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1978 total.height = y - y0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1979 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1980
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1981 return total;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1982 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1983
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1984
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1985 /* 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
1986
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1987 int
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1988 required_matrix_height (w)
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1989 struct window *w;
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 #ifdef HAVE_WINDOW_SYSTEM
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1992 struct frame *f = XFRAME (w->frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1993
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1994 if (FRAME_WINDOW_P (f))
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1995 {
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1996 int ch_height = FRAME_SMALLEST_FONT_HEIGHT (f);
85252
62ea6778c569 Replace `abs' with `eabs'.
Eli Zaretskii <eliz@gnu.org>
parents: 83648
diff changeset
1997 int window_pixel_height = window_box_height (w) + eabs (w->vscroll);
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1998 return (((window_pixel_height + ch_height - 1)
56496
069e4841ceb2 (margin_glyphs_to_reserve): Apply ncols_scale_factor.
Kim F. Storm <storm@cua.dk>
parents: 55021
diff changeset
1999 / ch_height) * w->nrows_scale_factor
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2000 /* 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
2001 bottom of the window. */
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2002 + 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
2003 /* 2 for header and mode line. */
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2004 + 2);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2005 }
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2006 #endif /* HAVE_WINDOW_SYSTEM */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2007
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2008 return WINDOW_TOTAL_LINES (w);
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2009 }
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2010
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2011
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2012 /* 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
2013
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2014 int
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2015 required_matrix_width (w)
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2016 struct window *w;
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 #ifdef HAVE_WINDOW_SYSTEM
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2019 struct frame *f = XFRAME (w->frame);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2020 if (FRAME_WINDOW_P (f))
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2021 {
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2022 int ch_width = FRAME_SMALLEST_CHAR_WIDTH (f);
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2023 int window_pixel_width = WINDOW_TOTAL_WIDTH (w);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2024
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2025 /* 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
2026 return (((window_pixel_width + ch_width - 1)
56496
069e4841ceb2 (margin_glyphs_to_reserve): Apply ncols_scale_factor.
Kim F. Storm <storm@cua.dk>
parents: 55021
diff changeset
2027 / ch_width) * w->ncols_scale_factor
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2028 /* 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
2029 + 2
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2030 /* One partially visible column at the right
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2031 edge of each marginal area. */
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2032 + 1 + 1);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2033 }
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2034 #endif /* HAVE_WINDOW_SYSTEM */
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2035
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2036 return XINT (w->total_cols);
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2037 }
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2038
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2039
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2040 /* Allocate window matrices for window-based redisplay. W is the
73383
015a870c0c9a (adjust_frame_glyphs_for_frame_redisplay): Remove unused variable ch_dim.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73318
diff changeset
2041 window whose matrices must be allocated/reallocated. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2042
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2043 static void
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2044 allocate_matrices_for_window_redisplay (w)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2045 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2046 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2047 while (w)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2048 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2049 if (!NILP (w->vchild))
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2050 allocate_matrices_for_window_redisplay (XWINDOW (w->vchild));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2051 else if (!NILP (w->hchild))
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2052 allocate_matrices_for_window_redisplay (XWINDOW (w->hchild));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2053 else
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2054 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2055 /* W is a leaf window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2056 struct dim dim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2057
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2058 /* If matrices are not yet allocated, allocate them now. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2059 if (w->desired_matrix == NULL)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2060 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2061 w->desired_matrix = new_glyph_matrix (NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2062 w->current_matrix = new_glyph_matrix (NULL);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2063 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2064
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2065 dim.width = required_matrix_width (w);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2066 dim.height = required_matrix_height (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2067 adjust_glyph_matrix (w, w->desired_matrix, 0, 0, dim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2068 adjust_glyph_matrix (w, w->current_matrix, 0, 0, dim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2069 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2070
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2071 w = NILP (w->next) ? NULL : XWINDOW (w->next);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2072 }
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
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 /* 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
2077 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
2078 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
2079 changes, or its window configuration changes. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2080
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2081 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2082 adjust_glyphs (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2083 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2084 {
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
2085 /* 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
2086 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
2087 BLOCK_INPUT;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
2088
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2089 if (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2090 adjust_frame_glyphs (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2091 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2092 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2093 Lisp_Object tail, lisp_frame;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2094
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2095 FOR_EACH_FRAME (tail, lisp_frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2096 adjust_frame_glyphs (XFRAME (lisp_frame));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2097 }
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
2098
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
2099 UNBLOCK_INPUT;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2100 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2101
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2102
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2103 /* Adjust frame glyphs when Emacs is initialized.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2104
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2105 To be called from init_display.
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2106
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2107 We need a glyph matrix because redraw will happen soon.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2108 Unfortunately, window sizes on selected_frame are not yet set to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2109 meaningful values. I believe we can assume that there are only two
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2110 windows on the frame---the mini-buffer and the root window. Frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2111 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
2112 windows to estimated values. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2113
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2114 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2115 adjust_frame_glyphs_initially ()
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2116 {
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
2117 struct frame *sf = SELECTED_FRAME ();
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
2118 struct window *root = XWINDOW (sf->root_window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2119 struct window *mini = XWINDOW (root->next);
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2120 int frame_lines = FRAME_LINES (sf);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2121 int frame_cols = FRAME_COLS (sf);
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
2122 int top_margin = FRAME_TOP_MARGIN (sf);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2123
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2124 /* Do it for the root window. */
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2125 XSETFASTINT (root->top_line, top_margin);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2126 XSETFASTINT (root->total_cols, frame_cols);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2127 set_window_height (sf->root_window, frame_lines - 1 - top_margin, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2128
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2129 /* Do it for the mini-buffer window. */
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2130 XSETFASTINT (mini->top_line, frame_lines - 1);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2131 XSETFASTINT (mini->total_cols, frame_cols);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2132 set_window_height (root->next, 1, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2133
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
2134 adjust_frame_glyphs (sf);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2135 glyphs_initialized_initially_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2136 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2137
25012
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 /* Allocate/reallocate glyph matrices of a single frame F. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2140
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2141 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2142 adjust_frame_glyphs (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2143 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2144 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2145 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2146 adjust_frame_glyphs_for_window_redisplay (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2147 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2148 adjust_frame_glyphs_for_frame_redisplay (f);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2149
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2150 /* Don't forget the message buffer and the buffer for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2151 decode_mode_spec. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2152 adjust_frame_message_buffer (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2153 adjust_decode_mode_spec_buffer (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2154
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2155 f->glyphs_initialized_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2156 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2157
77267
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2158 /* Return 1 if any window in the tree has nonzero window margins. See
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2159 the hack at the end of adjust_frame_glyphs_for_frame_redisplay. */
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2160 static int
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2161 showing_window_margins_p (w)
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2162 struct window *w;
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2163 {
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2164 while (w)
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2165 {
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2166 if (!NILP (w->hchild))
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2167 {
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2168 if (showing_window_margins_p (XWINDOW (w->hchild)))
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2169 return 1;
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2170 }
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2171 else if (!NILP (w->vchild))
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2172 {
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2173 if (showing_window_margins_p (XWINDOW (w->vchild)))
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2174 return 1;
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2175 }
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2176 else if (!NILP (w->left_margin_cols)
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2177 || !NILP (w->right_margin_cols))
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2178 return 1;
92276
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2179
77267
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2180 w = NILP (w->next) ? 0 : XWINDOW (w->next);
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2181 }
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2182 return 0;
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2183 }
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2184
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2185
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2186 /* 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
2187 windows from the frame's current matrix. */
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 static void
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2190 fake_current_matrices (window)
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2191 Lisp_Object window;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2192 {
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2193 struct window *w;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2194
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2195 for (; !NILP (window); window = w->next)
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2196 {
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2197 w = XWINDOW (window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2198
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2199 if (!NILP (w->hchild))
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2200 fake_current_matrices (w->hchild);
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2201 else if (!NILP (w->vchild))
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2202 fake_current_matrices (w->vchild);
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2203 else
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2204 {
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2205 int i;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2206 struct frame *f = XFRAME (w->frame);
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2207 struct glyph_matrix *m = w->current_matrix;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2208 struct glyph_matrix *fm = f->current_matrix;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2209
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2210 xassert (m->matrix_h == WINDOW_TOTAL_LINES (w));
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2211 xassert (m->matrix_w == WINDOW_TOTAL_COLS (w));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2212
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2213 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
2214 {
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2215 struct glyph_row *r = m->rows + i;
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2216 struct glyph_row *fr = fm->rows + i + WINDOW_TOP_EDGE_LINE (w);
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2217
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2218 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
2219 && 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
2220
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2221 r->enabled_p = fr->enabled_p;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2222 if (r->enabled_p)
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2223 {
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2224 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
2225 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
2226 r->used[TEXT_AREA] = (m->matrix_w
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2227 - r->used[LEFT_MARGIN_AREA]
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2228 - r->used[RIGHT_MARGIN_AREA]);
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2229 r->mode_line_p = 0;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2230 }
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2231 }
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2232 }
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2233 }
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2234 }
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2235
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2236
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2237 /* 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
2238 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
2239
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2240 static struct glyph_matrix *
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2241 save_current_matrix (f)
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2242 struct frame *f;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2243 {
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2244 int i;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2245 struct glyph_matrix *saved;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2246
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2247 saved = (struct glyph_matrix *) xmalloc (sizeof *saved);
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2248 bzero (saved, sizeof *saved);
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2249 saved->nrows = f->current_matrix->nrows;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2250 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
2251 * sizeof *saved->rows);
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2252 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
2253
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2254 for (i = 0; i < saved->nrows; ++i)
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2255 {
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2256 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
2257 struct glyph_row *to = saved->rows + i;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2258 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
2259 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
2260 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
2261 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
2262 }
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2263
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2264 return saved;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2265 }
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2266
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2267
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2268 /* 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
2269 and free memory associated with SAVED. */
34849
eac70be4cb58 (save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34788
diff changeset
2270
eac70be4cb58 (save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34788
diff changeset
2271 static void
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2272 restore_current_matrix (f, saved)
34849
eac70be4cb58 (save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34788
diff changeset
2273 struct frame *f;
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2274 struct glyph_matrix *saved;
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2275 {
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2276 int i;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2277
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2278 for (i = 0; i < saved->nrows; ++i)
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2279 {
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2280 struct glyph_row *from = saved->rows + i;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2281 struct glyph_row *to = f->current_matrix->rows + i;
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2282 size_t nbytes = from->used[TEXT_AREA] * sizeof (struct glyph);
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2283 bcopy (from->glyphs[TEXT_AREA], to->glyphs[TEXT_AREA], nbytes);
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2284 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
2285 xfree (from->glyphs[TEXT_AREA]);
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2286 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2287
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2288 xfree (saved->rows);
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2289 xfree (saved);
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2290 }
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2291
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2292
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2293
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2294 /* Allocate/reallocate glyph matrices of a single frame F for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2295 frame-based redisplay. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2298 adjust_frame_glyphs_for_frame_redisplay (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2299 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2300 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2301 struct dim matrix_dim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2302 int pool_changed_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2303 int window_change_flags;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2304 int top_window_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2305
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2306 if (!FRAME_LIVE_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2307 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2308
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2309 top_window_y = FRAME_TOP_MARGIN (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2310
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2311 /* Allocate glyph pool structures if not already done. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2312 if (f->desired_pool == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2313 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2314 f->desired_pool = new_glyph_pool ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2315 f->current_pool = new_glyph_pool ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2316 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2317
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2318 /* Allocate frames matrix structures if needed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2319 if (f->desired_matrix == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2320 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2321 f->desired_matrix = new_glyph_matrix (f->desired_pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2322 f->current_matrix = new_glyph_matrix (f->current_pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2323 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2324
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2325 /* Compute window glyph matrices. (This takes the mini-buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2326 window into account). The result is the size of the frame glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2327 matrix needed. The variable window_change_flags is set to a bit
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2328 mask indicating whether new matrices will be allocated or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2329 existing matrices change their size or location within the frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2330 matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2331 window_change_flags = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2332 matrix_dim
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2333 = allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2334 0, top_window_y,
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2335 1,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2336 &window_change_flags);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2337
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2338 /* Add in menu bar lines, if any. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2339 matrix_dim.height += top_window_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2340
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2341 /* Enlarge pools as necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2342 pool_changed_p = realloc_glyph_pool (f->desired_pool, matrix_dim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2343 realloc_glyph_pool (f->current_pool, matrix_dim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2344
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2345 /* Set up glyph pointers within window matrices. Do this only if
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2346 absolutely necessary since it requires a frame redraw. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2347 if (pool_changed_p || window_change_flags)
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 /* Do it for window matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2350 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
2351 0, top_window_y, 0,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2352 &window_change_flags);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2353
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2354 /* Size of frame matrices must equal size of frame. Note
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2355 that we are called for X frames with window widths NOT equal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2356 to the frame width (from CHANGE_FRAME_SIZE_1). */
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2357 xassert (matrix_dim.width == FRAME_COLS (f)
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2358 && matrix_dim.height == FRAME_LINES (f));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2359
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2360 /* Pointers to glyph memory in glyph rows are exchanged during
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2361 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
2362 frame's current matrix consists of pointers into both the
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2363 desired and current glyph pool of the frame. Adjusting a
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2364 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
2365 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
2366 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
2367 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
2368 matrix' contents from that copy. */
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2369 if (display_completed
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2370 && !FRAME_GARBAGED_P (f)
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2371 && matrix_dim.width == f->current_matrix->matrix_w
77267
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2372 && matrix_dim.height == f->current_matrix->matrix_h
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2373 /* For some reason, the frame glyph matrix gets corrupted if
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2374 any of the windows contain margins. I haven't been able
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2375 to hunt down the reason, but for the moment this prevents
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2376 the problem from manifesting. -- cyd */
7f8bdfdc0227 (adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents: 76621
diff changeset
2377 && !showing_window_margins_p (XWINDOW (FRAME_ROOT_WINDOW (f))))
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2378 {
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2379 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
2380 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
2381 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
2382 restore_current_matrix (f, copy);
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2383 fake_current_matrices (FRAME_ROOT_WINDOW (f));
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2384 }
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2385 else
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2386 {
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2387 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
2388 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
2389 SET_FRAME_GARBAGED (f);
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2390 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2391 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2392 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2393
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 /* Allocate/reallocate glyph matrices of a single frame F for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2396 window-based redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2397
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2398 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2399 adjust_frame_glyphs_for_window_redisplay (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2400 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2401 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2402 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2403
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2404 xassert (FRAME_WINDOW_P (f) && FRAME_LIVE_P (f));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2405
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2406 /* Allocate/reallocate window matrices. */
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2407 allocate_matrices_for_window_redisplay (XWINDOW (FRAME_ROOT_WINDOW (f)));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2408
73383
015a870c0c9a (adjust_frame_glyphs_for_frame_redisplay): Remove unused variable ch_dim.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73318
diff changeset
2409 #ifdef HAVE_X_WINDOWS
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2410 /* Allocate/ reallocate matrices of the dummy window used to display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2411 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
2412 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2413 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2414 /* Allocate a dummy window if not already done. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2415 if (NILP (f->menu_bar_window))
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 f->menu_bar_window = make_window ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2418 w = XWINDOW (f->menu_bar_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2419 XSETFRAME (w->frame, f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2420 w->pseudo_window_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2421 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2422 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2423 w = XWINDOW (f->menu_bar_window);
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 /* Set window dimensions to frame dimensions and allocate or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2426 adjust glyph matrices of W. */
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2427 XSETFASTINT (w->top_line, 0);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2428 XSETFASTINT (w->left_col, 0);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2429 XSETFASTINT (w->total_lines, FRAME_MENU_BAR_LINES (f));
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2430 XSETFASTINT (w->total_cols, FRAME_TOTAL_COLS (f));
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2431 allocate_matrices_for_window_redisplay (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2432 }
73402
c76709b3cbc0 (adjust_frame_glyphs_for_window_redisplay): Fix #endif comments.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73383
diff changeset
2433 #endif /* not USE_X_TOOLKIT && not USE_GTK */
c76709b3cbc0 (adjust_frame_glyphs_for_window_redisplay): Fix #endif comments.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73383
diff changeset
2434 #endif /* HAVE_X_WINDOWS */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2435
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 46551
diff changeset
2436 #ifndef USE_GTK
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2437 /* 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
2438 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
2439 if (NILP (f->tool_bar_window))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2440 {
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2441 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
2442 w = XWINDOW (f->tool_bar_window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2443 XSETFRAME (w->frame, f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2444 w->pseudo_window_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2445 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2446 else
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2447 w = XWINDOW (f->tool_bar_window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2448
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2449 XSETFASTINT (w->top_line, FRAME_MENU_BAR_LINES (f));
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2450 XSETFASTINT (w->left_col, 0);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2451 XSETFASTINT (w->total_lines, FRAME_TOOL_BAR_LINES (f));
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2452 XSETFASTINT (w->total_cols, FRAME_TOTAL_COLS (f));
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2453 allocate_matrices_for_window_redisplay (w);
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 46551
diff changeset
2454 #endif
25012
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
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2458 /* Adjust/ allocate message buffer of frame F.
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2459
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2460 Note that the message buffer is never freed. Since I could not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2461 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
2462 problematic in some way and don't do it either.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2463
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2464 (Implementation note: It should be checked if we can free it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2465 eventually without causing trouble). */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2468 adjust_frame_message_buffer (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 int size = FRAME_MESSAGE_BUF_SIZE (f) + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2472
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2473 if (FRAME_MESSAGE_BUF (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2474 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2475 char *buffer = FRAME_MESSAGE_BUF (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2476 char *new_buffer = (char *) xrealloc (buffer, size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2477 FRAME_MESSAGE_BUF (f) = new_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2478 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2479 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2480 FRAME_MESSAGE_BUF (f) = (char *) xmalloc (size);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2483
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2484 /* Re-allocate buffer for decode_mode_spec on frame F. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2487 adjust_decode_mode_spec_buffer (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2488 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2489 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2490 f->decode_mode_spec_buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2491 = (char *) xrealloc (f->decode_mode_spec_buffer,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2492 FRAME_MESSAGE_BUF_SIZE (f) + 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2493 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2494
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2495
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2496
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2497 /**********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2498 Freeing Glyph Matrices
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2499 **********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2500
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2501 /* 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
2502 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
2503 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
2504 the function is called when F is destroyed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2505
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2506 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2507 free_glyphs (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2508 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2509 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2510 if (f && f->glyphs_initialized_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2511 {
27968
7634011b93f3 (free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 27855
diff changeset
2512 /* 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
2513 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
2514 BLOCK_INPUT;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2515 f->glyphs_initialized_p = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2516
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2517 /* Release window sub-matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2518 if (!NILP (f->root_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2519 free_window_matrices (XWINDOW (f->root_window));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2520
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2521 /* Free the dummy window for menu bars without X toolkit and its
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2522 glyph matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2523 if (!NILP (f->menu_bar_window))
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 struct window *w = XWINDOW (f->menu_bar_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2526 free_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2527 free_glyph_matrix (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2528 w->desired_matrix = w->current_matrix = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2529 f->menu_bar_window = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2530 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2531
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2532 /* 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
2533 if (!NILP (f->tool_bar_window))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2534 {
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2535 struct window *w = XWINDOW (f->tool_bar_window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2536 free_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2537 free_glyph_matrix (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2538 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
2539 f->tool_bar_window = Qnil;
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2542 /* Release frame glyph matrices. Reset fields to zero in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2543 case we are called a second time. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2544 if (f->desired_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2545 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2546 free_glyph_matrix (f->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2547 free_glyph_matrix (f->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2548 f->desired_matrix = f->current_matrix = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2549 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2550
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2551 /* Release glyph pools. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2552 if (f->desired_pool)
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 free_glyph_pool (f->desired_pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2555 free_glyph_pool (f->current_pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2556 f->desired_pool = f->current_pool = NULL;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2557 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2558
27968
7634011b93f3 (free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 27855
diff changeset
2559 UNBLOCK_INPUT;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2560 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2561 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2562
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2563
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2564 /* Free glyph sub-matrices in the window tree rooted at W. This
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2565 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
2566 the same tree more than once. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2567
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2568 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2569 free_window_matrices (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2570 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2571 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2572 while (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2573 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2574 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2575 free_window_matrices (XWINDOW (w->hchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2576 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2577 free_window_matrices (XWINDOW (w->vchild));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2578 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2579 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2580 /* This is a leaf window. Free its memory and reset fields
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2581 to zero in case this function is called a second time for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2582 W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2583 free_glyph_matrix (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2584 free_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2585 w->current_matrix = w->desired_matrix = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2586 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2587
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2588 /* Next window on same level. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2589 w = NILP (w->next) ? 0 : XWINDOW (w->next);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2590 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2591 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2592
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2593
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2594 /* Check glyph memory leaks. This function is called from
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2595 shut_down_emacs. Note that frames are not destroyed when Emacs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2596 exits. We therefore free all glyph memory for all active frames
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2597 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
2598
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2599 void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2600 check_glyph_memory ()
6620
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2601 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2602 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2603
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2604 /* Free glyph memory for all frames. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2605 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2606 free_glyphs (XFRAME (frame));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2607
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2608 /* Check that nothing is left allocated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2609 if (glyph_matrix_count)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2610 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2611 if (glyph_pool_count)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2612 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2613 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2616
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2617 /**********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2618 Building a Frame Matrix
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2621 /* Most of the redisplay code works on glyph matrices attached to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2622 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
2623 suitable for terminal code. Terminal output functions cannot rely
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2624 on being able to set an arbitrary terminal window. Instead they
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2625 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
2626 screen. We build such a view by constructing a frame matrix from
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2627 window matrices in this section.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2628
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2629 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
2630 For all such windows, their desired matrix is made part of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2631 desired frame matrix. For other windows, their current matrix is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2632 made part of the desired frame matrix.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2633
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2634 +-----------------+----------------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2635 | desired | desired |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2636 | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2637 +-----------------+----------------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2638 | current |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2639 | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2640 +----------------------------------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2641
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2642 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
2643 cheap way: We exploit the fact that the desired frame matrix and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2644 desired window matrices share their glyph memory. This is not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2645 possible for current window matrices. Their glyphs are copied to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2646 the desired frame matrix. The latter is equivalent to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2647 preserve_other_columns in the old redisplay.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2648
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2649 Used glyphs counters for frame matrix rows are the result of adding
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2650 up glyph lengths of the window matrices. A line in the frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2651 matrix is enabled, if a corresponding line in a window matrix is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2652 enabled.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2653
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2654 After building the desired frame matrix, it will be passed to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2655 terminal code, which will manipulate both the desired and current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2656 frame matrix. Changes applied to the frame's current matrix have
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2657 to be visible in current window matrices afterwards, of course.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2658
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2659 This problem is solved like this:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2660
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2661 1. Window and frame matrices share glyphs. Window matrices are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2662 constructed in a way that their glyph contents ARE the glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2663 contents needed in a frame matrix. Thus, any modification of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2664 glyphs done in terminal code will be reflected in window matrices
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2665 automatically.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2666
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2667 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
2668 intercepted by hook functions so that corresponding row operations
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2669 on window matrices can be performed. This is necessary because we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2670 use pointers to glyphs in glyph row structures. To satisfy the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2671 assumption of point 1 above that glyphs are updated implicitly in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2672 window matrices when they are manipulated via the frame matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2673 window and frame matrix must of course agree where to find the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2674 glyphs for their rows. Possible manipulations that must be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2675 mirrored are assignments of rows of the desired frame matrix to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2676 current frame matrix and scrolling the current frame matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2677
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2678 /* Build frame F's desired matrix from window matrices. Only windows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2679 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
2680 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
2681 sure not to touch them in this function. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2682
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2683 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2684 build_frame_matrix (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2685 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2686 {
6620
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2687 int i;
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2688
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2689 /* F must have a frame matrix when this function is called. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2690 xassert (!FRAME_WINDOW_P (f));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2691
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2692 /* Clear all rows in the frame matrix covered by window matrices.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2693 Menu bar lines are not covered by windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2694 for (i = FRAME_TOP_MARGIN (f); i < f->desired_matrix->nrows; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2695 clear_glyph_row (MATRIX_ROW (f->desired_matrix, i));
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 /* Build the matrix by walking the window tree. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2698 build_frame_matrix_from_window_tree (f->desired_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2699 XWINDOW (FRAME_ROOT_WINDOW (f)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2700 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2701
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2702
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2703 /* Walk a window tree, building a frame matrix MATRIX from window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2704 matrices. W is the root of a window tree. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2705
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2706 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2707 build_frame_matrix_from_window_tree (matrix, w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2708 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2709 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2710 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2711 while (w)
6620
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2712 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2713 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2714 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->hchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2715 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2716 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->vchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2717 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2718 build_frame_matrix_from_leaf_window (matrix, w);
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 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
2721 }
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2722 }
6642
2fda5dd17356 (verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6627
diff changeset
2723
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2724
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2725 /* 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
2726 desired frame matrix built. W is a leaf window whose desired or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2727 current matrix is to be added to FRAME_MATRIX. W's flag
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2728 must_be_updated_p determines which matrix it contributes to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2729 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
2730 is added to FRAME_MATRIX, otherwise W's current matrix is added.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2731 Adding a desired matrix means setting up used counters and such in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2732 frame rows, while adding a current window matrix to FRAME_MATRIX
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2733 means copying glyphs. The latter case corresponds to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2734 preserve_other_columns in the old redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2735
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2736 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2737 build_frame_matrix_from_leaf_window (frame_matrix, w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2738 struct glyph_matrix *frame_matrix;
6642
2fda5dd17356 (verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6627
diff changeset
2739 struct window *w;
2fda5dd17356 (verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6627
diff changeset
2740 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2741 struct glyph_matrix *window_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2742 int window_y, frame_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2743 /* If non-zero, a glyph to insert at the right border of W. */
92276
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2744 GLYPH right_border_glyph;
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2745
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2746 SET_GLYPH_FROM_CHAR (right_border_glyph, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2747
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2748 /* 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
2749 if (w->must_be_updated_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2750 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2751 window_matrix = w->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2752
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2753 /* Decide whether we want to add a vertical border glyph. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2754 if (!WINDOW_RIGHTMOST_P (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2755 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2756 struct Lisp_Char_Table *dp = window_display_table (w);
92276
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2757 Lisp_Object gc;
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2758
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2759 SET_GLYPH_FROM_CHAR (right_border_glyph, '|');
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2760 if (dp
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2761 && (gc = DISP_BORDER_GLYPH (dp), GLYPH_CODE_P (gc))
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2762 && GLYPH_CODE_CHAR_VALID_P (gc))
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2763 {
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2764 SET_GLYPH_FROM_GLYPH_CODE (right_border_glyph, gc);
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2765 spec_glyph_lookup_face (w, &right_border_glyph);
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2766 }
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2767
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2768 if (GLYPH_FACE (right_border_glyph) <= 0)
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2769 SET_GLYPH_FACE (right_border_glyph, VERTICAL_BORDER_FACE_ID);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2770 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2771 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2772 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2773 window_matrix = w->current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2774
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2775 /* For all rows in the window matrix and corresponding rows in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2776 frame matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2777 window_y = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2778 frame_y = window_matrix->matrix_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2779 while (window_y < window_matrix->nrows)
6642
2fda5dd17356 (verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6627
diff changeset
2780 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2781 struct glyph_row *frame_row = frame_matrix->rows + frame_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2782 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
2783 int current_row_p = window_matrix == w->current_matrix;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2784
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2785 /* 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
2786 window row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2787 fill_up_frame_row_with_spaces (frame_row, window_matrix->matrix_x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2788
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2789 /* Fill up areas in the window matrix row with spaces. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2790 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
2791
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2792 /* 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
2793 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
2794 row instead. */
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2795 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
2796 && !window_row->enabled_p)
6682
16ab14205588 (verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents: 6648
diff changeset
2797 {
31271
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2798 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
2799 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
2800 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2801
31271
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2802 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
2803 {
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2804 /* Copy window row to frame row. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2805 bcopy (window_row->glyphs[0],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2806 frame_row->glyphs[TEXT_AREA] + window_matrix->matrix_x,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2807 window_matrix->matrix_w * sizeof (struct glyph));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2808 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2809 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2810 {
31271
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2811 xassert (window_row->enabled_p);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2812
31271
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2813 /* 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
2814 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
2815 frame_row->enabled_p = 1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2816
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2817 /* Maybe insert a vertical border between horizontally adjacent
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2818 windows. */
92276
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2819 if (GLYPH_CHAR (right_border_glyph) != 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2820 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2821 struct glyph *border = window_row->glyphs[LAST_AREA] - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2822 SET_CHAR_GLYPH_FROM_GLYPH (*border, right_border_glyph);
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
59902
4a0a167cb6c4 (build_frame_matrix_from_leaf_window)
Kim F. Storm <storm@cua.dk>
parents: 59879
diff changeset
2825 #if GLYPH_DEBUG
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
2826 /* 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
2827 frame_y. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2828 xassert (glyph_row_slice_p (window_row, frame_row));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2829
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2830 /* 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
2831 frame and window share glyphs. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2832
25241
35674d7c4136 (mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents: 25190
diff changeset
2833 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
2834 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
2835 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2836 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2837
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2838 /* Set number of used glyphs in the frame matrix. Since we fill
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2839 up with spaces, and visit leaf windows from left to right it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2840 can be done simply. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2841 frame_row->used[TEXT_AREA]
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2842 = window_matrix->matrix_x + window_matrix->matrix_w;
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 /* Next row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2845 ++window_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2846 ++frame_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2847 }
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
63547
cbb687cf8169 (spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents: 61989
diff changeset
2850 /* Given a user-specified glyph, possibly including a Lisp-level face
cbb687cf8169 (spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents: 61989
diff changeset
2851 ID, return a glyph that has a realized face ID.
cbb687cf8169 (spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents: 61989
diff changeset
2852 This is used for glyphs displayed specially and not part of the text;
cbb687cf8169 (spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents: 61989
diff changeset
2853 for instance, vertical separators, truncation markers, etc. */
cbb687cf8169 (spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents: 61989
diff changeset
2854
92276
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2855 void
63547
cbb687cf8169 (spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents: 61989
diff changeset
2856 spec_glyph_lookup_face (w, glyph)
cbb687cf8169 (spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents: 61989
diff changeset
2857 struct window *w;
92276
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2858 GLYPH *glyph;
63547
cbb687cf8169 (spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents: 61989
diff changeset
2859 {
92276
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2860 int lface_id = GLYPH_FACE (*glyph);
63547
cbb687cf8169 (spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents: 61989
diff changeset
2861 /* Convert the glyph's specified face to a realized (cache) face. */
cbb687cf8169 (spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents: 61989
diff changeset
2862 if (lface_id > 0)
cbb687cf8169 (spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents: 61989
diff changeset
2863 {
cbb687cf8169 (spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents: 61989
diff changeset
2864 int face_id = merge_faces (XFRAME (w->frame),
cbb687cf8169 (spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents: 61989
diff changeset
2865 Qt, lface_id, DEFAULT_FACE_ID);
92276
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2866 SET_GLYPH_FACE (*glyph, face_id);
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
2867 }
63547
cbb687cf8169 (spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents: 61989
diff changeset
2868 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2869
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2870 /* Add spaces to a glyph row ROW in a window matrix.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2871
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2872 Each row has the form:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2873
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2874 +---------+-----------------------------+------------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2875 | left | text | right |
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2878 Left and right marginal areas are optional. This function adds
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2879 spaces to areas so that there are no empty holes between areas.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2880 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
2881 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
2882 is not empty, the left area is filled up.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2883
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2884 To be called for frame-based redisplay, only. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2885
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2886 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2887 fill_up_glyph_row_with_spaces (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2888 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2889 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2890 fill_up_glyph_row_area_with_spaces (row, LEFT_MARGIN_AREA);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2891 fill_up_glyph_row_area_with_spaces (row, TEXT_AREA);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2892 fill_up_glyph_row_area_with_spaces (row, RIGHT_MARGIN_AREA);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2895
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2896 /* 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
2897 frame-based redisplay only. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2898
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2899 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2900 fill_up_glyph_row_area_with_spaces (row, area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2901 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2902 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2903 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2904 if (row->glyphs[area] < row->glyphs[area + 1])
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 struct glyph *end = row->glyphs[area + 1];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2907 struct glyph *text = row->glyphs[area] + row->used[area];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2908
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2909 while (text < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2910 *text++ = space_glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2911 row->used[area] = text - row->glyphs[area];
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 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2914
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2915
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2916 /* 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
2917 reached. In frame matrices only one area, TEXT_AREA, is used. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2918
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2919 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2920 fill_up_frame_row_with_spaces (row, upto)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2921 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2922 int upto;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2923 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2924 int i = row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2925 struct glyph *glyph = row->glyphs[TEXT_AREA];
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2926
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2927 while (i < upto)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2928 glyph[i++] = space_glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2929
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2930 row->used[TEXT_AREA] = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2931 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2932
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2933
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2934
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 Mirroring operations on frame matrices in window matrices
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2937 **********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2938
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2939 /* Set frame being updated via frame-based redisplay to F. This
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2940 function must be called before updates to make explicit that we are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2941 working on frame matrices or not. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2942
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2943 static INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2944 set_frame_matrix_frame (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2945 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2946 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2947 frame_matrix_frame = f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2948 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2949
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2950
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2951 /* Make sure glyph row ROW in CURRENT_MATRIX is up to date.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2952 DESIRED_MATRIX is the desired matrix corresponding to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2953 CURRENT_MATRIX. The update is done by exchanging glyph pointers
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2954 between rows in CURRENT_MATRIX and DESIRED_MATRIX. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2955 frame_matrix_frame is non-null, this indicates that the exchange is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2956 done in frame matrices, and that we have to perform analogous
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2957 operations in window matrices of frame_matrix_frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2958
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2959 static INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2960 make_current (desired_matrix, current_matrix, row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2961 struct glyph_matrix *desired_matrix, *current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2962 int row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2963 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2964 struct glyph_row *current_row = MATRIX_ROW (current_matrix, row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2965 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
2966 int mouse_face_p = current_row->mouse_face_p;
25012
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 /* Do current_row = desired_row. This exchanges glyph pointers
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2969 between both rows, and does a structure assignment otherwise. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2970 assign_row (current_row, desired_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2971
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2972 /* Enable current_row to mark it as valid. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2973 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
2974 current_row->mouse_face_p = mouse_face_p;
25012
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 /* If we are called on frame matrices, perform analogous operations
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2977 for window matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2978 if (frame_matrix_frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2979 mirror_make_current (XWINDOW (frame_matrix_frame->root_window), row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2980 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2983 /* 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
2984 W's frame which has been made current (by swapping pointers between
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2985 current and desired matrix). Perform analogous operations in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2986 matrices of leaf windows in the window tree rooted at W. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2989 mirror_make_current (w, frame_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2990 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2991 int frame_row;
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 while (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2994 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2995 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2996 mirror_make_current (XWINDOW (w->hchild), frame_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2997 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2998 mirror_make_current (XWINDOW (w->vchild), frame_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2999 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3000 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3001 /* Row relative to window W. Don't use FRAME_TO_WINDOW_VPOS
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3002 here because the checks performed in debug mode there
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3003 will not allow the conversion. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3004 int row = frame_row - w->desired_matrix->matrix_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3005
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3006 /* If FRAME_ROW is within W, assign the desired row to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3007 current row (exchanging glyph pointers). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3008 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
3009 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3010 struct glyph_row *current_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3011 = MATRIX_ROW (w->current_matrix, row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3012 struct glyph_row *desired_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3013 = 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
3014
35674d7c4136 (mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents: 25190
diff changeset
3015 if (desired_row->enabled_p)
35674d7c4136 (mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents: 25190
diff changeset
3016 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
3017 else
35674d7c4136 (mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents: 25190
diff changeset
3018 swap_glyph_pointers (desired_row, current_row);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3019 current_row->enabled_p = 1;
6682
16ab14205588 (verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents: 6648
diff changeset
3020 }
16ab14205588 (verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents: 6648
diff changeset
3021 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3022
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3023 w = NILP (w->next) ? 0 : XWINDOW (w->next);
6642
2fda5dd17356 (verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6627
diff changeset
3024 }
2fda5dd17356 (verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6627
diff changeset
3025 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3026
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3027
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3028 /* Perform row dance after scrolling. We are working on the range of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3029 lines UNCHANGED_AT_TOP + 1 to UNCHANGED_AT_TOP + NLINES (not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3030 including) in MATRIX. COPY_FROM is a vector containing, for each
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3031 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
3032 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
3033 index < NLINES. RETAINED_P is a vector containing zero for each
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3034 row 0 <= I < NLINES which is empty.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3035
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3036 This function is called from do_scrolling and do_direct_scrolling. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3037
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3038 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3039 mirrored_line_dance (matrix, unchanged_at_top, nlines, copy_from,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3040 retained_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3041 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3042 int unchanged_at_top, nlines;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3043 int *copy_from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3044 char *retained_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3045 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3046 /* A copy of original rows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3047 struct glyph_row *old_rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3048
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3049 /* Rows to assign to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3050 struct glyph_row *new_rows = MATRIX_ROW (matrix, unchanged_at_top);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3051
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3052 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3053
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3054 /* Make a copy of the original rows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3055 old_rows = (struct glyph_row *) alloca (nlines * sizeof *old_rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3056 bcopy (new_rows, old_rows, nlines * sizeof *old_rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3057
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3058 /* Assign new rows, maybe clear lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3059 for (i = 0; i < nlines; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3060 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3061 int enabled_before_p = new_rows[i].enabled_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3062
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3063 xassert (i + unchanged_at_top < matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3064 xassert (unchanged_at_top + copy_from[i] < matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3065 new_rows[i] = old_rows[copy_from[i]];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3066 new_rows[i].enabled_p = enabled_before_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3067
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3068 /* RETAINED_P is zero for empty lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3069 if (!retained_p[copy_from[i]])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3070 new_rows[i].enabled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3071 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3072
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
3073 /* 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
3074 if (frame_matrix_frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3075 mirror_line_dance (XWINDOW (frame_matrix_frame->root_window),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3076 unchanged_at_top, nlines, copy_from, retained_p);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3079
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3080 /* 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
3081 the current frame matrix. */
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3082
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3083 static void
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3084 sync_window_with_frame_matrix_rows (w)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3085 struct window *w;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3086 {
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3087 struct frame *f = XFRAME (w->frame);
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3088 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
3089 int left, right, x, width;
40214
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3090
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3091 /* 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
3092 xassert (NILP (w->hchild) && NILP (w->vchild));
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3093 xassert (!FRAME_WINDOW_P (f));
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3094
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
3095 left = margin_glyphs_to_reserve (w, 1, w->left_margin_cols);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
3096 right = margin_glyphs_to_reserve (w, 1, w->right_margin_cols);
40214
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3097 x = w->current_matrix->matrix_x;
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3098 width = w->current_matrix->matrix_w;
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3099
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3100 window_row = w->current_matrix->rows;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3101 window_row_end = window_row + w->current_matrix->nrows;
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
3102 frame_row = f->current_matrix->rows + WINDOW_TOP_EDGE_LINE (w);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3103
40214
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3104 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
3105 {
40214
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3106 window_row->glyphs[LEFT_MARGIN_AREA]
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3107 = frame_row->glyphs[0] + x;
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3108 window_row->glyphs[TEXT_AREA]
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3109 = window_row->glyphs[LEFT_MARGIN_AREA] + left;
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3110 window_row->glyphs[LAST_AREA]
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3111 = window_row->glyphs[LEFT_MARGIN_AREA] + width;
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3112 window_row->glyphs[RIGHT_MARGIN_AREA]
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3113 = window_row->glyphs[LAST_AREA] - right;
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3114 }
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3115 }
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3116
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3117
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3118 /* 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
3119 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
3120
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3121 struct window *
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3122 frame_row_to_window (w, row)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3123 struct window *w;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3124 int row;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3125 {
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3126 struct window *found = NULL;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3127
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3128 while (w && !found)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3129 {
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3130 if (!NILP (w->hchild))
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3131 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
3132 else if (!NILP (w->vchild))
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3133 found = frame_row_to_window (XWINDOW (w->vchild), row);
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
3134 else if (row >= WINDOW_TOP_EDGE_LINE (w)
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
3135 && row < WINDOW_BOTTOM_EDGE_LINE (w))
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3136 found = w;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3137
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3138 w = NILP (w->next) ? 0 : XWINDOW (w->next);
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3139 }
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3140
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3141 return found;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3142 }
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3143
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3144
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3145 /* Perform a line dance in the window tree rooted at W, after
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3146 scrolling a frame matrix in mirrored_line_dance.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3147
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3148 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
3149 UNCHANGED_AT_TOP + NLINES (not including) in W's frame matrix.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3150 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
3151 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
3152 index is relative to the row range, i.e. 0 <= index < NLINES.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3153 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
3154 which is empty. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3155
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3156 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3157 mirror_line_dance (w, unchanged_at_top, nlines, copy_from, retained_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3158 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3159 int unchanged_at_top, nlines;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3160 int *copy_from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3161 char *retained_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3162 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3163 while (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3164 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3165 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3166 mirror_line_dance (XWINDOW (w->hchild), unchanged_at_top,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3167 nlines, copy_from, retained_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3168 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3169 mirror_line_dance (XWINDOW (w->vchild), unchanged_at_top,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3170 nlines, copy_from, retained_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3171 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3172 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3173 /* W is a leaf window, and we are working on its current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3174 matrix m. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3175 struct glyph_matrix *m = w->current_matrix;
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3176 int i, sync_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3177 struct glyph_row *old_rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3178
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3179 /* Make a copy of the original rows of matrix m. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3180 old_rows = (struct glyph_row *) alloca (m->nrows * sizeof *old_rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3181 bcopy (m->rows, old_rows, m->nrows * sizeof *old_rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3182
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3183 for (i = 0; i < nlines; ++i)
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 /* Frame relative line assigned to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3186 int frame_to = i + unchanged_at_top;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3187
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3188 /* Frame relative line assigned. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3189 int frame_from = copy_from[i] + unchanged_at_top;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3190
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3191 /* Window relative line assigned to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3192 int window_to = frame_to - m->matrix_y;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3193
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3194 /* Window relative line assigned. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3195 int window_from = frame_from - m->matrix_y;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3196
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3197 /* Is assigned line inside window? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3198 int from_inside_window_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3199 = window_from >= 0 && window_from < m->matrix_h;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3200
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3201 /* Is assigned to line inside window? */
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3202 int to_inside_window_p
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3203 = window_to >= 0 && window_to < m->matrix_h;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3204
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3205 if (from_inside_window_p && to_inside_window_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3206 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3207 /* Enabled setting before assignment. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3208 int enabled_before_p;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3209
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3210 /* Do the assignment. The enabled_p flag is saved
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3211 over the assignment because the old redisplay did
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3212 that. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3213 enabled_before_p = m->rows[window_to].enabled_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3214 m->rows[window_to] = old_rows[window_from];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3215 m->rows[window_to].enabled_p = enabled_before_p;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3216
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3217 /* If frame line is empty, window line is empty, too. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3218 if (!retained_p[copy_from[i]])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3219 m->rows[window_to].enabled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3220 }
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3221 else if (to_inside_window_p)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3222 {
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3223 /* A copy between windows. This is an infrequent
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3224 case not worth optimizing. */
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3225 struct frame *f = XFRAME (w->frame);
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3226 struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f));
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3227 struct window *w2;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3228 struct glyph_matrix *m2;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3229 int m2_from;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3230
60684
18bf961ed63a (mirror_line_dance): Set W2 according to FRAME_FROM.
Richard M. Stallman <rms@gnu.org>
parents: 59905
diff changeset
3231 w2 = frame_row_to_window (root, frame_from);
61416
89b8166ef056 (mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents: 60684
diff changeset
3232 /* ttn@surf.glug.org: when enabling menu bar using `emacs
89b8166ef056 (mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents: 60684
diff changeset
3233 -nw', FROM_FRAME sometimes has no associated window.
89b8166ef056 (mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents: 60684
diff changeset
3234 This check avoids a segfault if W2 is null. */
89b8166ef056 (mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents: 60684
diff changeset
3235 if (w2)
89b8166ef056 (mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents: 60684
diff changeset
3236 {
89b8166ef056 (mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents: 60684
diff changeset
3237 m2 = w2->current_matrix;
89b8166ef056 (mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents: 60684
diff changeset
3238 m2_from = frame_from - m2->matrix_y;
89b8166ef056 (mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents: 60684
diff changeset
3239 copy_row_except_pointers (m->rows + window_to,
89b8166ef056 (mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents: 60684
diff changeset
3240 m2->rows + m2_from);
89b8166ef056 (mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents: 60684
diff changeset
3241
89b8166ef056 (mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents: 60684
diff changeset
3242 /* If frame line is empty, window line is empty, too. */
89b8166ef056 (mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents: 60684
diff changeset
3243 if (!retained_p[copy_from[i]])
89b8166ef056 (mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents: 60684
diff changeset
3244 m->rows[window_to].enabled_p = 0;
89b8166ef056 (mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents: 60684
diff changeset
3245 }
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3246 sync_p = 1;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3247 }
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3248 else if (from_inside_window_p)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3249 sync_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3250 }
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3251
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3252 /* 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
3253 pointers are in sync with the frame matrix. */
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3254 if (sync_p)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3255 sync_window_with_frame_matrix_rows (w);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3256
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3257 /* Check that no pointers are lost. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3258 CHECK_MATRIX (m);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3259 }
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 /* Next window on same level. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3262 w = NILP (w->next) ? 0 : XWINDOW (w->next);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3263 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3264 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3267 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3268
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3269 /* Check that window and frame matrices agree about their
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3270 understanding where glyphs of the rows are to find. For each
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3271 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
3272 matrices of leaf window agree with their frame matrices about
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3273 glyph pointers. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3274
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
3275 void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3276 check_window_matrix_pointers (w)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3277 struct window *w;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3278 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3279 while (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3280 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3281 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3282 check_window_matrix_pointers (XWINDOW (w->hchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3283 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3284 check_window_matrix_pointers (XWINDOW (w->vchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3285 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3286 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3287 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3288 check_matrix_pointers (w->desired_matrix, f->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3289 check_matrix_pointers (w->current_matrix, f->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3290 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3291
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3292 w = NILP (w->next) ? 0 : XWINDOW (w->next);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3293 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3294 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3297 /* Check that window rows are slices of frame rows. WINDOW_MATRIX is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3298 a window and FRAME_MATRIX is the corresponding frame matrix. For
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3299 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
3300 corresponding frame row. If it isn't, abort. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3301
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3302 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3303 check_matrix_pointers (window_matrix, frame_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3304 struct glyph_matrix *window_matrix, *frame_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3305 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3306 /* Row number in WINDOW_MATRIX. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3307 int i = 0;
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 /* Row number corresponding to I in FRAME_MATRIX. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3310 int j = window_matrix->matrix_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3311
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3312 /* For all rows check that the row in the window matrix is a
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3313 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
3314 mirror an operation on the frame matrix correctly. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3315 while (i < window_matrix->nrows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3316 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3317 if (!glyph_row_slice_p (window_matrix->rows + i,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3318 frame_matrix->rows + j))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3319 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3320 ++i, ++j;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3321 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3322 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3323
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3324 #endif /* GLYPH_DEBUG != 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3325
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3326
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3327
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3328 /**********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3329 VPOS and HPOS translations
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 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3333
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3334 /* Translate vertical position VPOS which is relative to window W to a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3335 vertical position relative to W's frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3336
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3337 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3338 window_to_frame_vpos (w, vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3339 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3340 int vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3341 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3342 struct frame *f = XFRAME (w->frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3343
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3344 xassert (!FRAME_WINDOW_P (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3345 xassert (vpos >= 0 && vpos <= w->desired_matrix->nrows);
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
3346 vpos += WINDOW_TOP_EDGE_LINE (w);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
3347 xassert (vpos >= 0 && vpos <= FRAME_LINES (f));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3348 return vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3349 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3352 /* 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
3353 a horizontal position relative to W's frame. */
25012
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 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3356 window_to_frame_hpos (w, hpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3357 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3358 int hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3359 {
65308
7b2a711dc863 (window_to_frame_hpos, update_window):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65016
diff changeset
3360 xassert (!FRAME_WINDOW_P (XFRAME (w->frame)));
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
3361 hpos += WINDOW_LEFT_EDGE_COL (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3362 return hpos;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3363 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3364
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3365 #endif /* GLYPH_DEBUG */
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
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3368
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3369 /**********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3370 Redrawing Frames
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 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
3374 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
3375 (frame)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3376 Lisp_Object frame;
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 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3379
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40512
diff changeset
3380 CHECK_LIVE_FRAME (frame);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3381 f = XFRAME (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3382
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3383 /* Ignore redraw requests, if frame has no glyphs yet.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3384 (Implementation note: It still has to be checked why we are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3385 called so early here). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3386 if (!glyphs_initialized_initially_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3387 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3388
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3389 update_begin (f);
83008
040dd41ed7d0 Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83004
diff changeset
3390 #ifdef MSDOS
35445
9af454aee182 (Fredraw_frame): Remove reference to
Andrew Innes <andrewi@gnu.org>
parents: 35374
diff changeset
3391 if (FRAME_MSDOS_P (f))
97646
fab72f02d115 (init_display): Remove MS-DOS specific conditions for calling
Eli Zaretskii <eliz@gnu.org>
parents: 97142
diff changeset
3392 FRAME_TERMINAL (f)->set_terminal_modes_hook (FRAME_TERMINAL (f));
83008
040dd41ed7d0 Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83004
diff changeset
3393 #endif
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
3394 clear_frame (f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3395 clear_current_matrices (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3396 update_end (f);
82990
2ecd1f669db9 Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents: 82989
diff changeset
3397 if (FRAME_TERMCAP_P (f))
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
3398 fflush (FRAME_TTY (f)->output);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3399 windows_or_buffers_changed++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3400 /* Mark all windows as inaccurate, so that every window will have
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3401 its redisplay done. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3402 mark_window_display_accurate (FRAME_ROOT_WINDOW (f), 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3403 set_window_update_flags (XWINDOW (FRAME_ROOT_WINDOW (f)), 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3404 f->garbaged = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3405 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3406 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3407
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3408
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3409 /* 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
3410 function redraw-frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3411
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3412 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3413 redraw_frame (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3414 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3415 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3416 Lisp_Object frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3417 XSETFRAME (frame, f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3418 Fredraw_frame (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3419 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3420
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3421
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3422 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
3423 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
3424 ()
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3425 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3426 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3427
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3428 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3429 if (FRAME_VISIBLE_P (XFRAME (frame)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3430 Fredraw_frame (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3431
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3432 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3433 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3434
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3435
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3436 /* 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
3437 visible frames marked as garbaged. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3438
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3439 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3440 redraw_garbaged_frames ()
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3441 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3442 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3443
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3444 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3445 if (FRAME_VISIBLE_P (XFRAME (frame))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3446 && FRAME_GARBAGED_P (XFRAME (frame)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3447 Fredraw_frame (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3448 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3449
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3450
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3451
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3452 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3453 Frame Update
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3454 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3455
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3456 /* Update frame F based on the data in desired matrices.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3457
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3458 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
3459 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
3460 scrolling.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3461
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3462 Value is non-zero if redisplay was stopped due to pending input. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3463
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3464 int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3465 update_frame (f, force_p, inhibit_hairy_id_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3466 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3467 int force_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3468 int inhibit_hairy_id_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3469 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3470 /* 1 means display has been paused because of pending input. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3471 int paused_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3472 struct window *root_window = XWINDOW (f->root_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3473
76065
2001cae9df4e (update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents: 75371
diff changeset
3474 if (redisplay_dont_pause)
2001cae9df4e (update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents: 75371
diff changeset
3475 force_p = 1;
71323
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3476 #if PERIODIC_PREEMPTION_CHECKING
76065
2001cae9df4e (update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents: 75371
diff changeset
3477 else if (NILP (Vredisplay_preemption_period))
2001cae9df4e (update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents: 75371
diff changeset
3478 force_p = 1;
2001cae9df4e (update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents: 75371
diff changeset
3479 else if (!force_p && NUMBERP (Vredisplay_preemption_period))
71323
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3480 {
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3481 EMACS_TIME tm;
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3482 double p = XFLOATINT (Vredisplay_preemption_period);
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3483 int sec, usec;
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3484
71378
1b442e9d8373 (update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents: 71333
diff changeset
3485 if (detect_input_pending_ignore_squeezables ())
1b442e9d8373 (update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents: 71333
diff changeset
3486 {
1b442e9d8373 (update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents: 71333
diff changeset
3487 paused_p = 1;
1b442e9d8373 (update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents: 71333
diff changeset
3488 goto do_pause;
1b442e9d8373 (update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents: 71333
diff changeset
3489 }
1b442e9d8373 (update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents: 71333
diff changeset
3490
71323
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3491 sec = (int) p;
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3492 usec = (p - sec) * 1000000;
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3493
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3494 EMACS_GET_TIME (tm);
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3495 EMACS_SET_SECS_USECS (preemption_period, sec, usec);
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3496 EMACS_ADD_TIME (preemption_next_check, tm, preemption_period);
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3497 }
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3498 #endif
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3499
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3500 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3501 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3502 /* We are working on window matrix basis. All windows whose
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3503 flag must_be_updated_p is set have to be updated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3504
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3505 /* Record that we are not working on frame matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3506 set_frame_matrix_frame (NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3507
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3508 /* Update all windows in the window tree of F, maybe stopping
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3509 when pending input is detected. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3510 update_begin (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3511
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3512 /* Update the menu bar on X frames that don't have toolkit
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3513 support. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3514 if (WINDOWP (f->menu_bar_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3515 update_window (XWINDOW (f->menu_bar_window), 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3516
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3517 /* 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
3518 if (WINDOWP (f->tool_bar_window))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3519 {
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
3520 struct window *w = XWINDOW (f->tool_bar_window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3521
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3522 /* Update tool-bar window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3523 if (w->must_be_updated_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3524 {
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
3525 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
3526
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3527 update_window (w, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3528 w->must_be_updated_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3529
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3530 /* Swap tool-bar strings. We swap because we want to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3531 reuse strings. */
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
3532 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
3533 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
3534 f->desired_tool_bar_string = tem;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3535 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3536 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3537
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3538
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3539 /* Update windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3540 paused_p = update_window_tree (root_window, force_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3541 update_end (f);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3542
53881
ccacbf7f76b2 (row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents: 53612
diff changeset
3543 /* This flush is a performance bottleneck under X,
83037
03a73693678e Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents: 83023 53881
diff changeset
3544 and it doesn't seem to be necessary anyway (in general).
53881
ccacbf7f76b2 (row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents: 53612
diff changeset
3545 It is necessary when resizing the window with the mouse, or
83037
03a73693678e Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents: 83023 53881
diff changeset
3546 at least the fringes are not redrawn in a timely manner. ++kfs */
53881
ccacbf7f76b2 (row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents: 53612
diff changeset
3547 if (f->force_flush_display_p)
83037
03a73693678e Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents: 83023 53881
diff changeset
3548 {
03a73693678e Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents: 83023 53881
diff changeset
3549 FRAME_RIF (f)->flush_display (f);
03a73693678e Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents: 83023 53881
diff changeset
3550 f->force_flush_display_p = 0;
03a73693678e Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents: 83023 53881
diff changeset
3551 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3552 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3553 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3554 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3555 /* We are working on frame matrix basis. Set the frame on whose
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3556 frame matrix we operate. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3557 set_frame_matrix_frame (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3558
31295
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3559 /* Build F's desired matrix from window matrices. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3560 build_frame_matrix (f);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3561
31295
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3562 /* Update the display */
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3563 update_begin (f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3564 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
3565 update_end (f);
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3566
98508
c370f470d5ba (update_frame): Flush termscript for MSDOS frames as well as for TTY.
Eli Zaretskii <eliz@gnu.org>
parents: 98497
diff changeset
3567 if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
83008
040dd41ed7d0 Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83004
diff changeset
3568 {
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
3569 if (FRAME_TTY (f)->termscript)
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
3570 fflush (FRAME_TTY (f)->termscript);
98508
c370f470d5ba (update_frame): Flush termscript for MSDOS frames as well as for TTY.
Eli Zaretskii <eliz@gnu.org>
parents: 98497
diff changeset
3571 if (FRAME_TERMCAP_P (f))
c370f470d5ba (update_frame): Flush termscript for MSDOS frames as well as for TTY.
Eli Zaretskii <eliz@gnu.org>
parents: 98497
diff changeset
3572 fflush (FRAME_TTY (f)->output);
83008
040dd41ed7d0 Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83004
diff changeset
3573 }
31295
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3574
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3575 /* 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
3576 #if GLYPH_DEBUG
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
3577 check_window_matrix_pointers (root_window);
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
3578 add_frame_display_history (f, paused_p);
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
3579 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3580 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3581
71378
1b442e9d8373 (update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents: 71333
diff changeset
3582 do_pause:
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3583 /* Reset flags indicating that a window should be updated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3584 set_window_update_flags (root_window, 0);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3585
31295
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3586 display_completed = !paused_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3587 return paused_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3588 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3589
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3590
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3591
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3592 /************************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3593 Window-based updates
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3594 ************************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3595
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3596 /* 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
3597 don't stop updating when input is pending. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3598
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3599 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3600 update_window_tree (w, force_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3601 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3602 int force_p;
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 int paused_p = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3605
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3606 while (w && !paused_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3607 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3608 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3609 paused_p |= update_window_tree (XWINDOW (w->hchild), force_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3610 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3611 paused_p |= update_window_tree (XWINDOW (w->vchild), force_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3612 else if (w->must_be_updated_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3613 paused_p |= update_window (w, force_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3614
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3615 w = NILP (w->next) ? 0 : XWINDOW (w->next);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3616 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3617
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3618 return paused_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3619 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3620
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3621
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3622 /* 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
3623 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
3624
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3625 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3626 update_single_window (w, force_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3627 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3628 int force_p;
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 if (w->must_be_updated_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3631 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3632 struct frame *f = XFRAME (WINDOW_FRAME (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3633
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3634 /* Record that this is not a frame-based redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3635 set_frame_matrix_frame (NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3636
76065
2001cae9df4e (update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents: 75371
diff changeset
3637 if (redisplay_dont_pause)
2001cae9df4e (update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents: 75371
diff changeset
3638 force_p = 1;
71323
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3639 #if PERIODIC_PREEMPTION_CHECKING
76065
2001cae9df4e (update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents: 75371
diff changeset
3640 else if (NILP (Vredisplay_preemption_period))
2001cae9df4e (update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents: 75371
diff changeset
3641 force_p = 1;
2001cae9df4e (update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents: 75371
diff changeset
3642 else if (!force_p && NUMBERP (Vredisplay_preemption_period))
71323
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3643 {
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3644 EMACS_TIME tm;
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3645 double p = XFLOATINT (Vredisplay_preemption_period);
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3646 int sec, usec;
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3647
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3648 sec = (int) p;
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3649 usec = (p - sec) * 1000000;
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3650
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3651 EMACS_GET_TIME (tm);
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3652 EMACS_SET_SECS_USECS (preemption_period, sec, usec);
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3653 EMACS_ADD_TIME (preemption_next_check, tm, preemption_period);
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3654 }
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3655 #endif
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3656
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3657 /* Update W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3658 update_begin (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3659 update_window (w, force_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3660 update_end (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3661
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3662 /* Reset flag in W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3663 w->must_be_updated_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3664 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3665 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3666
65905
a82ae68a578e (redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents: 65890
diff changeset
3667 #ifdef HAVE_WINDOW_SYSTEM
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3668
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3669 /* 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
3670 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
3671
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3672 static void
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3673 redraw_overlapped_rows (w, yb)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3674 struct window *w;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3675 int yb;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3676 {
30165
d7ec5b3caccc (redraw_overlapped_rows): Add missing local.
Gerd Moellmann <gerd@gnu.org>
parents: 30161
diff changeset
3677 int i;
82992
5de4189e659d Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents: 82990
diff changeset
3678 struct frame *f = XFRAME (WINDOW_FRAME (w));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3679
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3680 /* 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
3681 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
3682 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
3683 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
3684 current rows is 0. */
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3685 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
3686 {
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
3687 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
3688
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3689 if (!row->enabled_p)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3690 break;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3691 else if (row->mode_line_p)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3692 continue;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3693
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3694 if (row->overlapped_p)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3695 {
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3696 enum glyph_row_area area;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3697
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3698 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
3699 {
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3700 updated_row = row;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3701 updated_area = area;
82992
5de4189e659d Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents: 82990
diff changeset
3702 FRAME_RIF (f)->cursor_to (i, 0, row->y,
5de4189e659d Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents: 82990
diff changeset
3703 area == TEXT_AREA ? row->x : 0);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3704 if (row->used[area])
82992
5de4189e659d Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents: 82990
diff changeset
3705 FRAME_RIF (f)->write_glyphs (row->glyphs[area],
5de4189e659d Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents: 82990
diff changeset
3706 row->used[area]);
5de4189e659d Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents: 82990
diff changeset
3707 FRAME_RIF (f)->clear_end_of_line (-1);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3708 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3709
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3710 row->overlapped_p = 0;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3711 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3712
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
3713 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
3714 break;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3715 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3716 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3717
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3718
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3719 /* 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
3720 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
3721
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3722 static void
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3723 redraw_overlapping_rows (w, yb)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3724 struct window *w;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3725 int yb;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3726 {
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3727 int i, bottom_y;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3728 struct glyph_row *row;
82992
5de4189e659d Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents: 82990
diff changeset
3729 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w)));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3730
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3731 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
3732 {
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3733 row = w->current_matrix->rows + i;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3734
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3735 if (!row->enabled_p)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3736 break;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3737 else if (row->mode_line_p)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3738 continue;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3739
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3740 bottom_y = MATRIX_ROW_BOTTOM_Y (row);
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3741
102882
40a6ace09cb5 (redraw_overlapping_rows): Fix detection of
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 101690
diff changeset
3742 if (row->overlapping_p)
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3743 {
65890
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3744 int overlaps = 0;
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3745
102882
40a6ace09cb5 (redraw_overlapping_rows): Fix detection of
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 101690
diff changeset
3746 if (MATRIX_ROW_OVERLAPS_PRED_P (row) && i > 0
65890
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3747 && !MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p)
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3748 overlaps |= OVERLAPS_PRED;
102882
40a6ace09cb5 (redraw_overlapping_rows): Fix detection of
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 101690
diff changeset
3749 if (MATRIX_ROW_OVERLAPS_SUCC_P (row) && bottom_y < yb
65890
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3750 && !MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p)
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3751 overlaps |= OVERLAPS_SUCC;
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3752
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3753 if (overlaps)
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3754 {
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3755 if (row->used[LEFT_MARGIN_AREA])
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3756 rif->fix_overlapping_area (w, row, LEFT_MARGIN_AREA, overlaps);
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3757
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3758 if (row->used[TEXT_AREA])
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3759 rif->fix_overlapping_area (w, row, TEXT_AREA, overlaps);
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3760
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3761 if (row->used[RIGHT_MARGIN_AREA])
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3762 rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA, overlaps);
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3763
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3764 /* Record in neighbour rows that ROW overwrites part of
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3765 their display. */
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3766 if (overlaps & OVERLAPS_PRED)
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3767 MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1;
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3768 if (overlaps & OVERLAPS_SUCC)
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3769 MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p = 1;
1a7a619caf97 (redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 65308
diff changeset
3770 }
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3771 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3772
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3773 if (bottom_y >= yb)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3774 break;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3775 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3776 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3777
65905
a82ae68a578e (redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents: 65890
diff changeset
3778 #endif /* HAVE_WINDOW_SYSTEM */
a82ae68a578e (redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents: 65890
diff changeset
3779
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3780
34929
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
3781 #ifdef GLYPH_DEBUG
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
3782
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
3783 /* 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
3784 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
3785
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
3786 void
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
3787 check_current_matrix_flags (w)
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
3788 struct window *w;
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
3789 {
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
3790 int last_seen_p = 0;
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
3791 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
3792
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
3793 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
3794 {
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
3795 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
3796 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
3797 last_seen_p = 1;
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
3798 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
3799 abort ();
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
3800 }
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
3801 }
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
3802
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
3803 #endif /* GLYPH_DEBUG */
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
3804
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
3805
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3806 /* 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
3807 not stop when detecting pending input. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3808
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3809 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3810 update_window (w, force_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3811 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3812 int force_p;
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 struct glyph_matrix *desired_matrix = w->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3815 int paused_p;
71323
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3816 #if !PERIODIC_PREEMPTION_CHECKING
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3817 int preempt_count = baud_rate / 2400 + 1;
71323
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3818 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3819 extern int input_pending;
34517
7c8d2cec3d08 (update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents: 34279
diff changeset
3820 extern Lisp_Object do_mouse_tracking;
83241
3dcba0bc766b Merged in changes from CVS trunk. (Long time no see!) :-)
Karoly Lorentey <lorentey@elte.hu>
parents: 83237 59879
diff changeset
3821 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w)));
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
3822 #if GLYPH_DEBUG
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3823 /* Check that W's frame doesn't have glyph matrices. */
65308
7b2a711dc863 (window_to_frame_hpos, update_window):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 65016
diff changeset
3824 xassert (FRAME_WINDOW_P (XFRAME (WINDOW_FRAME (w))));
59879
aaf00c303308 * dispnew.c (update_window): Fixing compile error due to
Steven Tamm <steventamm@mac.com>
parents: 59592
diff changeset
3825 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3826
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3827 /* Check pending input the first time so that we can quickly return. */
76065
2001cae9df4e (update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents: 75371
diff changeset
3828 #if !PERIODIC_PREEMPTION_CHECKING
2001cae9df4e (update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents: 75371
diff changeset
3829 if (!force_p)
59580
f43d0816e9c3 * keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
Jan Djärv <jan.h.d@swipnet.se>
parents: 58986
diff changeset
3830 detect_input_pending_ignore_squeezables ();
71323
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3831 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3832
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3833 /* 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
3834 the update. */
34517
7c8d2cec3d08 (update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents: 34279
diff changeset
3835 if (force_p || !input_pending || !NILP (do_mouse_tracking))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3836 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3837 struct glyph_row *row, *end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3838 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
3839 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
3840 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
3841
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3842 rif->update_window_begin_hook (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3843 yb = window_text_bottom_y (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3844
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
3845 /* 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
3846 Adjust y-positions of other rows by the header line height. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3847 row = desired_matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3848 end = row + desired_matrix->nrows - 1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3849
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3850 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
3851 {
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
3852 header_line_row = row;
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
3853 ++row;
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
3854 }
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
3855 else
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
3856 header_line_row = NULL;
25012
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 /* Update the mode line, if necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3859 mode_line_row = MATRIX_MODE_LINE_ROW (desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3860 if (mode_line_row->mode_line_p && mode_line_row->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3861 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3862 mode_line_row->y = yb;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3863 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
3864 desired_matrix),
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
3865 &mouse_face_overwritten_p);
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3868 /* Find first enabled row. Optimizations in redisplay_internal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3869 may lead to an update with only one row enabled. There may
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3870 be also completely empty matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3871 while (row < end && !row->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3872 ++row;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3873
31825
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
3874 /* Try reusing part of the display by copying. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3875 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
3876 {
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
3877 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
3878 if (rc < 0)
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
3879 {
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
3880 /* 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
3881 paused_p = 0;
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
3882 goto set_cursor;
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
3883 }
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
3884 else if (rc > 0)
54847
5acc1d864551 (update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents: 54176
diff changeset
3885 {
5acc1d864551 (update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents: 54176
diff changeset
3886 /* We've scrolled the display. */
5acc1d864551 (update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents: 54176
diff changeset
3887 force_p = 1;
5acc1d864551 (update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents: 54176
diff changeset
3888 changed_p = 1;
5acc1d864551 (update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents: 54176
diff changeset
3889 }
38489
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
3890 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3891
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3892 /* 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
3893 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
3894 if (row->enabled_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3895 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3896 int vpos = MATRIX_ROW_VPOS (row, desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3897 int i;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3898
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
3899 /* We'll have to play a little bit with when to
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3900 detect_input_pending. If it's done too often,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3901 scrolling large windows with repeated scroll-up
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3902 commands will too quickly pause redisplay. */
71323
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3903 #if PERIODIC_PREEMPTION_CHECKING
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3904 if (!force_p)
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3905 {
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3906 EMACS_TIME tm, dif;
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3907 EMACS_GET_TIME (tm);
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3908 EMACS_SUB_TIME (dif, preemption_next_check, tm);
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3909 if (EMACS_TIME_NEG_P (dif))
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3910 {
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3911 EMACS_ADD_TIME (preemption_next_check, tm, preemption_period);
71378
1b442e9d8373 (update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents: 71333
diff changeset
3912 if (detect_input_pending_ignore_squeezables ())
1b442e9d8373 (update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents: 71333
diff changeset
3913 break;
71323
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3914 }
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3915 }
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3916 #else
34622
877ed6cab304 (update_window): Detect pending input every nth line
Gerd Moellmann <gerd@gnu.org>
parents: 34517
diff changeset
3917 if (!force_p && ++n_updated % preempt_count == 0)
59580
f43d0816e9c3 * keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
Jan Djärv <jan.h.d@swipnet.se>
parents: 58986
diff changeset
3918 detect_input_pending_ignore_squeezables ();
71323
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
3919 #endif
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
3920 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
3921 &mouse_face_overwritten_p);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3922
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3923 /* Mark all rows below the last visible one in the current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3924 matrix as invalid. This is necessary because of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3925 variable line heights. Consider the case of three
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3926 successive redisplays, where the first displays 5
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3927 lines, the second 3 lines, and the third 5 lines again.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3928 If the second redisplay wouldn't mark rows in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3929 current matrix invalid, the third redisplay might be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3930 tempted to optimize redisplay based on lines displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3931 in the first redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3932 if (MATRIX_ROW_BOTTOM_Y (row) >= yb)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3933 for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3934 MATRIX_ROW (w->current_matrix, i)->enabled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3935 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3936
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3937 /* Was display preempted? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3938 paused_p = row < end;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3939
38489
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
3940 set_cursor:
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3941
54176
d1e478a807f4 (update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents: 53881
diff changeset
3942 /* Update the header line after scrolling because a new header
d1e478a807f4 (update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents: 53881
diff changeset
3943 line would otherwise overwrite lines at the top of the window
d1e478a807f4 (update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents: 53881
diff changeset
3944 that can be scrolled. */
d1e478a807f4 (update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents: 53881
diff changeset
3945 if (header_line_row && header_line_row->enabled_p)
d1e478a807f4 (update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents: 53881
diff changeset
3946 {
d1e478a807f4 (update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents: 53881
diff changeset
3947 header_line_row->y = 0;
d1e478a807f4 (update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents: 53881
diff changeset
3948 update_window_line (w, 0, &mouse_face_overwritten_p);
d1e478a807f4 (update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents: 53881
diff changeset
3949 }
d1e478a807f4 (update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents: 53881
diff changeset
3950
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
3951 /* Fix the appearance of overlapping/overlapped rows. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3952 if (!paused_p && !w->pseudo_window_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3953 {
65905
a82ae68a578e (redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents: 65890
diff changeset
3954 #ifdef HAVE_WINDOW_SYSTEM
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
3955 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
3956 {
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
3957 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
3958 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
3959 }
65905
a82ae68a578e (redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents: 65890
diff changeset
3960 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3961
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3962 /* Make cursor visible at cursor position of W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3963 set_window_cursor_after_update (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3964
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
3965 #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
3966 for debugging only. See the comment of check_matrix_invariants. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3967 IF_DEBUG (check_matrix_invariants (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3968 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3969 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3970
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3971 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3972 /* Remember the redisplay method used to display the matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3973 strcpy (w->current_matrix->method, w->desired_matrix->method);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3974 #endif
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3975
53612
2ddd2a0d047a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents: 53605
diff changeset
3976 #ifdef HAVE_WINDOW_SYSTEM
53605
7dfd96e25ec6 (row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents: 53514
diff changeset
3977 update_window_fringes (w, 0);
53612
2ddd2a0d047a Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents: 53605
diff changeset
3978 #endif
53605
7dfd96e25ec6 (row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents: 53514
diff changeset
3979
38489
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
3980 /* 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
3981 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
3982 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
3983 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
3984 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
3985 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3986 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3987 paused_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3988
34893
779bd3fa820e Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents: 34866
diff changeset
3989 #if GLYPH_DEBUG
34944
4fc804373f2a (update_window): Don't check_current_matrix_flags.
Gerd Moellmann <gerd@gnu.org>
parents: 34929
diff changeset
3990 /* check_current_matrix_flags (w); */
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
3991 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
3992 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3993
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3994 clear_glyph_matrix (desired_matrix);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3995
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3996 return paused_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3997 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3998
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3999
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4000 /* Update the display of area AREA in window W, row number VPOS.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4001 AREA can be either LEFT_MARGIN_AREA or RIGHT_MARGIN_AREA. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4002
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4003 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4004 update_marginal_area (w, area, vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4005 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4006 int area, vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4007 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4008 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos);
82992
5de4189e659d Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents: 82990
diff changeset
4009 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w)));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4010
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4011 /* Let functions in xterm.c know what area subsequent X positions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4012 will be relative to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4013 updated_area = area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4014
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4015 /* 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
4016 of the area. I don't think that something more sophisticated is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4017 necessary here, since marginal areas will not be the default. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4018 rif->cursor_to (vpos, 0, desired_row->y, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4019 if (desired_row->used[area])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4020 rif->write_glyphs (desired_row->glyphs[area], desired_row->used[area]);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4021 rif->clear_end_of_line (-1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4022 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4023
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4024
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4025 /* 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
4026 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
4027
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4028 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4029 update_text_area (w, vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4030 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4031 int vpos;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4032 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4033 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4034 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos);
82992
5de4189e659d Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents: 82990
diff changeset
4035 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w)));
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4036 int changed_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4037
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4038 /* Let functions in xterm.c know what area subsequent X positions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4039 will be relative to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4040 updated_area = TEXT_AREA;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4041
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4042 /* 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
4043 or the current row is marked invalid, write the entire line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4044 if (!current_row->enabled_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4045 || desired_row->y != current_row->y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4046 || desired_row->ascent != current_row->ascent
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4047 || 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
4048 || desired_row->phys_height != current_row->phys_height
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4049 || 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
4050 || current_row->overlapped_p
75371
7267980a2f42 * dispnew.c (update_text_area): Revert 2006-09-17 change.
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
4051 /* This next line is necessary for correctly redrawing
7267980a2f42 * dispnew.c (update_text_area): Revert 2006-09-17 change.
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
4052 mouse-face areas after scrolling and other operations.
7267980a2f42 * dispnew.c (update_text_area): Revert 2006-09-17 change.
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
4053 However, it causes excessive flickering when mouse is moved
7267980a2f42 * dispnew.c (update_text_area): Revert 2006-09-17 change.
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
4054 across the mode line. Luckily, turning it off for the mode
76069
898ccefda9ce (update_text_area): Clear mouse face on header lines.
Kim F. Storm <storm@cua.dk>
parents: 76065
diff changeset
4055 line doesn't seem to hurt anything. -- cyd.
898ccefda9ce (update_text_area): Clear mouse face on header lines.
Kim F. Storm <storm@cua.dk>
parents: 76065
diff changeset
4056 But it is still needed for the header line. -- kfs. */
898ccefda9ce (update_text_area): Clear mouse face on header lines.
Kim F. Storm <storm@cua.dk>
parents: 76065
diff changeset
4057 || (current_row->mouse_face_p
898ccefda9ce (update_text_area): Clear mouse face on header lines.
Kim F. Storm <storm@cua.dk>
parents: 76065
diff changeset
4058 && !(current_row->mode_line_p && vpos > 0))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4059 || current_row->x != desired_row->x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4060 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4061 rif->cursor_to (vpos, 0, desired_row->y, desired_row->x);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4062
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4063 if (desired_row->used[TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4064 rif->write_glyphs (desired_row->glyphs[TEXT_AREA],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4065 desired_row->used[TEXT_AREA]);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4066
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4067 /* Clear to end of window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4068 rif->clear_end_of_line (-1);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4069 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
4070
cf2454d3a103 (update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents: 44580
diff changeset
4071 /* 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
4072 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
4073 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
4074 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
4075 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
4076 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
4077 redisplay. */
cf2454d3a103 (update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents: 44580
diff changeset
4078 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
4079 w->phys_cursor_on_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4080 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4081 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4082 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4083 int stop, i, x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4084 struct glyph *current_glyph = current_row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4085 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
4086 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
4087 int desired_stop_pos = desired_row->used[TEXT_AREA];
98589
b4502c55e86b (update_text_area): Avoid looping due to large glyph
Chong Yidong <cyd@stupidchicken.com>
parents: 98508
diff changeset
4088 int abort_skipping = 0;
35268
d93bf580d166 (update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents: 35006
diff changeset
4089
69110
9d86d35acf33 (update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 68651
diff changeset
4090 /* If the desired row extends its face to the text area end, and
9d86d35acf33 (update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 68651
diff changeset
4091 unless the current row also does so at the same position,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4092 make sure we write at least one glyph, so that the face
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4093 extension actually takes place. */
69110
9d86d35acf33 (update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 68651
diff changeset
4094 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)
9d86d35acf33 (update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 68651
diff changeset
4095 && (desired_stop_pos < current_row->used[TEXT_AREA]
9d86d35acf33 (update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 68651
diff changeset
4096 || (desired_stop_pos == current_row->used[TEXT_AREA]
9d86d35acf33 (update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 68651
diff changeset
4097 && !MATRIX_ROW_EXTENDS_FACE_P (current_row))))
35268
d93bf580d166 (update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents: 35006
diff changeset
4098 --desired_stop_pos;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4099
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4100 stop = min (current_row->used[TEXT_AREA], desired_stop_pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4101 i = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4102 x = desired_row->x;
36097
1dfaaf6d6166 (update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents: 35924
diff changeset
4103
1dfaaf6d6166 (update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents: 35924
diff changeset
4104 /* 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
4105 in common. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4106 while (i < stop)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4107 {
98589
b4502c55e86b (update_text_area): Avoid looping due to large glyph
Chong Yidong <cyd@stupidchicken.com>
parents: 98508
diff changeset
4108 int can_skip_p = !abort_skipping;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4109
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4110 /* 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
4111 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
4112 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
4113 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
4114 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
4115 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
4116 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
4117 `f' on the screen. */
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4118 if (overlapping_glyphs_p && i > 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4119 {
33596
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4120 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
4121 int left, right;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4122
33596
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4123 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
4124 &left, &right);
98589
b4502c55e86b (update_text_area): Avoid looping due to large glyph
Chong Yidong <cyd@stupidchicken.com>
parents: 98508
diff changeset
4125 can_skip_p = (right == 0 && !abort_skipping);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4126 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4127
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4128 if (can_skip_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4129 {
98589
b4502c55e86b (update_text_area): Avoid looping due to large glyph
Chong Yidong <cyd@stupidchicken.com>
parents: 98508
diff changeset
4130 int start_hpos = i;
b4502c55e86b (update_text_area): Avoid looping due to large glyph
Chong Yidong <cyd@stupidchicken.com>
parents: 98508
diff changeset
4131
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4132 while (i < stop
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4133 && GLYPH_EQUAL_P (desired_glyph, current_glyph))
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4134 {
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4135 x += desired_glyph->pixel_width;
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4136 ++desired_glyph, ++current_glyph, ++i;
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4137 }
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4138
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4139 /* 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
4140 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
4141 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
4142 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
4143 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
4144 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
4145 of the `p'. The rest of the lbearing problem is then
50218
06f75553f0a4 (mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents: 49600
diff changeset
4146 taken care of by draw_glyphs. */
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4147 if (overlapping_glyphs_p
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4148 && i > 0
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4149 && i < current_row->used[TEXT_AREA]
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4150 && (current_row->used[TEXT_AREA]
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4151 != desired_row->used[TEXT_AREA]))
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4152 {
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4153 int left, right;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4154
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4155 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
4156 &left, &right);
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4157 while (left > 0 && i > 0)
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4158 {
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4159 --i, --desired_glyph, --current_glyph;
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4160 x -= desired_glyph->pixel_width;
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4161 left -= desired_glyph->pixel_width;
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4162 }
98589
b4502c55e86b (update_text_area): Avoid looping due to large glyph
Chong Yidong <cyd@stupidchicken.com>
parents: 98508
diff changeset
4163
b4502c55e86b (update_text_area): Avoid looping due to large glyph
Chong Yidong <cyd@stupidchicken.com>
parents: 98508
diff changeset
4164 /* Abort the skipping algorithm if we end up before
b4502c55e86b (update_text_area): Avoid looping due to large glyph
Chong Yidong <cyd@stupidchicken.com>
parents: 98508
diff changeset
4165 our starting point, to avoid looping (bug#1070).
b4502c55e86b (update_text_area): Avoid looping due to large glyph
Chong Yidong <cyd@stupidchicken.com>
parents: 98508
diff changeset
4166 This can happen when the lbearing is larger than
b4502c55e86b (update_text_area): Avoid looping due to large glyph
Chong Yidong <cyd@stupidchicken.com>
parents: 98508
diff changeset
4167 the pixel width. */
b4502c55e86b (update_text_area): Avoid looping due to large glyph
Chong Yidong <cyd@stupidchicken.com>
parents: 98508
diff changeset
4168 abort_skipping = (i < start_hpos);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4169 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4170 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4171
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4172 /* Try to avoid writing the entire rest of the desired row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4173 by looking for a resync point. This mainly prevents
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4174 mode line flickering in the case the mode line is in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4175 fixed-pitch font, which it usually will be. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4176 if (i < desired_row->used[TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4177 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4178 int start_x = x, start_hpos = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4179 struct glyph *start = desired_glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4180 int current_x = x;
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4181 int skip_first_p = !can_skip_p;
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4182
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4183 /* Find the next glyph that's equal again. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4184 while (i < stop
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4185 && (skip_first_p
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4186 || !GLYPH_EQUAL_P (desired_glyph, current_glyph))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4187 && x == current_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4188 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4189 x += desired_glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4190 current_x += current_glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4191 ++desired_glyph, ++current_glyph, ++i;
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4192 skip_first_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4193 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4194
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4195 if (i == start_hpos || x != current_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4196 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4197 i = start_hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4198 x = start_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4199 desired_glyph = start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4200 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4201 }
33596
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4202
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4203 rif->cursor_to (vpos, start_hpos, desired_row->y, start_x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4204 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
4205 changed_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4206 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4207 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4208
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4209 /* Write the rest. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4210 if (i < desired_row->used[TEXT_AREA])
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 rif->cursor_to (vpos, i, desired_row->y, x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4213 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
4214 changed_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4215 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4216
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4217 /* Maybe clear to end of line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4218 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row))
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 /* If new row extends to the end of the text area, nothing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4221 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
4222 above. This is made sure by setting desired_stop_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4223 appropriately above. */
69110
9d86d35acf33 (update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 68651
diff changeset
4224 xassert (i < desired_row->used[TEXT_AREA]
9d86d35acf33 (update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 68651
diff changeset
4225 || ((desired_row->used[TEXT_AREA]
9d86d35acf33 (update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 68651
diff changeset
4226 == current_row->used[TEXT_AREA])
9d86d35acf33 (update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 68651
diff changeset
4227 && MATRIX_ROW_EXTENDS_FACE_P (current_row)));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4228 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4229 else if (MATRIX_ROW_EXTENDS_FACE_P (current_row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4230 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4231 /* If old row extends to the end of the text area, clear. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4232 if (i >= desired_row->used[TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4233 rif->cursor_to (vpos, i, desired_row->y,
53055
4cb0d5b004e9 (update_text_area): Fix redisplay error when hscroll
Kim F. Storm <storm@cua.dk>
parents: 52401
diff changeset
4234 desired_row->pixel_width);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4235 rif->clear_end_of_line (-1);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4236 changed_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4237 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4238 else if (desired_row->pixel_width < current_row->pixel_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4239 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4240 /* Otherwise clear to the end of the old row. Everything
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4241 after that position should be clear already. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4242 int x;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4243
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4244 if (i >= desired_row->used[TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4245 rif->cursor_to (vpos, i, desired_row->y,
53055
4cb0d5b004e9 (update_text_area): Fix redisplay error when hscroll
Kim F. Storm <storm@cua.dk>
parents: 52401
diff changeset
4246 desired_row->pixel_width);
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 /* If cursor is displayed at the end of the line, make sure
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4249 it's cleared. Nowadays we don't have a phys_cursor_glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4250 with which to erase the cursor (because this method
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4251 doesn't work with lbearing/rbearing), so we must do it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4252 this way. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4253 if (vpos == w->phys_cursor.vpos
107991
74557d25410e Implement cursor on the left fringe for R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents: 107737
diff changeset
4254 && (desired_row->reversed_p
74557d25410e Implement cursor on the left fringe for R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents: 107737
diff changeset
4255 ? (w->phys_cursor.hpos < 0)
74557d25410e Implement cursor on the left fringe for R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents: 107737
diff changeset
4256 : (w->phys_cursor.hpos >= desired_row->used[TEXT_AREA])))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4257 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4258 w->phys_cursor_on_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4259 x = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4260 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4261 else
53055
4cb0d5b004e9 (update_text_area): Fix redisplay error when hscroll
Kim F. Storm <storm@cua.dk>
parents: 52401
diff changeset
4262 x = current_row->pixel_width;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4263 rif->clear_end_of_line (x);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4264 changed_p = 1;
25012
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 }
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4267
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4268 return changed_p;
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4271
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4272 /* 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
4273 changed. */
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4274
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4275 static int
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4276 update_window_line (w, vpos, mouse_face_overwritten_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4277 struct window *w;
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4278 int vpos, *mouse_face_overwritten_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4279 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4280 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4281 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos);
82992
5de4189e659d Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents: 82990
diff changeset
4282 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w)));
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4283 int changed_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4284
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4285 /* Set the row being updated. This is important to let xterm.c
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4286 know what line height values are in effect. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4287 updated_row = desired_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4288
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4289 /* A row can be completely invisible in case a desired matrix was
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4290 built with a vscroll and then make_cursor_line_fully_visible shifts
31690
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4291 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
4292 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
4293 if (desired_row->mode_line_p
59b455472b56 (update_window_line): Make sure to always draw
Gerd Moellmann <gerd@gnu.org>
parents: 31690
diff changeset
4294 || desired_row->visible_height > 0)
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4295 {
31690
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4296 xassert (desired_row->enabled_p);
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4297
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4298 /* 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
4299 if (!desired_row->full_width_p
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
4300 && !NILP (w->left_margin_cols))
31690
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4301 {
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4302 changed_p = 1;
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4303 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
4304 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4305
31690
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4306 /* Update the display of the text area. */
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4307 if (update_text_area (w, vpos))
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4308 {
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4309 changed_p = 1;
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4310 if (current_row->mouse_face_p)
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4311 *mouse_face_overwritten_p = 1;
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4312 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4313
31690
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4314 /* 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
4315 if (!desired_row->full_width_p
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
4316 && !NILP (w->right_margin_cols))
31690
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4317 {
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4318 changed_p = 1;
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4319 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
4320 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4321
31690
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4322 /* Draw truncation marks etc. */
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4323 if (!current_row->enabled_p
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4324 || desired_row->y != current_row->y
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4325 || desired_row->visible_height != current_row->visible_height
53605
7dfd96e25ec6 (row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents: 53514
diff changeset
4326 || desired_row->cursor_in_fringe_p != current_row->cursor_in_fringe_p
61633
a76a30ee7c89 (row_equal_p, update_window_line, scrolling_window):
Kim F. Storm <storm@cua.dk>
parents: 61416
diff changeset
4327 || desired_row->overlay_arrow_bitmap != current_row->overlay_arrow_bitmap
53605
7dfd96e25ec6 (row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents: 53514
diff changeset
4328 || current_row->redraw_fringe_bitmaps_p
31690
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4329 || desired_row->mode_line_p != current_row->mode_line_p
53605
7dfd96e25ec6 (row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents: 53514
diff changeset
4330 || desired_row->exact_window_width_line_p != current_row->exact_window_width_line_p
31690
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4331 || (MATRIX_ROW_CONTINUATION_LINE_P (desired_row)
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4332 != MATRIX_ROW_CONTINUATION_LINE_P (current_row)))
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4333 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
4334 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4335
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4336 /* Update current_row from desired_row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4337 make_current (w->desired_matrix, w->current_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4338 updated_row = NULL;
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4339 return changed_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4340 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4341
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4342
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4343 /* 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
4344 be called from update_window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4345
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4346 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4347 set_window_cursor_after_update (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4348 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4349 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4350 struct frame *f = XFRAME (w->frame);
82992
5de4189e659d Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents: 82990
diff changeset
4351 struct redisplay_interface *rif = FRAME_RIF (f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4352 int cx, cy, vpos, hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4353
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4354 /* Not intended for frame matrix updates. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4355 xassert (FRAME_WINDOW_P (f));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4356
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4357 if (cursor_in_echo_area
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4358 && !NILP (echo_area_buffer[0])
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4359 /* 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
4360 show the cursor for the message instead. */
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4361 && XWINDOW (minibuf_window) == w
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4362 && EQ (minibuf_window, echo_area_window)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4363 /* These cases apply only to the frame that contains
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4364 the active mini-buffer window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4365 && FRAME_HAS_MINIBUF_P (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4366 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window))
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 cx = cy = vpos = hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4369
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4370 if (cursor_in_echo_area >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4371 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4372 /* If the mini-buffer is several lines high, find the last
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4373 line that has any text on it. Note: either all lines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4374 are enabled or none. Otherwise we wouldn't be able to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4375 determine Y. */
25190
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4376 struct glyph_row *row, *last_row;
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4377 struct glyph *glyph;
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4378 int yb = window_text_bottom_y (w);
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4379
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4380 last_row = NULL;
39254
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4381 row = w->current_matrix->rows;
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4382 while (row->enabled_p
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4383 && (last_row == NULL
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4384 || MATRIX_ROW_BOTTOM_Y (row) <= yb))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4385 {
25190
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4386 if (row->used[TEXT_AREA]
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4387 && row->glyphs[TEXT_AREA][0].charpos >= 0)
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4388 last_row = row;
39254
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4389 ++row;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4390 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4391
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4392 if (last_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4393 {
39254
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4394 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
4395 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
4396
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4397 while (last > start && last->charpos < 0)
25190
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4398 --last;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4399
25190
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4400 for (glyph = start; glyph < last; ++glyph)
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4401 {
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4402 cx += glyph->pixel_width;
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4403 ++hpos;
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4404 }
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4405
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4406 cy = last_row->y;
25190
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4407 vpos = MATRIX_ROW_VPOS (last_row, w->current_matrix);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4408 }
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 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4411 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4412 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4413 cx = w->cursor.x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4414 cy = w->cursor.y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4415 hpos = w->cursor.hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4416 vpos = w->cursor.vpos;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4419 /* Window cursor can be out of sync for horizontally split windows. */
107991
74557d25410e Implement cursor on the left fringe for R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents: 107737
diff changeset
4420 hpos = max (-1, hpos); /* -1 is for when cursor is on the left fringe */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4421 hpos = min (w->current_matrix->matrix_w - 1, hpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4422 vpos = max (0, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4423 vpos = min (w->current_matrix->nrows - 1, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4424 rif->cursor_to (vpos, hpos, cy, cx);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4425 }
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
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4428 /* 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
4429 tree rooted at W. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4430
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4431 void
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4432 set_window_update_flags (w, on_p)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4433 struct window *w;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4434 int on_p;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4435 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4436 while (w)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4437 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4438 if (!NILP (w->hchild))
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4439 set_window_update_flags (XWINDOW (w->hchild), on_p);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4440 else if (!NILP (w->vchild))
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4441 set_window_update_flags (XWINDOW (w->vchild), on_p);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4442 else
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4443 w->must_be_updated_p = on_p;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4444
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4445 w = NILP (w->next) ? 0 : XWINDOW (w->next);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4446 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4447 }
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4448
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4449
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4450
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4451 /***********************************************************************
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4452 Window-Based Scrolling
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4453 ***********************************************************************/
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4454
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4455 /* Structure describing rows in scrolling_window. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4456
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4457 struct row_entry
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4458 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4459 /* 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
4460 int old_uses, new_uses;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4461
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4462 /* Vpos of row in new matrix. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4463 int new_line_number;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4464
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4465 /* 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
4466 int bucket;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4467
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4468 /* The row described by this entry. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4469 struct glyph_row *row;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4470
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4471 /* Hash collision chain. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4472 struct row_entry *next;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4473 };
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4474
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4475 /* 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
4476 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
4477 that we need a larger one. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4478
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4479 static struct row_entry *row_entry_pool;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4480 static int row_entry_pool_size;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4481
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4482 /* Index of next free entry in row_entry_pool. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4483
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4484 static int row_entry_idx;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4485
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4486 /* 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
4487 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
4488 current matrix. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4489
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4490 static struct row_entry **row_table;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4491 static int row_table_size;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4492
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4493 /* 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
4494 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
4495
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4496 static struct row_entry **old_lines, **new_lines;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4497 static int old_lines_size, new_lines_size;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4498
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4499 /* 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
4500
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4501 static struct run *run_pool;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4502 static int runs_size;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4503
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4504 /* A vector of runs of lines found during scrolling. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4505
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4506 static struct run **runs;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4507
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4508 /* 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
4509 of window W. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4510
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4511 static INLINE struct row_entry *
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4512 add_row_entry (w, row)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4513 struct window *w;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4514 struct glyph_row *row;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4515 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4516 struct row_entry *entry;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4517 int i = row->hash % row_table_size;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4518
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4519 entry = row_table[i];
30152
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
4520 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
4521 entry = entry->next;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4522
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4523 if (entry == NULL)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4524 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4525 entry = row_entry_pool + row_entry_idx++;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4526 entry->row = row;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4527 entry->old_uses = entry->new_uses = 0;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4528 entry->new_line_number = 0;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4529 entry->bucket = i;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4530 entry->next = row_table[i];
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4531 row_table[i] = entry;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4532 }
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4533
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4534 return entry;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4535 }
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4536
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4537
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4538 /* 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
4539 HEADER_LINE_P non-zero means W has a header line.
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4540
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4541 The algorithm is taken from Communications of the ACM, Apr78 "A
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4542 Technique for Isolating Differences Between Files." It should take
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4543 O(N) time.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4544
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4545 A short outline of the steps of the algorithm
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4546
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4547 1. Skip lines equal at the start and end of both matrices.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4548
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4549 2. Enter rows in the current and desired matrix into a symbol
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4550 table, counting how often they appear in both matrices.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4551
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4552 3. Rows that appear exactly once in both matrices serve as anchors,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4553 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
4554
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4555 4. Starting from anchor lines, extend regions to be scrolled both
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4556 forward and backward.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4557
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4558 Value is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4559
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4560 -1 if all rows were found to be equal.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4561 0 to indicate that we did not scroll the display, or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4562 1 if we did scroll. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4563
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4564 static int
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
4565 scrolling_window (w, header_line_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4566 struct window *w;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
4567 int header_line_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4568 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4569 struct glyph_matrix *desired_matrix = w->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4570 struct glyph_matrix *current_matrix = w->current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4571 int yb = window_text_bottom_y (w);
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4572 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
4573 int nruns, nbytes, n, run_idx;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4574 struct row_entry *entry;
82992
5de4189e659d Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents: 82990
diff changeset
4575 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w)));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4576
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4577 /* 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
4578 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
4579 {
31825
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4580 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
4581 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
4582
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4583 if (c->enabled_p
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4584 && d->enabled_p
53605
7dfd96e25ec6 (row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents: 53514
diff changeset
4585 && !d->redraw_fringe_bitmaps_p
31825
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4586 && c->y == d->y
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4587 && MATRIX_ROW_BOTTOM_Y (c) <= yb
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4588 && MATRIX_ROW_BOTTOM_Y (d) <= yb
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4589 && row_equal_p (w, c, d, 1))
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4590 {
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4591 assign_row (c, d);
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4592 d->enabled_p = 0;
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4593 }
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4594 else
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4595 break;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4596 }
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 /* Give up if some rows in the desired matrix are not enabled. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4599 if (!MATRIX_ROW (desired_matrix, i)->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4600 return -1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4601
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4602 first_old = first_new = i;
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 /* 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
4605 desired matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4606 i = first_new + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4607 while (i < desired_matrix->nrows - 1
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4608 && MATRIX_ROW (desired_matrix, i)->enabled_p
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4609 && MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (desired_matrix, i)) <= yb)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4610 ++i;
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 if (!MATRIX_ROW (desired_matrix, i)->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4613 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4614
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4615 last_new = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4616
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4617 /* 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
4618 current matrix. We don't look at the enabled flag here because
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4619 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
4620 disabled. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4621 i = first_old + 1;
34929
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4622 while (i < current_matrix->nrows - 1)
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4623 {
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4624 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
4625 if (bottom <= yb)
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4626 ++i;
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4627 if (bottom >= yb)
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4628 break;
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4629 }
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4630
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4631 last_old = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4632
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4633 /* Skip over rows equal at the bottom. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4634 i = last_new;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4635 j = last_old;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4636 while (i - 1 > first_new
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4637 && j - 1 > first_old
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4638 && MATRIX_ROW (current_matrix, i - 1)->enabled_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4639 && (MATRIX_ROW (current_matrix, i - 1)->y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4640 == MATRIX_ROW (desired_matrix, j - 1)->y)
53605
7dfd96e25ec6 (row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents: 53514
diff changeset
4641 && !MATRIX_ROW (desired_matrix, j - 1)->redraw_fringe_bitmaps_p
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4642 && row_equal_p (w,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4643 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
4644 MATRIX_ROW (current_matrix, j - 1), 1))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4645 --i, --j;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4646 last_new = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4647 last_old = j;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4648
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4649 /* Nothing to do if all rows are equal. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4650 if (last_new == first_new)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4651 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4652
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4653 /* Reallocate vectors, tables etc. if necessary. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4654
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4655 if (current_matrix->nrows > old_lines_size)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4656 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4657 old_lines_size = current_matrix->nrows;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4658 nbytes = old_lines_size * sizeof *old_lines;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4659 old_lines = (struct row_entry **) xrealloc (old_lines, nbytes);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4660 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4661
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4662 if (desired_matrix->nrows > new_lines_size)
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 new_lines_size = desired_matrix->nrows;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4665 nbytes = new_lines_size * sizeof *new_lines;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4666 new_lines = (struct row_entry **) xrealloc (new_lines, nbytes);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4667 }
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 n = desired_matrix->nrows + current_matrix->nrows;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4670 if (3 * n > row_table_size)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4671 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4672 row_table_size = next_almost_prime (3 * n);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4673 nbytes = row_table_size * sizeof *row_table;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4674 row_table = (struct row_entry **) xrealloc (row_table, nbytes);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4675 bzero (row_table, nbytes);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4676 }
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 if (n > row_entry_pool_size)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4679 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4680 row_entry_pool_size = n;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4681 nbytes = row_entry_pool_size * sizeof *row_entry_pool;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4682 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
4683 }
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4684
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4685 if (desired_matrix->nrows > runs_size)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4686 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4687 runs_size = desired_matrix->nrows;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4688 nbytes = runs_size * sizeof *runs;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4689 runs = (struct run **) xrealloc (runs, nbytes);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4690 nbytes = runs_size * sizeof *run_pool;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4691 run_pool = (struct run *) xrealloc (run_pool, nbytes);
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
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4694 nruns = run_idx = 0;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4695 row_entry_idx = 0;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4696
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4697 /* 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
4698 row_hash_table to be able to find equal ones quickly. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4699
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4700 for (i = first_old; i < last_old; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4701 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4702 if (MATRIX_ROW (current_matrix, i)->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4703 {
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4704 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
4705 old_lines[i] = entry;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4706 ++entry->old_uses;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4707 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4708 else
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4709 old_lines[i] = NULL;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4710 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4711
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4712 for (i = first_new; i < last_new; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4713 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4714 xassert (MATRIX_ROW_ENABLED_P (desired_matrix, i));
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4715 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
4716 ++entry->new_uses;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4717 entry->new_line_number = i;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4718 new_lines[i] = entry;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4719 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4720
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4721 /* Identify moves based on lines that are unique and equal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4722 in both matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4723 for (i = first_old; i < last_old;)
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4724 if (old_lines[i]
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4725 && old_lines[i]->old_uses == 1
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4726 && old_lines[i]->new_uses == 1)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4727 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4728 int j, k;
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4729 int new_line = old_lines[i]->new_line_number;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4730 struct run *run = run_pool + run_idx++;
25012
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 /* Record move. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4733 run->current_vpos = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4734 run->current_y = MATRIX_ROW (current_matrix, i)->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4735 run->desired_vpos = new_line;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4736 run->desired_y = MATRIX_ROW (desired_matrix, new_line)->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4737 run->nrows = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4738 run->height = MATRIX_ROW (current_matrix, i)->height;
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 /* Extend backward. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4741 j = i - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4742 k = new_line - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4743 while (j > first_old
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4744 && k > first_new
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4745 && old_lines[j] == new_lines[k])
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4746 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4747 int h = MATRIX_ROW (current_matrix, j)->height;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4748 --run->current_vpos;
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4749 --run->desired_vpos;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4750 ++run->nrows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4751 run->height += h;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4752 run->desired_y -= h;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4753 run->current_y -= h;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4754 --j, --k;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4755 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4756
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4757 /* Extend forward. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4758 j = i + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4759 k = new_line + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4760 while (j < last_old
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4761 && k < last_new
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4762 && old_lines[j] == new_lines[k])
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4763 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4764 int h = MATRIX_ROW (current_matrix, j)->height;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4765 ++run->nrows;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4766 run->height += h;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4767 ++j, ++k;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4768 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4769
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4770 /* Insert run into list of all runs. Order runs by copied
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4771 pixel lines. Note that we record runs that don't have to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4772 be copied because they are already in place. This is done
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4773 because we can avoid calling update_window_line in this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4774 case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4775 for (j = 0; j < nruns && runs[j]->height > run->height; ++j)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4776 ;
34203
e55480843a8e (scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents: 33763
diff changeset
4777 for (k = nruns; k > j; --k)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4778 runs[k] = runs[k - 1];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4779 runs[j] = run;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4780 ++nruns;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4781
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4782 i += run->nrows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4783 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4784 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4785 ++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 /* 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
4788 we want to copy later on. This is not solvable in general
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4789 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
4790 exchange areas on this display. Example:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4791
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4792 +-----------+ +-----------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4793 | A | | B |
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 | B | | A |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4796 +-----------+ +-----------+
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 Instead, prefer bigger moves, and invalidate moves that would
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4799 copy from where we copied to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4800
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4801 for (i = 0; i < nruns; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4802 if (runs[i]->nrows > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4803 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4804 struct run *r = runs[i];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4805
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4806 /* Copy on the display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4807 if (r->current_y != r->desired_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4808 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4809 rif->scroll_run_hook (w, r);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4810
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4811 /* Invalidate runs that copy from where we copied to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4812 for (j = i + 1; j < nruns; ++j)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4813 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4814 struct run *p = runs[j];
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4815
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4816 if ((p->current_y >= r->desired_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4817 && p->current_y < r->desired_y + r->height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4818 || (p->current_y + p->height >= r->desired_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4819 && (p->current_y + p->height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4820 < r->desired_y + r->height)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4821 p->nrows = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4822 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4823 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4824
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4825 /* Assign matrix rows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4826 for (j = 0; j < r->nrows; ++j)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4827 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4828 struct glyph_row *from, *to;
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4829 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
4830
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4831 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
4832 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
4833 to_overlapped_p = to->overlapped_p;
53605
7dfd96e25ec6 (row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents: 53514
diff changeset
4834 if (!from->mode_line_p && !w->pseudo_window_p
7dfd96e25ec6 (row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents: 53514
diff changeset
4835 && (to->left_fringe_bitmap != from->left_fringe_bitmap
53881
ccacbf7f76b2 (row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents: 53612
diff changeset
4836 || to->right_fringe_bitmap != from->right_fringe_bitmap
ccacbf7f76b2 (row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents: 53612
diff changeset
4837 || to->left_fringe_face_id != from->left_fringe_face_id
ccacbf7f76b2 (row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents: 53612
diff changeset
4838 || to->right_fringe_face_id != from->right_fringe_face_id
61633
a76a30ee7c89 (row_equal_p, update_window_line, scrolling_window):
Kim F. Storm <storm@cua.dk>
parents: 61416
diff changeset
4839 || to->overlay_arrow_bitmap != from->overlay_arrow_bitmap))
53605
7dfd96e25ec6 (row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents: 53514
diff changeset
4840 from->redraw_fringe_bitmaps_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4841 assign_row (to, from);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4842 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
4843 to->overlapped_p = to_overlapped_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4844 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4845 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4846
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4847 /* Clear the hash table, for the next time. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4848 for (i = 0; i < row_entry_idx; ++i)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4849 row_table[row_entry_pool[i].bucket] = NULL;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4850
54847
5acc1d864551 (update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents: 54176
diff changeset
4851 /* Value is > 0 to indicate that we scrolled the display. */
5acc1d864551 (update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents: 54176
diff changeset
4852 return nruns;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4853 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4854
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4855
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4856
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4857 /************************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4858 Frame-Based Updates
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4859 ************************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4860
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4861 /* Update the desired frame matrix of frame F.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4862
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4863 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
4864 pending input. INHIBIT_HAIRY_ID_P non-zero means that scrolling
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4865 should not be tried.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4866
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4867 Value is non-zero if update was stopped due to pending input. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4868
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4869 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4870 update_frame_1 (f, force_p, inhibit_id_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4871 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4872 int force_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4873 int inhibit_id_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4874 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4875 /* Frame matrices to work on. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4876 struct glyph_matrix *current_matrix = f->current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4877 struct glyph_matrix *desired_matrix = f->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4878 int i;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4879 int pause;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4880 int preempt_count = baud_rate / 2400 + 1;
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
4881 extern int input_pending;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4882
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4883 xassert (current_matrix && desired_matrix);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4884
10122
3de6776ae141 (update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents: 9963
diff changeset
4885 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
4886 calculate_costs (f);
3de6776ae141 (update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents: 9963
diff changeset
4887
3357
d9523a958b3c (update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents: 3317
diff changeset
4888 if (preempt_count <= 0)
d9523a958b3c (update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents: 3317
diff changeset
4889 preempt_count = 1;
d9523a958b3c (update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents: 3317
diff changeset
4890
76065
2001cae9df4e (update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents: 75371
diff changeset
4891 #if !PERIODIC_PREEMPTION_CHECKING
2001cae9df4e (update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents: 75371
diff changeset
4892 if (!force_p && detect_input_pending_ignore_squeezables ())
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4893 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4894 pause = 1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4895 goto do_pause;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4896 }
71323
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
4897 #endif
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4898
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4899 /* If we cannot insert/delete lines, it's no use trying it. */
82990
2ecd1f669db9 Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents: 82989
diff changeset
4900 if (!FRAME_LINE_INS_DEL_OK (f))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4901 inhibit_id_p = 1;
7188
7da4ad9a2a8f (update_frame): Move those assignments even farther down.
Richard M. Stallman <rms@gnu.org>
parents: 7179
diff changeset
4902
493
8b101799ff37 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 451
diff changeset
4903 /* 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
4904 i/d line if just want cursor motion. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4905 for (i = 0; i < desired_matrix->nrows; i++)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4906 if (MATRIX_ROW_ENABLED_P (desired_matrix, i))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4907 break;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4908
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4909 /* Try doing i/d line, if not yet inhibited. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4910 if (!inhibit_id_p && i < desired_matrix->nrows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4911 force_p |= scrolling (f);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4912
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4913 /* Update the individual lines as needed. Do bottom line first. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4914 if (MATRIX_ROW_ENABLED_P (desired_matrix, desired_matrix->nrows - 1))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4915 update_frame_line (f, desired_matrix->nrows - 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4916
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4917 /* Now update the rest of the lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4918 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
4919 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4920 if (MATRIX_ROW_ENABLED_P (desired_matrix, i))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4921 {
960
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
4922 if (FRAME_TERMCAP_P (f))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4923 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4924 /* Flush out every so many lines.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4925 Also flush out if likely to have more than 1k buffered
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4926 otherwise. I'm told that some telnet connections get
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4927 really screwed by more than 1k output at once. */
94909
11f28d8c2c22 (update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents: 94513
diff changeset
4928 FILE *display_output = FRAME_TTY (f)->output;
11f28d8c2c22 (update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents: 94513
diff changeset
4929 if (display_output)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4930 {
94909
11f28d8c2c22 (update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents: 94513
diff changeset
4931 int outq = PENDING_OUTPUT_COUNT (display_output);
11f28d8c2c22 (update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents: 94513
diff changeset
4932 if (outq > 900
11f28d8c2c22 (update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents: 94513
diff changeset
4933 || (outq > 20 && ((i - 1) % preempt_count == 0)))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4934 {
94909
11f28d8c2c22 (update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents: 94513
diff changeset
4935 fflush (display_output);
11f28d8c2c22 (update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents: 94513
diff changeset
4936 if (preempt_count == 1)
11f28d8c2c22 (update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents: 94513
diff changeset
4937 {
554
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
4938 #ifdef EMACS_OUTQSIZE
94909
11f28d8c2c22 (update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents: 94513
diff changeset
4939 if (EMACS_OUTQSIZE (0, &outq) < 0)
11f28d8c2c22 (update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents: 94513
diff changeset
4940 /* Probably not a tty. Ignore the error and reset
11f28d8c2c22 (update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents: 94513
diff changeset
4941 the outq count. */
11f28d8c2c22 (update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents: 94513
diff changeset
4942 outq = PENDING_OUTPUT_COUNT (FRAME_TTY (f->output));
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4943 #endif
94909
11f28d8c2c22 (update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents: 94513
diff changeset
4944 outq *= 10;
11f28d8c2c22 (update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents: 94513
diff changeset
4945 if (baud_rate <= outq && baud_rate > 0)
11f28d8c2c22 (update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents: 94513
diff changeset
4946 sleep (outq / baud_rate);
11f28d8c2c22 (update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents: 94513
diff changeset
4947 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4948 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4949 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4950 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4951
71323
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
4952 #if PERIODIC_PREEMPTION_CHECKING
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
4953 if (!force_p)
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
4954 {
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
4955 EMACS_TIME tm, dif;
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
4956 EMACS_GET_TIME (tm);
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
4957 EMACS_SUB_TIME (dif, preemption_next_check, tm);
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
4958 if (EMACS_TIME_NEG_P (dif))
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
4959 {
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
4960 EMACS_ADD_TIME (preemption_next_check, tm, preemption_period);
71378
1b442e9d8373 (update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents: 71333
diff changeset
4961 if (detect_input_pending_ignore_squeezables ())
1b442e9d8373 (update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents: 71333
diff changeset
4962 break;
71323
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
4963 }
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
4964 }
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
4965 #else
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
4966 if (!force_p && (i - 1) % preempt_count == 0)
59580
f43d0816e9c3 * keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
Jan Djärv <jan.h.d@swipnet.se>
parents: 58986
diff changeset
4967 detect_input_pending_ignore_squeezables ();
71323
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
4968 #endif
16822
483e137d5384 (update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents: 16589
diff changeset
4969
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4970 update_frame_line (f, i);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4971 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4972 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4973
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
4974 pause = (i < FRAME_LINES (f) - 1) ? i : 0;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4975
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4976 /* Now just clean up termcap drivers and set cursor, etc. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4977 if (!pause)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4978 {
12409
6e374b28ecc3 (update_frame): Pretend cursor is in echo area
Richard M. Stallman <rms@gnu.org>
parents: 12193
diff changeset
4979 if ((cursor_in_echo_area
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4980 /* 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
4981 show the cursor for the message instead of for the
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4982 (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
4983 || (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
4984 && EQ (minibuf_window, echo_area_window)
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4985 && !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
4986 /* These cases apply only to the frame that contains
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4987 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
4988 && FRAME_HAS_MINIBUF_P (f)
14459
c1d25453a95f (update_frame): Compare FRAME_MINIBUF_WINDOW(f)
Richard M. Stallman <rms@gnu.org>
parents: 14286
diff changeset
4989 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window))
708
030fb4635335 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 687
diff changeset
4990 {
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
4991 int top = WINDOW_TOP_EDGE_LINE (XWINDOW (FRAME_MINIBUF_WINDOW (f)));
1042
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
4992 int row, col;
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
4993
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
4994 if (cursor_in_echo_area < 0)
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
4995 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4996 /* Negative value of cursor_in_echo_area means put
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4997 cursor at beginning of line. */
1042
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
4998 row = top;
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
4999 col = 0;
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5000 }
708
030fb4635335 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 687
diff changeset
5001 else
1042
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5002 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5003 /* Positive value of cursor_in_echo_area means put
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5004 cursor at the end of the prompt. If the mini-buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5005 is several lines high, find the last line that has
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5006 any text on it. */
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5007 row = FRAME_LINES (f);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5008 do
1042
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5009 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5010 --row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5011 col = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5012
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5013 if (MATRIX_ROW_ENABLED_P (current_matrix, row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5014 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5015 /* Frame rows are filled up with spaces that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5016 must be ignored here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5017 struct glyph_row *r = MATRIX_ROW (current_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5018 row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5019 struct glyph *start = r->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5020 struct glyph *last = start + r->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5021
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5022 while (last > start
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5023 && (last - 1)->charpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5024 --last;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5025
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5026 col = last - start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5027 }
1042
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5028 }
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5029 while (row > top && col == 0);
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5030
21757
629f6df4a329 (update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
5031 /* 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
5032 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
5033 {
21757
629f6df4a329 (update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
5034 /* If we have another row, advance cursor into it. */
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5035 if (row < FRAME_LINES (f) - 1)
21757
629f6df4a329 (update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
5036 {
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5037 col = FRAME_LEFT_SCROLL_BAR_COLS (f);
21757
629f6df4a329 (update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
5038 row++;
629f6df4a329 (update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
5039 }
629f6df4a329 (update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
5040 /* 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
5041 else
21763
b685f9451792 (change_frame_size_1): Use FRAME_CURSOR_X_LIMIT.
Richard M. Stallman <rms@gnu.org>
parents: 21757
diff changeset
5042 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
5043 }
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5044 }
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5045
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5046 cursor_to (f, row, col);
708
030fb4635335 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 687
diff changeset
5047 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5048 else
25012
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 /* We have only one cursor on terminal frames. Use it to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5051 display the cursor of the selected window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5052 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
5053 if (w->cursor.vpos >= 0
5d67ef29764b (update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents: 29437
diff changeset
5054 /* 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
5055 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
5056 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
5057 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
5058 a new cursor position has been computed. */
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5059 && w->cursor.vpos < WINDOW_TOTAL_LINES (w))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5060 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5061 int x = WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5062 int y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5063
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5064 if (INTEGERP (w->left_margin_cols))
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5065 x += XFASTINT (w->left_margin_cols);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5066
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5067 /* x = max (min (x, FRAME_TOTAL_COLS (f) - 1), 0); */
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5068 cursor_to (f, y, x);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5069 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5070 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5071 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5072
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5073 do_pause:
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5074
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5075 clear_desired_matrices (f);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5076 return pause;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5077 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5078
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5079
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5080 /* Do line insertions/deletions on frame F for frame-based redisplay. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5081
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
5082 int
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5083 scrolling (frame)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5084 struct frame *frame;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5085 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5086 int unchanged_at_top, unchanged_at_bottom;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5087 int window_size;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5088 int changed_lines;
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5089 int *old_hash = (int *) alloca (FRAME_LINES (frame) * sizeof (int));
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5090 int *new_hash = (int *) alloca (FRAME_LINES (frame) * sizeof (int));
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5091 int *draw_cost = (int *) alloca (FRAME_LINES (frame) * sizeof (int));
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5092 int *old_draw_cost = (int *) alloca (FRAME_LINES (frame) * sizeof (int));
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5093 register int i;
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5094 int free_at_end_vpos = FRAME_LINES (frame);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5095 struct glyph_matrix *current_matrix = frame->current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5096 struct glyph_matrix *desired_matrix = frame->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5097
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5098 if (!current_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5099 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5100
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5101 /* Compute hash codes of all the lines. Also calculate number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5102 changed lines, number of unchanged lines at the beginning, and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5103 number of unchanged lines at the end. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5104 changed_lines = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5105 unchanged_at_top = 0;
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5106 unchanged_at_bottom = FRAME_LINES (frame);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5107 for (i = 0; i < FRAME_LINES (frame); i++)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5108 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5109 /* 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
5110 if (!MATRIX_ROW_ENABLED_P (current_matrix, i))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5111 return 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5112 old_hash[i] = line_hash_code (MATRIX_ROW (current_matrix, i));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5113 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
5114 {
934a44a3b34f (scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents: 17961
diff changeset
5115 /* 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
5116 new_hash[i] = old_hash[i];
934a44a3b34f (scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents: 17961
diff changeset
5117 #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
5118 draw_cost[i] = INFINITY;
934a44a3b34f (scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents: 17961
diff changeset
5119 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5120 else
18015
934a44a3b34f (scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents: 17961
diff changeset
5121 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5122 new_hash[i] = line_hash_code (MATRIX_ROW (desired_matrix, i));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5123 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
5124 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5125
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5126 if (old_hash[i] != new_hash[i])
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5127 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5128 changed_lines++;
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5129 unchanged_at_bottom = FRAME_LINES (frame) - i - 1;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5130 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5131 else if (i == unchanged_at_top)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5132 unchanged_at_top++;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5133 old_draw_cost[i] = line_draw_cost (current_matrix, i);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5134 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5135
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5136 /* If changed lines are few, don't allow preemption, don't scroll. */
82990
2ecd1f669db9 Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents: 82989
diff changeset
5137 if ((!FRAME_SCROLL_REGION_OK (frame)
53225
4250e7e26247 Add a level of indirection to terminal characteristics.
Karoly Lorentey <lorentey@elte.hu>
parents: 53190
diff changeset
5138 && changed_lines < baud_rate / 2400)
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5139 || unchanged_at_bottom == FRAME_LINES (frame))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5140 return 1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5141
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5142 window_size = (FRAME_LINES (frame) - unchanged_at_top
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5143 - unchanged_at_bottom);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5144
82990
2ecd1f669db9 Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents: 82989
diff changeset
5145 if (FRAME_SCROLL_REGION_OK (frame))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5146 free_at_end_vpos -= unchanged_at_bottom;
82990
2ecd1f669db9 Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents: 82989
diff changeset
5147 else if (FRAME_MEMORY_BELOW_FRAME (frame))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5148 free_at_end_vpos = -1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5149
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5150 /* If large window, fast terminal and few lines in common between
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5151 current frame and desired frame, don't bother with i/d calc. */
82990
2ecd1f669db9 Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents: 82989
diff changeset
5152 if (!FRAME_SCROLL_REGION_OK (frame)
53225
4250e7e26247 Add a level of indirection to terminal characteristics.
Karoly Lorentey <lorentey@elte.hu>
parents: 53190
diff changeset
5153 && window_size >= 18 && baud_rate > 2400
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5154 && (window_size >=
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5155 10 * scrolling_max_lines_saved (unchanged_at_top,
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5156 FRAME_LINES (frame) - unchanged_at_bottom,
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5157 old_hash, new_hash, draw_cost)))
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5158 return 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5159
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5160 if (window_size < 2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5161 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5162
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5163 scrolling_1 (frame, window_size, unchanged_at_top, unchanged_at_bottom,
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5164 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
5165 old_draw_cost + unchanged_at_top - 1,
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5166 old_hash + unchanged_at_top - 1,
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5167 new_hash + unchanged_at_top - 1,
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5168 free_at_end_vpos - unchanged_at_top);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5169
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5170 return 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5171 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5172
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5173
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5174 /* 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
5175 which is LEN glyphs long. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5176
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5177 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5178 count_blanks (r, len)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5179 struct glyph *r;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5180 int len;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5181 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5182 int i;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5183
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5184 for (i = 0; i < len; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5185 if (!CHAR_GLYPH_SPACE_P (r[i]))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5186 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5187
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5188 return i;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5189 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5190
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5191
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5192 /* 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
5193 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
5194 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
5195
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5196 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5197 count_match (str1, end1, str2, end2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5198 struct glyph *str1, *end1, *str2, *end2;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5199 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5200 struct glyph *p1 = str1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5201 struct glyph *p2 = str2;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5202
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5203 while (p1 < end1
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5204 && p2 < end2
26998
02e902f732d1 (line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents: 26902
diff changeset
5205 && GLYPH_CHAR_AND_FACE_EQUAL_P (p1, p2))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5206 ++p1, ++p2;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5207
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5208 return p1 - str1;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5209 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5210
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5211
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5212 /* Char insertion/deletion cost vector, from term.c */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5213
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5214 extern int *char_ins_del_vector;
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5215 #define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_TOTAL_COLS((f))])
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5216
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5217
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5218 /* Perform a frame-based update on line VPOS in frame FRAME. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5219
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5220 static void
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5221 update_frame_line (f, vpos)
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5222 struct frame *f;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5223 int vpos;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5224 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5225 struct glyph *obody, *nbody, *op1, *op2, *np1, *nend;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5226 int tem;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5227 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
5228 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
5229 struct glyph_matrix *desired_matrix = f->desired_matrix;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5230 struct glyph_row *current_row = MATRIX_ROW (current_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5231 struct glyph_row *desired_row = MATRIX_ROW (desired_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5232 int must_write_whole_line_p;
82990
2ecd1f669db9 Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents: 82989
diff changeset
5233 int write_spaces_p = FRAME_MUST_WRITE_SPACES (f);
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5234 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
5235 != FACE_TTY_DEFAULT_BG_COLOR);
39cd5f99c67d (update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
5236
39cd5f99c67d (update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
5237 if (colored_spaces_p)
39cd5f99c67d (update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
5238 write_spaces_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5239
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5240 /* 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
5241 write the whole desired line in that case. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5242 must_write_whole_line_p = !current_row->enabled_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5243 if (must_write_whole_line_p)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5244 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5245 obody = 0;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5246 olen = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5247 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5248 else
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5249 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5250 obody = MATRIX_ROW_GLYPH_START (current_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5251 olen = current_row->used[TEXT_AREA];
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5252
40075
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
5253 /* 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
5254 if (!write_spaces_p)
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
5255 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
5256 olen--;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5257 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5258
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5259 current_row->enabled_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5260 current_row->used[TEXT_AREA] = desired_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5261
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5262 /* If desired line is empty, just clear the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5263 if (!desired_row->enabled_p)
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 nlen = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5266 goto just_erase;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5267 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5268
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5269 nbody = desired_row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5270 nlen = desired_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5271 nend = nbody + nlen;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5272
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5273 /* If display line has unknown contents, write the whole line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5274 if (must_write_whole_line_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5275 {
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5276 /* 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
5277 if (!write_spaces_p)
25313
6b4475fbef86 (update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents: 25304
diff changeset
5278 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
5279 --nlen;
6b4475fbef86 (update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents: 25304
diff changeset
5280
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5281 /* 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
5282 if (nlen)
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5283 {
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5284 cursor_to (f, vpos, 0);
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5285 write_glyphs (f, nbody, nlen);
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5286 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5287
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5288 /* 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
5289 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
5290 case but in the line below. */
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5291 if (nlen < FRAME_TOTAL_COLS (f))
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5292 {
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5293 cursor_to (f, vpos, nlen);
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5294 clear_end_of_line (f, FRAME_TOTAL_COLS (f));
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5295 }
28682
f05d48759416 (update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
5296 else
f05d48759416 (update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
5297 /* 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
5298 with cmgoto might use `ch' in the wrong row. */
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5299 cursor_to (f, vpos, 0);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5300
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5301 make_current (desired_matrix, current_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5302 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5303 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5304
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5305 /* Pretend trailing spaces are not there at all,
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5306 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
5307 if (!write_spaces_p)
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
5308 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
5309 nlen--;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5310
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5311 /* If there's no i/d char, quickly do the best we can without it. */
82990
2ecd1f669db9 Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents: 82989
diff changeset
5312 if (!FRAME_CHAR_INS_DEL_OK (f))
314
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 int i, j;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5315
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5316 /* Find the first glyph in desired row that doesn't agree with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5317 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
5318 for (i = 0; i < nlen; i++)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5319 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5320 if (i >= olen || !GLYPH_EQUAL_P (nbody + i, obody + i))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5321 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5322 /* Find the end of the run of different glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5323 j = i + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5324 while (j < nlen
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5325 && (j >= olen
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5326 || !GLYPH_EQUAL_P (nbody + j, obody + j)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5327 || CHAR_GLYPH_PADDING_P (nbody[j])))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5328 ++j;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5329
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5330 /* Output this run of non-matching chars. */
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5331 cursor_to (f, vpos, i);
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5332 write_glyphs (f, nbody + i, j - i);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5333 i = j - 1;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5334
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5335 /* Now find the next non-match. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5336 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5337 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5338
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5339 /* Clear the rest of the line, or the non-clear part of it. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5340 if (olen > nlen)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5341 {
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5342 cursor_to (f, vpos, nlen);
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5343 clear_end_of_line (f, olen);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5344 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5345
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5346 /* Make current row = desired row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5347 make_current (desired_matrix, current_matrix, vpos);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5348 return;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5349 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5350
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5351 /* 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
5352 characters in a row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5353
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5354 if (!olen)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5355 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5356 /* If current line is blank, skip over initial spaces, if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5357 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
5358 if (write_spaces_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5359 nsp = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5360 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5361 nsp = count_blanks (nbody, nlen);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5362
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5363 if (nlen > nsp)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5364 {
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5365 cursor_to (f, vpos, nsp);
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5366 write_glyphs (f, nbody + nsp, nlen - nsp);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5367 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5368
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5369 /* Exchange contents between current_frame and new_frame. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5370 make_current (desired_matrix, current_matrix, vpos);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5371 return;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5372 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5373
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5374 /* Compute number of leading blanks in old and new contents. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5375 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
5376 nsp = (colored_spaces_p ? 0 : count_blanks (nbody, nlen));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5377
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5378 /* Compute number of matching chars starting with first non-blank. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5379 begmatch = count_match (obody + osp, obody + olen,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5380 nbody + nsp, nbody + nlen);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5381
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5382 /* Spaces in new match implicit space past the end of old. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5383 /* 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
5384 if (!write_spaces_p && osp + begmatch == olen)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5385 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5386 np1 = nbody + nsp;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5387 while (np1 + begmatch < nend && CHAR_GLYPH_SPACE_P (np1[begmatch]))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5388 ++begmatch;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5389 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5390
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5391 /* Avoid doing insert/delete char
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5392 just cause number of leading spaces differs
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5393 when the following text does not match. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5394 if (begmatch == 0 && osp != nsp)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5395 osp = nsp = min (osp, nsp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5396
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5397 /* Find matching characters at end of line */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5398 op1 = obody + olen;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5399 np1 = nbody + nlen;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5400 op2 = op1 + begmatch - min (olen - osp, nlen - nsp);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5401 while (op1 > op2
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5402 && GLYPH_EQUAL_P (op1 - 1, np1 - 1))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5403 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5404 op1--;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5405 np1--;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5406 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5407 endmatch = obody + olen - op1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5408
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5409 /* tem gets the distance to insert or delete.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5410 endmatch is how many characters we save by doing so.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5411 Is it worth it? */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5412
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5413 tem = (nlen - nsp) - (olen - osp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5414 if (endmatch && tem
82990
2ecd1f669db9 Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents: 82989
diff changeset
5415 && (!FRAME_CHAR_INS_DEL_OK (f)
53225
4250e7e26247 Add a level of indirection to terminal characteristics.
Karoly Lorentey <lorentey@elte.hu>
parents: 53190
diff changeset
5416 || endmatch <= char_ins_del_cost (f)[tem]))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5417 endmatch = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5418
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5419 /* nsp - osp is the distance to insert or delete.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5420 If that is nonzero, begmatch is known to be nonzero also.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5421 begmatch + endmatch is how much we save by doing the ins/del.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5422 Is it worth it? */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5423
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5424 if (nsp != osp
82990
2ecd1f669db9 Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents: 82989
diff changeset
5425 && (!FRAME_CHAR_INS_DEL_OK (f)
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5426 || begmatch + endmatch <= char_ins_del_cost (f)[nsp - osp]))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5427 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5428 begmatch = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5429 endmatch = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5430 osp = nsp = min (osp, nsp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5431 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5432
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5433 /* Now go through the line, inserting, writing and
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5434 deleting as appropriate. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5435
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5436 if (osp > nsp)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5437 {
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5438 cursor_to (f, vpos, nsp);
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5439 delete_glyphs (f, osp - nsp);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5440 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5441 else if (nsp > osp)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5442 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5443 /* If going to delete chars later in line
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5444 and insert earlier in the line,
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5445 must delete first to avoid losing data in the insert */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5446 if (endmatch && nlen < olen + nsp - osp)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5447 {
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5448 cursor_to (f, vpos, nlen - endmatch + osp - nsp);
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5449 delete_glyphs (f, olen + nsp - osp - nlen);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5450 olen = nlen - (nsp - osp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5451 }
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5452 cursor_to (f, vpos, osp);
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5453 insert_glyphs (f, 0, nsp - osp);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5454 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5455 olen += nsp - osp;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5456
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5457 tem = nsp + begmatch + endmatch;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5458 if (nlen != tem || olen != tem)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5459 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5460 if (!endmatch || nlen == olen)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5461 {
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5462 /* 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
5463 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
5464 (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
5465 be "at the margin" after the text is done). */
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5466 if (nlen == FRAME_TOTAL_COLS (f))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5467 olen = 0;
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5468
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5469 /* 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
5470 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
5471 unnecessary cursor movement. */
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5472 if (nlen - tem > 0)
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5473 {
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5474 cursor_to (f, vpos, nsp + begmatch);
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5475 write_glyphs (f, nbody + nsp + begmatch, nlen - tem);
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5476 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5477 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5478 else if (nlen > olen)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5479 {
17015
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5480 /* 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
5481 ----------------------------------------
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5482 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
5483 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
5484 ----------------------------------------
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5485 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
5486 is a padding glyph. */
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5487 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
5488 int del;
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5489
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5490 cursor_to (f, vpos, nsp + begmatch);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5491
17015
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5492 /* 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
5493 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
5494 out--;
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5495 write_glyphs (f, nbody + nsp + begmatch, out);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5496
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5497 /* 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
5498 del = olen - tem - out;
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5499 if (del > 0)
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5500 delete_glyphs (f, del);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5501
17015
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5502 /* At last, we insert columns not yet written out. */
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5503 insert_glyphs (f, nbody + nsp + begmatch + out, nlen - olen + del);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5504 olen = nlen;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5505 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5506 else if (olen > nlen)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5507 {
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5508 cursor_to (f, vpos, nsp + begmatch);
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5509 write_glyphs (f, nbody + nsp + begmatch, nlen - tem);
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5510 delete_glyphs (f, olen - nlen);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5511 olen = nlen;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5512 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5513 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5514
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5515 just_erase:
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5516 /* If any unerased characters remain after the new line, erase them. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5517 if (olen > nlen)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5518 {
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5519 cursor_to (f, vpos, nlen);
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
5520 clear_end_of_line (f, olen);
314
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 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5526
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5527
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5528
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5529 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5530 X/Y Position -> Buffer Position
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
36697
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5533 /* Determine what's under window-relative pixel position (*X, *Y).
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5534 Return the object (string or buffer) that's there.
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5535 Return in *POS the position in that object.
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5536 Adjust *X and *Y to character positions. */
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5537
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5538 Lisp_Object
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5539 buffer_posn_from_coords (w, x, y, pos, object, dx, dy, width, height)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5540 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5541 int *x, *y;
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5542 struct display_pos *pos;
36697
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5543 Lisp_Object *object;
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5544 int *dx, *dy;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5545 int *width, *height;
7810
15c0bf73737e (Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7808
diff changeset
5546 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5547 struct it it;
101464
f34b82b3a6e0 (buffer_posn_from_coords): Use Fset_buffer instead of setting
Chong Yidong <cyd@stupidchicken.com>
parents: 100951
diff changeset
5548 Lisp_Object old_current_buffer = Fcurrent_buffer ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5549 struct text_pos startp;
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5550 Lisp_Object string;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5551 struct glyph_row *row;
55021
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5552 #ifdef HAVE_WINDOW_SYSTEM
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5553 struct image *img = 0;
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5554 #endif
53127
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5555 int x0, x1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5556
101464
f34b82b3a6e0 (buffer_posn_from_coords): Use Fset_buffer instead of setting
Chong Yidong <cyd@stupidchicken.com>
parents: 100951
diff changeset
5557 /* We used to set current_buffer directly here, but that does the
f34b82b3a6e0 (buffer_posn_from_coords): Use Fset_buffer instead of setting
Chong Yidong <cyd@stupidchicken.com>
parents: 100951
diff changeset
5558 wrong thing with `face-remapping-alist' (bug#2044). */
f34b82b3a6e0 (buffer_posn_from_coords): Use Fset_buffer instead of setting
Chong Yidong <cyd@stupidchicken.com>
parents: 100951
diff changeset
5559 Fset_buffer (w->buffer);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5560 SET_TEXT_POS_FROM_MARKER (startp, w->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5561 CHARPOS (startp) = min (ZV, max (BEGV, CHARPOS (startp)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5562 BYTEPOS (startp) = min (ZV_BYTE, max (BEGV_BYTE, BYTEPOS (startp)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5563 start_display (&it, w, startp);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5564
53127
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5565 x0 = *x - WINDOW_LEFT_MARGIN_WIDTH (w);
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5566 move_it_to (&it, -1, x0 + it.first_visible_x, *y, -1,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5567 MOVE_TO_X | MOVE_TO_Y);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5568
101464
f34b82b3a6e0 (buffer_posn_from_coords): Use Fset_buffer instead of setting
Chong Yidong <cyd@stupidchicken.com>
parents: 100951
diff changeset
5569 Fset_buffer (old_current_buffer);
36697
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5570
53176
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5571 *dx = x0 + it.first_visible_x - it.current_x;
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5572 *dy = *y - it.current_y;
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5573
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5574 string = w->buffer;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5575 if (STRINGP (it.string))
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5576 string = it.string;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5577 *pos = it.current;
53329
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5578
53190
053a4dfb6bd4 * dispnew.c (buffer_posn_from_coords): Add ifdef HAVE_WINDOW_SYSTEM
Jan Djärv <jan.h.d@swipnet.se>
parents: 53176
diff changeset
5579 #ifdef HAVE_WINDOW_SYSTEM
53329
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5580 if (it.what == IT_IMAGE)
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5581 {
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5582 if ((img = IMAGE_FROM_ID (it.f, it.image_id)) != NULL
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5583 && !NILP (img->spec))
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5584 *object = img->spec;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5585 }
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5586 #endif
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5587
65016
2b179104bc17 (buffer_posn_from_coords): Check that target row is
Kim F. Storm <storm@cua.dk>
parents: 65003
diff changeset
5588 if (it.vpos < w->current_matrix->nrows
2b179104bc17 (buffer_posn_from_coords): Check that target row is
Kim F. Storm <storm@cua.dk>
parents: 65003
diff changeset
5589 && (row = MATRIX_ROW (w->current_matrix, it.vpos),
2b179104bc17 (buffer_posn_from_coords): Check that target row is
Kim F. Storm <storm@cua.dk>
parents: 65003
diff changeset
5590 row->enabled_p))
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5591 {
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5592 if (it.hpos < row->used[TEXT_AREA])
53329
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5593 {
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5594 struct glyph *glyph = row->glyphs[TEXT_AREA] + it.hpos;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5595 #ifdef HAVE_WINDOW_SYSTEM
55021
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5596 if (img)
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5597 {
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5598 *dy -= row->ascent - glyph->ascent;
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5599 *dx += glyph->slice.x;
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5600 *dy += glyph->slice.y;
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5601 /* Image slices positions are still relative to the entire image */
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5602 *width = img->width;
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5603 *height = img->height;
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5604 }
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5605 else
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5606 #endif
55021
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5607 {
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5608 *width = glyph->pixel_width;
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5609 *height = glyph->ascent + glyph->descent;
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5610 }
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5611 }
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5612 else
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5613 {
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5614 *width = 0;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5615 *height = row->height;
53329
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5616 }
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5617 }
53176
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5618 else
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5619 {
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5620 *width = *height = 0;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5621 }
53329
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5622
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5623 /* Add extra (default width) columns if clicked after EOL. */
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5624 x1 = max(0, it.current_x + it.pixel_width - it.first_visible_x);
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5625 if (x0 > x1)
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5626 it.hpos += (x0 - x1) / WINDOW_FRAME_COLUMN_WIDTH (w);
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5627
53127
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5628 *x = it.hpos;
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5629 *y = it.vpos;
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5630
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5631 return string;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5632 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5633
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5634
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5635 /* Value is the string under window-relative coordinates X/Y in the
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5636 mode line or header line (PART says which) of window W, or nil if none.
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5637 *CHARPOS is set to the position in the string returned. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5638
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5639 Lisp_Object
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5640 mode_line_string (w, part, x, y, charpos, object, dx, dy, width, height)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5641 struct window *w;
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5642 enum window_part part;
53127
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5643 int *x, *y;
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5644 int *charpos;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5645 Lisp_Object *object;
53176
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5646 int *dx, *dy;
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5647 int *width, *height;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5648 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5649 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5650 struct glyph *glyph, *end;
53176
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5651 int x0, y0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5652 Lisp_Object string = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5653
50218
06f75553f0a4 (mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents: 49600
diff changeset
5654 if (part == ON_MODE_LINE)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5655 row = MATRIX_MODE_LINE_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5656 else
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
5657 row = MATRIX_HEADER_LINE_ROW (w->current_matrix);
53176
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5658 y0 = *y - row->y;
53127
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5659 *y = row - MATRIX_FIRST_TEXT_ROW (w->current_matrix);
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5660
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5661 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
5662 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5663 /* 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
5664 it's the one we were looking for. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5665 glyph = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5666 end = glyph + row->used[TEXT_AREA];
59592
c0533d2d03af (mode_line_string, marginal_area_string): Fix
Kim F. Storm <storm@cua.dk>
parents: 59580
diff changeset
5667 for (x0 = *x; glyph < end && x0 >= glyph->pixel_width; ++glyph)
53127
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5668 x0 -= glyph->pixel_width;
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5669 *x = glyph - row->glyphs[TEXT_AREA];
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5670 if (glyph < end)
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5671 {
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5672 string = glyph->object;
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5673 *charpos = glyph->charpos;
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5674 *width = glyph->pixel_width;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5675 *height = glyph->ascent + glyph->descent;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5676 #ifdef HAVE_WINDOW_SYSTEM
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5677 if (glyph->type == IMAGE_GLYPH)
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5678 {
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5679 struct image *img;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5680 img = IMAGE_FROM_ID (WINDOW_XFRAME (w), glyph->u.img_id);
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5681 if (img != NULL)
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5682 *object = img->spec;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5683 y0 -= row->ascent - glyph->ascent;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5684 }
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5685 #endif
53127
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5686 }
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5687 else
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5688 {
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5689 /* Add extra (default width) columns if clicked after EOL. */
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5690 *x += x0 / WINDOW_FRAME_COLUMN_WIDTH (w);
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5691 *width = 0;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5692 *height = row->height;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5693 }
7810
15c0bf73737e (Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7808
diff changeset
5694 }
53127
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5695 else
53176
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5696 {
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5697 *x = 0;
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5698 x0 = 0;
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5699 *width = *height = 0;
53176
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5700 }
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5701
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5702 *dx = x0;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5703 *dy = y0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5704
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5705 return string;
7810
15c0bf73737e (Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7808
diff changeset
5706 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5707
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5708
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5709 /* 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
5710 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
5711 the string returned. */
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5712
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5713 Lisp_Object
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5714 marginal_area_string (w, part, x, y, charpos, object, dx, dy, width, height)
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5715 struct window *w;
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5716 enum window_part part;
53127
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5717 int *x, *y;
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5718 int *charpos;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5719 Lisp_Object *object;
53176
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5720 int *dx, *dy;
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5721 int *width, *height;
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5722 {
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5723 struct glyph_row *row = w->current_matrix->rows;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5724 struct glyph *glyph, *end;
53176
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5725 int x0, y0, i, wy = *y;
50218
06f75553f0a4 (mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents: 49600
diff changeset
5726 int area;
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5727 Lisp_Object string = Qnil;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5728
50218
06f75553f0a4 (mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents: 49600
diff changeset
5729 if (part == ON_LEFT_MARGIN)
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5730 area = LEFT_MARGIN_AREA;
50218
06f75553f0a4 (mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents: 49600
diff changeset
5731 else if (part == ON_RIGHT_MARGIN)
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5732 area = RIGHT_MARGIN_AREA;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5733 else
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5734 abort ();
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5735
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5736 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
5737 if (wy >= row->y && wy < MATRIX_ROW_BOTTOM_Y (row))
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5738 break;
53176
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5739 y0 = *y - row->y;
53127
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5740 *y = row - MATRIX_FIRST_TEXT_ROW (w->current_matrix);
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5741
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5742 if (row->enabled_p)
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5743 {
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5744 /* 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
5745 it's the one we were looking for. */
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5746 if (area == RIGHT_MARGIN_AREA)
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5747 x0 = ((WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
54847
5acc1d864551 (update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents: 54176
diff changeset
5748 ? WINDOW_LEFT_FRINGE_WIDTH (w)
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5749 : WINDOW_TOTAL_FRINGE_WIDTH (w))
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5750 + window_box_width (w, LEFT_MARGIN_AREA)
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5751 + window_box_width (w, TEXT_AREA));
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5752 else
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5753 x0 = (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
54847
5acc1d864551 (update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents: 54176
diff changeset
5754 ? WINDOW_LEFT_FRINGE_WIDTH (w)
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5755 : 0);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5756
53127
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5757 glyph = row->glyphs[area];
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5758 end = glyph + row->used[area];
59592
c0533d2d03af (mode_line_string, marginal_area_string): Fix
Kim F. Storm <storm@cua.dk>
parents: 59580
diff changeset
5759 for (x0 = *x - x0; glyph < end && x0 >= glyph->pixel_width; ++glyph)
53127
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5760 x0 -= glyph->pixel_width;
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5761 *x = glyph - row->glyphs[area];
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5762 if (glyph < end)
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5763 {
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5764 string = glyph->object;
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5765 *charpos = glyph->charpos;
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5766 *width = glyph->pixel_width;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5767 *height = glyph->ascent + glyph->descent;
53329
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5768 #ifdef HAVE_WINDOW_SYSTEM
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5769 if (glyph->type == IMAGE_GLYPH)
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5770 {
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5771 struct image *img;
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5772 img = IMAGE_FROM_ID (WINDOW_XFRAME (w), glyph->u.img_id);
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5773 if (img != NULL)
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5774 *object = img->spec;
53329
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5775 y0 -= row->ascent - glyph->ascent;
55021
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5776 x0 += glyph->slice.x;
78fbab658433 (buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents: 54847
diff changeset
5777 y0 += glyph->slice.y;
53329
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5778 }
9c540a878edf (buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents: 53190
diff changeset
5779 #endif
53127
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5780 }
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5781 else
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5782 {
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5783 /* Add extra (default width) columns if clicked after EOL. */
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5784 *x += x0 / WINDOW_FRAME_COLUMN_WIDTH (w);
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5785 *width = 0;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5786 *height = row->height;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5787 }
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5788 }
53127
bc14fd4782c3 (buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents: 53055
diff changeset
5789 else
53176
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5790 {
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5791 x0 = 0;
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5792 *x = 0;
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5793 *width = *height = 0;
53176
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5794 }
b246aabe1c49 (buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents: 53127
diff changeset
5795
53514
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5796 *dx = x0;
db81ac8829b6 (buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents: 53329
diff changeset
5797 *dy = y0;
44536
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 return string;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5800 }
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5801
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5802
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5803 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5804 Changing Frame Sizes
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5805 ***********************************************************************/
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5806
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5807 #ifdef SIGWINCH
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5808
493
8b101799ff37 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 451
diff changeset
5809 SIGTYPE
10745
a553a08f5785 (window_change_signal): Add ignored argument.
Richard M. Stallman <rms@gnu.org>
parents: 10259
diff changeset
5810 window_change_signal (signalnum) /* If we don't have an argument, */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5811 int signalnum; /* some compilers complain in signal calls. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5812 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5813 int width, height;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5814 int old_errno = errno;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5815
82989
f3845715a5f6 Separate frame-local, tty-dependent parameters from tty-local parameters.
Karoly Lorentey <lorentey@elte.hu>
parents: 82987
diff changeset
5816 struct tty_display_info *tty;
82995
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82992
diff changeset
5817
58986
59945307b86b * syssignal.h: Declare main_thread.
Jan Djärv <jan.h.d@swipnet.se>
parents: 57808
diff changeset
5818 signal (SIGWINCH, window_change_signal);
59945307b86b * syssignal.h: Declare main_thread.
Jan Djärv <jan.h.d@swipnet.se>
parents: 57808
diff changeset
5819 SIGNAL_THREAD_CHECK (signalnum);
59945307b86b * syssignal.h: Declare main_thread.
Jan Djärv <jan.h.d@swipnet.se>
parents: 57808
diff changeset
5820
53229
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 53226
diff changeset
5821 /* The frame size change obviously applies to a single
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 53226
diff changeset
5822 termcap-controlled terminal, but we can't decide which.
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 53226
diff changeset
5823 Therefore, we resize the frames corresponding to each tty.
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 53226
diff changeset
5824 */
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 53226
diff changeset
5825 for (tty = tty_list; tty; tty = tty->next) {
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 53226
diff changeset
5826
53341
d4e6a050c9b1 Bugfix festival.
Karoly Lorentey <lorentey@elte.hu>
parents: 53339
diff changeset
5827 if (! tty->term_initted)
d4e6a050c9b1 Bugfix festival.
Karoly Lorentey <lorentey@elte.hu>
parents: 53339
diff changeset
5828 continue;
82995
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82992
diff changeset
5829
101690
1009d5607716 * dispnew.c (window_change_signal): Don't try to get the size of a
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101464
diff changeset
5830 /* Suspended tty frames have tty->input == NULL avoid trying to
1009d5607716 * dispnew.c (window_change_signal): Don't try to get the size of a
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101464
diff changeset
5831 use it. */
1009d5607716 * dispnew.c (window_change_signal): Don't try to get the size of a
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101464
diff changeset
5832 if (!tty->input)
1009d5607716 * dispnew.c (window_change_signal): Don't try to get the size of a
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101464
diff changeset
5833 continue;
1009d5607716 * dispnew.c (window_change_signal): Don't try to get the size of a
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101464
diff changeset
5834
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
5835 get_tty_size (fileno (tty->input), &width, &height);
92276
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
5836
83412
573105015a96 Work around Emacs crash on Konsole detach. (Tom Schutzer-Weissmann)
Karoly Lorentey <lorentey@elte.hu>
parents: 83384
diff changeset
5837 if (width > 5 && height > 2) {
53229
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 53226
diff changeset
5838 Lisp_Object tail, frame;
92276
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
5839
53229
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 53226
diff changeset
5840 FOR_EACH_FRAME (tail, frame)
82995
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82992
diff changeset
5841 if (FRAME_TERMCAP_P (XFRAME (frame)) && FRAME_TTY (XFRAME (frame)) == tty)
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82992
diff changeset
5842 /* Record the new sizes, but don't reallocate the data
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82992
diff changeset
5843 structures now. Let that be done later outside of the
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82992
diff changeset
5844 signal handler. */
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82992
diff changeset
5845 change_frame_size (XFRAME (frame), height, width, 0, 1, 0);
53229
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 53226
diff changeset
5846 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5847 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5848
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5849 errno = old_errno;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5850 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5851 #endif /* SIGWINCH */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5852
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5853
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5854 /* 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
5855 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
5856 safe to change frame sizes while a redisplay is in progress. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5857
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
5858 void
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5859 do_pending_window_change (safe)
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5860 int safe;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5861 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5862 /* 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
5863 if (redisplaying_p && !safe)
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5864 return;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5865
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5866 while (delayed_size_change)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5867 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2198
diff changeset
5868 Lisp_Object tail, frame;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5869
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5870 delayed_size_change = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5871
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2198
diff changeset
5872 FOR_EACH_FRAME (tail, frame)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5873 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5874 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
5875
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5876 if (f->new_text_lines != 0 || f->new_text_cols != 0)
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5877 change_frame_size (f, f->new_text_lines, f->new_text_cols,
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5878 0, 0, safe);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5879 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5880 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5881 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5882
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5883
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5884 /* Change the frame height and/or width. Values may be given as zero to
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5885 indicate no change is to take place.
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5886
960
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5887 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
5888 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
5889 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
5890 from a signal handler.
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5891
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5892 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
5893 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
5894
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
5895 void
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5896 change_frame_size (f, newheight, newwidth, pretend, delay, safe)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5897 register struct frame *f;
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5898 int newheight, newwidth, pretend, delay, safe;
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5899 {
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5900 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
5901
53229
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 53226
diff changeset
5902 if (FRAME_MSDOS_P (f))
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5903 {
53229
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 53226
diff changeset
5904 /* On MS-DOS, all frames use the same screen, so a change in
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 53226
diff changeset
5905 size affects all frames. Termcap now supports multiple
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 53226
diff changeset
5906 ttys. */
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5907 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
5908 if (! FRAME_WINDOW_P (XFRAME (frame)))
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5909 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
5910 pretend, delay, safe);
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5911 }
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5912 else
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5913 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
5914 }
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5915
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5916 static void
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5917 change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5918 register struct frame *f;
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5919 int newheight, newwidth, pretend, delay, safe;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5920 {
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5921 int new_frame_total_cols;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 44890
diff changeset
5922 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
5923
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5924 /* 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
5925 if (delay || (redisplaying_p && !safe))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5926 {
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5927 f->new_text_lines = newheight;
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5928 f->new_text_cols = newwidth;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5929 delayed_size_change = 1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5930 return;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5931 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5932
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5933 /* This size-change overrides any pending one for this frame. */
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5934 f->new_text_lines = 0;
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5935 f->new_text_cols = 0;
960
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5936
3449
ad455da9b789 (do_pending_window_change): No need to clear
Richard M. Stallman <rms@gnu.org>
parents: 3357
diff changeset
5937 /* 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
5938 if (newheight == 0)
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5939 newheight = FRAME_LINES (f);
15896
3a3c30116313 (change_frame_size_1): Clean up conditional.
Erik Naggum <erik@naggum.no>
parents: 15687
diff changeset
5940 if (newwidth == 0)
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5941 newwidth = FRAME_COLS (f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5942
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5943 /* Compute width of windows in F.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5944 This is the width of the frame without vertical scroll bars. */
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5945 new_frame_total_cols = FRAME_TOTAL_COLS_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
5946
960
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5947 /* Round up to the smallest acceptable size. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5948 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
5949
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5950 /* If we're not changing the frame size, quit now. */
106765
0c270bc7ceff Frame width was not updated in fullscreen when scroll bars where removed/added.
Jan D. <jan.h.d@swipnet.se>
parents: 105877
diff changeset
5951 /* Frame width may be unchanged but the text portion may change, for example,
0c270bc7ceff Frame width was not updated in fullscreen when scroll bars where removed/added.
Jan D. <jan.h.d@swipnet.se>
parents: 105877
diff changeset
5952 fullscreen and remove/add scroll bar. */
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5953 if (newheight == FRAME_LINES (f)
106765
0c270bc7ceff Frame width was not updated in fullscreen when scroll bars where removed/added.
Jan D. <jan.h.d@swipnet.se>
parents: 105877
diff changeset
5954 && newwidth == FRAME_COLS (f) // text portion unchanged
0c270bc7ceff Frame width was not updated in fullscreen when scroll bars where removed/added.
Jan D. <jan.h.d@swipnet.se>
parents: 105877
diff changeset
5955 && new_frame_total_cols == FRAME_TOTAL_COLS (f)) // frame width unchanged
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5956 return;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5957
15078
a295c26b5d67 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 15065
diff changeset
5958 BLOCK_INPUT;
a295c26b5d67 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 15065
diff changeset
5959
14286
5d42664b4e74 (change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
5960 #ifdef MSDOS
5d42664b4e74 (change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
5961 /* 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
5962 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
5963 or equal to the requested dimensions. */
5d42664b4e74 (change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
5964 dos_set_window_size (&newheight, &newwidth);
5d42664b4e74 (change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
5965 #endif
5d42664b4e74 (change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
5966
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5967 if (newheight != FRAME_LINES (f))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5968 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5969 if (FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5970 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5971 /* Frame has both root and mini-buffer. */
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5972 XSETFASTINT (XWINDOW (FRAME_ROOT_WINDOW (f))->top_line,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5973 FRAME_TOP_MARGIN (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5974 set_window_height (FRAME_ROOT_WINDOW (f),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5975 (newheight
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5976 - 1
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5977 - FRAME_TOP_MARGIN (f)),
94513
5b9bb0c0273a (change_frame_size_1): Preserve small windows when shrinking
Martin Rudalics <rudalics@gmx.at>
parents: 92692
diff changeset
5978 2);
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5979 XSETFASTINT (XWINDOW (FRAME_MINIBUF_WINDOW (f))->top_line,
9303
3115ae493c30 (direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents: 9264
diff changeset
5980 newheight - 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5981 set_window_height (FRAME_MINIBUF_WINDOW (f), 1, 0);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5982 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5983 else
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5984 /* Frame has just one top-level window. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5985 set_window_height (FRAME_ROOT_WINDOW (f),
94513
5b9bb0c0273a (change_frame_size_1): Preserve small windows when shrinking
Martin Rudalics <rudalics@gmx.at>
parents: 92692
diff changeset
5986 newheight - FRAME_TOP_MARGIN (f), 2);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5987
98497
6fa56eeb247c (change_frame_size_1): Set FrameRows and FrameCols for MSDOS frames as well.
Eli Zaretskii <eliz@gnu.org>
parents: 98438
diff changeset
5988 /* MSDOS frames cannot PRETEND, as they change frame size by
6fa56eeb247c (change_frame_size_1): Set FrameRows and FrameCols for MSDOS frames as well.
Eli Zaretskii <eliz@gnu.org>
parents: 98438
diff changeset
5989 manipulating video hardware. */
6fa56eeb247c (change_frame_size_1): Set FrameRows and FrameCols for MSDOS frames as well.
Eli Zaretskii <eliz@gnu.org>
parents: 98438
diff changeset
5990 if ((FRAME_TERMCAP_P (f) && !pretend) || FRAME_MSDOS_P (f))
53232
22aaf1e5fbe6 Full support for multiple terminal I/O (with some rough edges).
Karoly Lorentey <lorentey@elte.hu>
parents: 53231
diff changeset
5991 FrameRows (FRAME_TTY (f)) = newheight;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5992 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5993
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5994 if (new_frame_total_cols != FRAME_TOTAL_COLS (f))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5995 {
94513
5b9bb0c0273a (change_frame_size_1): Preserve small windows when shrinking
Martin Rudalics <rudalics@gmx.at>
parents: 92692
diff changeset
5996 set_window_width (FRAME_ROOT_WINDOW (f), new_frame_total_cols, 2);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5997 if (FRAME_HAS_MINIBUF_P (f))
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5998 set_window_width (FRAME_MINIBUF_WINDOW (f), new_frame_total_cols, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5999
98497
6fa56eeb247c (change_frame_size_1): Set FrameRows and FrameCols for MSDOS frames as well.
Eli Zaretskii <eliz@gnu.org>
parents: 98438
diff changeset
6000 /* MSDOS frames cannot PRETEND, as they change frame size by
6fa56eeb247c (change_frame_size_1): Set FrameRows and FrameCols for MSDOS frames as well.
Eli Zaretskii <eliz@gnu.org>
parents: 98438
diff changeset
6001 manipulating video hardware. */
6fa56eeb247c (change_frame_size_1): Set FrameRows and FrameCols for MSDOS frames as well.
Eli Zaretskii <eliz@gnu.org>
parents: 98438
diff changeset
6002 if ((FRAME_TERMCAP_P (f) && !pretend) || FRAME_MSDOS_P (f))
53232
22aaf1e5fbe6 Full support for multiple terminal I/O (with some rough edges).
Karoly Lorentey <lorentey@elte.hu>
parents: 53231
diff changeset
6003 FrameCols (FRAME_TTY (f)) = newwidth;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6004
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
6005 if (WINDOWP (f->tool_bar_window))
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
6006 XSETFASTINT (XWINDOW (f->tool_bar_window)->total_cols, newwidth);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6007 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6008
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
6009 FRAME_LINES (f) = newheight;
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
6010 SET_FRAME_COLS (f, newwidth);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6011
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6012 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6013 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6014 int text_area_x, text_area_y, text_area_width, text_area_height;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6015
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6016 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
6017 &text_area_height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6018 if (w->cursor.x >= text_area_x + text_area_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6019 w->cursor.hpos = w->cursor.x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6020 if (w->cursor.y >= text_area_y + text_area_height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6021 w->cursor.vpos = w->cursor.y = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6022 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6023
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6024 adjust_glyphs (f);
40512
d256f6fc9c05 (change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents: 40334
diff changeset
6025 calculate_costs (f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6026 SET_FRAME_GARBAGED (f);
40512
d256f6fc9c05 (change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents: 40334
diff changeset
6027 f->resized_p = 1;
15065
270020829d09 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 14964
diff changeset
6028
270020829d09 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 14964
diff changeset
6029 UNBLOCK_INPUT;
17282
5023bea28298 (change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents: 17015
diff changeset
6030
19627
c6343f7a9c6c (change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents: 19063
diff changeset
6031 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
6032
88050
449ffc76e463 * window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
6033 run_window_configuration_change_hook (f);
19627
c6343f7a9c6c (change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents: 19063
diff changeset
6034
c6343f7a9c6c (change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents: 19063
diff changeset
6035 unbind_to (count, Qnil);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6036 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6037
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6038
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6039
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6040 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6041 Terminal Related Lisp Functions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6042 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6043
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6044 DEFUN ("open-termscript", Fopen_termscript, Sopen_termscript,
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6045 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
6046 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
6047 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
6048 (file)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6049 Lisp_Object file;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6050 {
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
6051 struct tty_display_info *tty;
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
6052
98508
c370f470d5ba (update_frame): Flush termscript for MSDOS frames as well as for TTY.
Eli Zaretskii <eliz@gnu.org>
parents: 98497
diff changeset
6053 if (! FRAME_TERMCAP_P (SELECTED_FRAME ())
c370f470d5ba (update_frame): Flush termscript for MSDOS frames as well as for TTY.
Eli Zaretskii <eliz@gnu.org>
parents: 98497
diff changeset
6054 && ! FRAME_MSDOS_P (SELECTED_FRAME ()))
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
6055 error ("Current frame is not on a tty device");
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
6056
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
6057 tty = CURTTY ();
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
6058
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
6059 if (tty->termscript != 0)
83560
738ce3540ffb Merged from emacs@sv.gnu.org
Karoly Lorentey <karoly@lorentey.hu>
parents: 83556 76621
diff changeset
6060 {
738ce3540ffb Merged from emacs@sv.gnu.org
Karoly Lorentey <karoly@lorentey.hu>
parents: 83556 76621
diff changeset
6061 BLOCK_INPUT;
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
6062 fclose (tty->termscript);
83560
738ce3540ffb Merged from emacs@sv.gnu.org
Karoly Lorentey <karoly@lorentey.hu>
parents: 83556 76621
diff changeset
6063 UNBLOCK_INPUT;
738ce3540ffb Merged from emacs@sv.gnu.org
Karoly Lorentey <karoly@lorentey.hu>
parents: 83556 76621
diff changeset
6064 }
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
6065 tty->termscript = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6066
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6067 if (! NILP (file))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6068 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6069 file = Fexpand_file_name (file, Qnil);
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
6070 tty->termscript = fopen (SDATA (file), "w");
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
6071 if (tty->termscript == 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6072 report_file_error ("Opening termscript", Fcons (file, Qnil));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6073 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6074 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6075 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6076
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6077
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6078 DEFUN ("send-string-to-terminal", Fsend_string_to_terminal,
83370
5272862a4865 Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents: 83362
diff changeset
6079 Ssend_string_to_terminal, 1, 2, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6080 doc: /* Send STRING to the terminal without alteration.
83370
5272862a4865 Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents: 83362
diff changeset
6081 Control characters in STRING will have terminal-dependent effects.
5272862a4865 Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents: 83362
diff changeset
6082
83431
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6083 Optional parameter TERMINAL specifies the tty terminal device to use.
104957
81757111b576 (Fsend_string_to_terminal): Amend doc string to cover batch mode.
Alan Mackenzie <acm@muc.de>
parents: 104816
diff changeset
6084 It may be a terminal object, a frame, or nil for the terminal used by
81757111b576 (Fsend_string_to_terminal): Amend doc string to cover batch mode.
Alan Mackenzie <acm@muc.de>
parents: 104816
diff changeset
6085 the currently selected frame. In batch mode, STRING is sent to stdout
81757111b576 (Fsend_string_to_terminal): Amend doc string to cover batch mode.
Alan Mackenzie <acm@muc.de>
parents: 104816
diff changeset
6086 when TERMINAL is nil. */)
83431
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6087 (string, terminal)
14068
a3c83dde295e (Fsend_string_to_terminal, Fsit_for): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents: 13526
diff changeset
6088 Lisp_Object string;
83431
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6089 Lisp_Object terminal;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6090 {
104816
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6091 struct terminal *t = get_terminal (terminal, 1);
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6092 FILE *out;
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
6093
20618
d5acac3af6e3 (Fsend_string_to_terminal): Use size_byte.
Richard M. Stallman <rms@gnu.org>
parents: 19627
diff changeset
6094 /* ??? 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
6095 CHECK_STRING (string);
76621
685fa6c9ae44 (Fopen_termscript): Add BLOCK_INPUT around fclose.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 76069
diff changeset
6096 BLOCK_INPUT;
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
6097
83431
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6098 if (!t)
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6099 error ("Unknown terminal device");
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6100
104816
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6101 if (t->type == output_initial)
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6102 out = stdout;
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6103 else if (t->type != output_termcap && t->type != output_msdos_raw)
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6104 error ("Device %d is not a termcap terminal device", t->id);
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6105 else
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6106 {
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6107 struct tty_display_info *tty = t->display_info.tty;
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6108
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6109 if (! tty->output)
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6110 error ("Terminal is currently suspended");
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6111
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6112 if (tty->termscript)
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6113 {
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6114 fwrite (SDATA (string), 1, SBYTES (string), tty->termscript);
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6115 fflush (tty->termscript);
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6116 }
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6117 out = tty->output;
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6118 }
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6119 fwrite (SDATA (string), 1, SBYTES (string), out);
4129eea9d003 (Fsend_string_to_terminal): Make it work again on the initial terminal as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104077
diff changeset
6120 fflush (out);
76621
685fa6c9ae44 (Fopen_termscript): Add BLOCK_INPUT around fclose.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 76069
diff changeset
6121 UNBLOCK_INPUT;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6122 return Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6123 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6124
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6125
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6126 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
6127 doc: /* Beep, or flash the screen.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6128 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
6129 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
6130 (arg)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6131 Lisp_Object arg;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6132 {
493
8b101799ff37 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 451
diff changeset
6133 if (!NILP (arg))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6134 {
649
61deba7b73b6 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 587
diff changeset
6135 if (noninteractive)
61deba7b73b6 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 587
diff changeset
6136 putchar (07);
61deba7b73b6 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 587
diff changeset
6137 else
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
6138 ring_bell (XFRAME (selected_frame));
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6139 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6140 else
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6141 bitch_at_user ();
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6142
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6143 return Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6144 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6145
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
6146 void
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6147 bitch_at_user ()
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6148 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6149 if (noninteractive)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6150 putchar (07);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6151 else if (!INTERACTIVE) /* Stop executing a keyboard macro. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6152 error ("Keyboard macro terminated by a command ringing the bell");
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6153 else
83100
4970ad4995f5 Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83098
diff changeset
6154 ring_bell (XFRAME (selected_frame));
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6155 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6156
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6157
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6158
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6159 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6160 Sleeping, Waiting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6161 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6162
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6163 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
6164 doc: /* Pause, without updating display, for SECONDS seconds.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6165 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
6166 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
6167 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
6168 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
6169 \(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
6170 (seconds, milliseconds)
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6171 Lisp_Object seconds, milliseconds;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6172 {
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6173 int sec, usec;
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6174
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6175 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
6176 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
6177 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40512
diff changeset
6178 CHECK_NUMBER (milliseconds);
2648
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6179 usec = XINT (milliseconds) * 1000;
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6180
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6181 {
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6182 double duration = extract_float (seconds);
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6183 sec = (int) duration;
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6184 usec += (duration - sec) * 1000000;
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6185 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6186
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6187 #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
6188 if (sec == 0 && usec != 0)
63695
98563021d2e3 (Fsleep_for, Fsit_for): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents: 63649
diff changeset
6189 error ("Millisecond `sleep-for' not supported on %s", SYSTEM_TYPE);
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6190 #endif
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6191
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6192 /* 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
6193 if (usec < 0)
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6194 {
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 /* 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
6196 if (-1000000 < usec)
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6197 sec--, usec += 1000000;
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6198 else
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6199 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
6200 }
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6201 else
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6202 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
6203
14646
68fe10d1abd0 (Fsleep_for): Accept sub-second intervals.
Erik Naggum <erik@naggum.no>
parents: 14459
diff changeset
6204 if (sec < 0 || (sec == 0 && usec == 0))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6205 return Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6206
56727
6b028bf60b4e (Fsleep_for): Remove obsolete code.
Kim F. Storm <storm@cua.dk>
parents: 56717
diff changeset
6207 wait_reading_process_output (sec, usec, 0, 0, Qnil, NULL, 0);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6208
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6209 return Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6210 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6211
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6212
56727
6b028bf60b4e (Fsleep_for): Remove obsolete code.
Kim F. Storm <storm@cua.dk>
parents: 56717
diff changeset
6213 /* This is just like wait_reading_process_output, except that
71794
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6214 it does redisplay.
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6215
73318
e876a1f62fec * dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents: 72949
diff changeset
6216 TIMEOUT is number of seconds to wait (float or integer),
e876a1f62fec * dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents: 72949
diff changeset
6217 or t to wait forever.
71794
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6218 READING is 1 if reading input.
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6219 If DO_DISPLAY is >0 display process output while waiting.
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6220 If DO_DISPLAY is >1 perform an initial redisplay before waiting.
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6221 */
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6222
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6223 Lisp_Object
71794
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6224 sit_for (timeout, reading, do_display)
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6225 Lisp_Object timeout;
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6226 int reading, do_display;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6227 {
71794
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6228 int sec, usec;
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6229
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6230 swallow_events (do_display);
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6231
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6232 if ((detect_input_pending_run_timers (do_display))
71138
5cf77229c85d (sit_for): Perform redisplay even if input is pending
Kim F. Storm <storm@cua.dk>
parents: 70300
diff changeset
6233 || !NILP (Vexecuting_kbd_macro))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6234 return Qnil;
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6235
71794
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6236 if (do_display >= 2)
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6237 redisplay_preserve_echo_area (2);
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6238
71804
1a7b37f82a06 (sit_for): Signal error if TIMEOUT is not a number in case arg comes
Kim F. Storm <storm@cua.dk>
parents: 71794
diff changeset
6239 if (INTEGERP (timeout))
71333
a8cbcce39bd0 (sit_for): Undo 2006-06-01 change. Instead, a
Kim F. Storm <storm@cua.dk>
parents: 71323
diff changeset
6240 {
71810
cf9070737895 (sit_for): Use XINT.
Kim F. Storm <storm@cua.dk>
parents: 71804
diff changeset
6241 sec = XINT (timeout);
71804
1a7b37f82a06 (sit_for): Signal error if TIMEOUT is not a number in case arg comes
Kim F. Storm <storm@cua.dk>
parents: 71794
diff changeset
6242 usec = 0;
1a7b37f82a06 (sit_for): Signal error if TIMEOUT is not a number in case arg comes
Kim F. Storm <storm@cua.dk>
parents: 71794
diff changeset
6243 }
1a7b37f82a06 (sit_for): Signal error if TIMEOUT is not a number in case arg comes
Kim F. Storm <storm@cua.dk>
parents: 71794
diff changeset
6244 else if (FLOATP (timeout))
1a7b37f82a06 (sit_for): Signal error if TIMEOUT is not a number in case arg comes
Kim F. Storm <storm@cua.dk>
parents: 71794
diff changeset
6245 {
71831
347f809d2edb (sit_for): Tiny simplification.
Kim F. Storm <storm@cua.dk>
parents: 71810
diff changeset
6246 double seconds = XFLOAT_DATA (timeout);
71794
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6247 sec = (int) seconds;
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6248 usec = (int) ((seconds - sec) * 1000000);
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6249 }
73318
e876a1f62fec * dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents: 72949
diff changeset
6250 else if (EQ (timeout, Qt))
e876a1f62fec * dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents: 72949
diff changeset
6251 {
e876a1f62fec * dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents: 72949
diff changeset
6252 sec = 0;
e876a1f62fec * dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents: 72949
diff changeset
6253 usec = 0;
e876a1f62fec * dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents: 72949
diff changeset
6254 }
71794
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6255 else
71804
1a7b37f82a06 (sit_for): Signal error if TIMEOUT is not a number in case arg comes
Kim F. Storm <storm@cua.dk>
parents: 71794
diff changeset
6256 wrong_type_argument (Qnumberp, timeout);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6257
73318
e876a1f62fec * dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents: 72949
diff changeset
6258 if (sec == 0 && usec == 0 && !EQ (timeout, Qt))
673
6217fa6e2cab *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 650
diff changeset
6259 return Qt;
6217fa6e2cab *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 650
diff changeset
6260
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6261 #ifdef SIGIO
1915
98ecf99d7b1a * dispnew.c (sit_for): Pass the correct number of arguments to
Jim Blandy <jimb@redhat.com>
parents: 1872
diff changeset
6262 gobble_input (0);
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6263 #endif
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6264
71794
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6265 wait_reading_process_output (sec, usec, reading ? -1 : 1, do_display,
56727
6b028bf60b4e (Fsleep_for): Remove obsolete code.
Kim F. Storm <storm@cua.dk>
parents: 56717
diff changeset
6266 Qnil, NULL, 0);
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6267
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6268 return detect_input_pending () ? Qnil : Qt;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6269 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6270
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6271
71771
c6e0c9217129 (Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents: 71761
diff changeset
6272 DEFUN ("redisplay", Fredisplay, Sredisplay, 0, 1, 0,
c6e0c9217129 (Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents: 71761
diff changeset
6273 doc: /* Perform redisplay if no input is available.
71773
f9f87c544216 Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 71772
diff changeset
6274 If optional arg FORCE is non-nil or `redisplay-dont-pause' is non-nil,
72788
102f29870373 (Fredisplay): Document return value.
Kim F. Storm <storm@cua.dk>
parents: 71946
diff changeset
6275 perform a full redisplay even if input is available.
102f29870373 (Fredisplay): Document return value.
Kim F. Storm <storm@cua.dk>
parents: 71946
diff changeset
6276 Return t if redisplay was performed, nil otherwise. */)
71771
c6e0c9217129 (Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents: 71761
diff changeset
6277 (force)
c6e0c9217129 (Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents: 71761
diff changeset
6278 Lisp_Object force;
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6279 {
71771
c6e0c9217129 (Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents: 71761
diff changeset
6280 int count;
c6e0c9217129 (Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents: 71761
diff changeset
6281
71794
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6282 swallow_events (1);
d76f16a63bf2 (sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents: 71773
diff changeset
6283 if ((detect_input_pending_run_timers (1)
71771
c6e0c9217129 (Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents: 71761
diff changeset
6284 && NILP (force) && !redisplay_dont_pause)
71761
1055c0769159 * puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents: 71573
diff changeset
6285 || !NILP (Vexecuting_kbd_macro))
1055c0769159 * puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents: 71573
diff changeset
6286 return Qnil;
1055c0769159 * puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents: 71573
diff changeset
6287
71771
c6e0c9217129 (Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents: 71761
diff changeset
6288 count = SPECPDL_INDEX ();
c6e0c9217129 (Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents: 71761
diff changeset
6289 if (!NILP (force) && !redisplay_dont_pause)
c6e0c9217129 (Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents: 71761
diff changeset
6290 specbind (Qredisplay_dont_pause, Qt);
71761
1055c0769159 * puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents: 71573
diff changeset
6291 redisplay_preserve_echo_area (2);
71771
c6e0c9217129 (Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents: 71761
diff changeset
6292 unbind_to (count, Qnil);
71761
1055c0769159 * puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents: 71573
diff changeset
6293 return Qt;
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6294 }
25012
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
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6297
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6298 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6299 Other Lisp Functions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6300 ***********************************************************************/
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 /* A vector of size >= 2 * NFRAMES + 3 * NBUFFERS + 1, containing the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6303 session's frames, frame names, buffers, buffer-read-only flags, and
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6304 buffer-modified-flags. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6305
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6306 static Lisp_Object frame_and_buffer_state;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6307
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6308
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6309 DEFUN ("frame-or-buffer-changed-p", Fframe_or_buffer_changed_p,
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6310 Sframe_or_buffer_changed_p, 0, 1, 0,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6311 doc: /* Return non-nil if the frame and buffer state appears to have changed.
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6312 VARIABLE is a variable name whose value is either nil or a state vector
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6313 that will be updated to contain all frames and buffers,
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6314 aside from buffers whose names start with space,
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6315 along with the buffers' read-only and modified flags. This allows a fast
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6316 check to see whether buffer menus might need to be recomputed.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6317 If this function returns non-nil, it updates the internal vector to reflect
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6318 the current state.
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6319
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6320 If VARIABLE is nil, an internal variable is used. Users should not
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6321 pass nil for VARIABLE. */)
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6322 (variable)
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6323 Lisp_Object variable;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6324 {
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6325 Lisp_Object state, tail, frame, buf;
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6326 Lisp_Object *vecp, *end;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6327 int n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6328
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6329 if (! NILP (variable))
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6330 {
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6331 CHECK_SYMBOL (variable);
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6332 state = Fsymbol_value (variable);
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6333 if (! VECTORP (state))
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6334 goto changed;
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6335 }
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6336 else
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6337 state = frame_and_buffer_state;
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6338
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6339 vecp = XVECTOR (state)->contents;
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6340 end = vecp + XVECTOR (state)->size;
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6341
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6342 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6343 {
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6344 if (vecp == end)
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6345 goto changed;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6346 if (!EQ (*vecp++, frame))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6347 goto changed;
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6348 if (vecp == end)
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6349 goto changed;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6350 if (!EQ (*vecp++, XFRAME (frame)->name))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6351 goto changed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6352 }
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6353 /* Check that the buffer info matches. */
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
6354 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6355 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
6356 buf = XCDR (XCAR (tail));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6357 /* 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
6358 if (SREF (XBUFFER (buf)->name, 0) == ' ')
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6359 continue;
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6360 if (vecp == end)
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6361 goto changed;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6362 if (!EQ (*vecp++, buf))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6363 goto changed;
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6364 if (vecp == end)
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6365 goto changed;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6366 if (!EQ (*vecp++, XBUFFER (buf)->read_only))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6367 goto changed;
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6368 if (vecp == end)
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6369 goto changed;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6370 if (!EQ (*vecp++, Fbuffer_modified_p (buf)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6371 goto changed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6372 }
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6373 if (vecp == end)
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6374 goto changed;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6375 /* Detect deletion of a buffer at the end of the list. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6376 if (EQ (*vecp, Qlambda))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6377 return Qnil;
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6378
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6379 /* Come here if we decide the data has changed. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6380 changed:
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6381 /* Count the size we will need.
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6382 Start with 1 so there is room for at least one lambda at the end. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6383 n = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6384 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6385 n += 2;
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
6386 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6387 n += 3;
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6388 /* Reallocate the vector if data has grown to need it,
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6389 or if it has shrunk a lot. */
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6390 if (! VECTORP (state)
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6391 || n > XVECTOR (state)->size
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6392 || n + 20 < XVECTOR (state)->size / 2)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6393 /* Add 20 extra so we grow it less often. */
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6394 {
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6395 state = Fmake_vector (make_number (n + 20), Qlambda);
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6396 if (! NILP (variable))
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6397 Fset (variable, state);
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6398 else
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6399 frame_and_buffer_state = state;
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6400 }
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6401
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6402 /* Record the new data in the (possibly reallocated) vector. */
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6403 vecp = XVECTOR (state)->contents;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6404 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6405 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6406 *vecp++ = frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6407 *vecp++ = XFRAME (frame)->name;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6408 }
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
6409 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6410 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
6411 buf = XCDR (XCAR (tail));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6412 /* 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
6413 if (SREF (XBUFFER (buf)->name, 0) == ' ')
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6414 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6415 *vecp++ = buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6416 *vecp++ = XBUFFER (buf)->read_only;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6417 *vecp++ = Fbuffer_modified_p (buf);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6418 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6419 /* Fill up the vector with lambdas (always at least one). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6420 *vecp++ = Qlambda;
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6421 while (vecp - XVECTOR (state)->contents
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6422 < XVECTOR (state)->size)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6423 *vecp++ = Qlambda;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6424 /* Make sure we didn't overflow the vector. */
64776
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6425 if (vecp - XVECTOR (state)->contents
42f593faa113 (Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
6426 > XVECTOR (state)->size)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6427 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6428 return Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6429 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6430
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6431
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6432
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6433 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6434 Initialization
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6435 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6436
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6437 /* Initialization done when Emacs fork is started, before doing stty.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6438 Determine terminal type and set terminal_driver. Then invoke its
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6439 decoding routine to set up variables in the terminal package. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6440
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
6441 void
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6442 init_display ()
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6443 {
53226
dd3018b4785b Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents: 53225
diff changeset
6444 char *terminal_type;
dd3018b4785b Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents: 53225
diff changeset
6445
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6446 #ifdef HAVE_X_WINDOWS
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6447 extern int display_arg;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6448 #endif
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6449
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6450 /* Construct the space glyph. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6451 space_glyph.type = CHAR_GLYPH;
92276
1dc7b04a4d95 (line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents: 91367
diff changeset
6452 SET_CHAR_GLYPH (space_glyph, ' ', DEFAULT_FACE_ID, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6453 space_glyph.charpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6454
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6455 inverse_video = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6456 cursor_in_echo_area = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6457 terminal_type = (char *) 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6458
2339
a302de11debf * dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents: 2292
diff changeset
6459 /* 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
6460 during startup. */
83014
f5cadabb36dd Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents: 83010
diff changeset
6461 Vinitial_window_system = Qnil;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6462
83146
3708519cf113 Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents: 83112
diff changeset
6463 /* SIGWINCH needs to be handled no matter what display we start
3708519cf113 Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents: 83112
diff changeset
6464 with. Otherwise newly opened tty frames will not resize
3708519cf113 Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents: 83112
diff changeset
6465 automatically. */
3708519cf113 Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents: 83112
diff changeset
6466 #ifdef SIGWINCH
3708519cf113 Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents: 83112
diff changeset
6467 #ifndef CANNOT_DUMP
3708519cf113 Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents: 83112
diff changeset
6468 if (initialized)
3708519cf113 Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents: 83112
diff changeset
6469 #endif /* CANNOT_DUMP */
3708519cf113 Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents: 83112
diff changeset
6470 signal (SIGWINCH, window_change_signal);
3708519cf113 Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents: 83112
diff changeset
6471 #endif /* SIGWINCH */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6472
98379
7424f5df0da7 (init_display): Return earlier when running as a
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98327
diff changeset
6473 /* If running as a daemon, no need to initialize any frames/terminal. */
99182
c1511154e8c2 * emacs.c (daemon_pipe): Make non-static.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98589
diff changeset
6474 if (IS_DAEMON)
c1511154e8c2 * emacs.c (daemon_pipe): Make non-static.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98589
diff changeset
6475 return;
98379
7424f5df0da7 (init_display): Return earlier when running as a
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98327
diff changeset
6476
2339
a302de11debf * dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents: 2292
diff changeset
6477 /* 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
6478 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
6479 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
6480 using the window system.
a302de11debf * dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents: 2292
diff changeset
6481
14125
2f222e8b06f5 (init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents: 14068
diff changeset
6482 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
6483 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
6484
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6485 #ifdef HAVE_X_WINDOWS
69952
b9da898695a5 * dispnew.c (init_display): Don't init X display if the user asked
Jan Djärv <jan.h.d@swipnet.se>
parents: 69607
diff changeset
6486 if (! inhibit_window_system && ! display_arg)
2359
90a5f91329f3 * dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents: 2339
diff changeset
6487 {
14125
2f222e8b06f5 (init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents: 14068
diff changeset
6488 char *display;
2f222e8b06f5 (init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents: 14068
diff changeset
6489 display = getenv ("DISPLAY");
2f222e8b06f5 (init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents: 14068
diff changeset
6490 display_arg = (display != 0 && *display != 0);
69607
761eaec1aae4 * dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents: 69110
diff changeset
6491
761eaec1aae4 * dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents: 69110
diff changeset
6492 if (display_arg && !x_display_ok (display))
761eaec1aae4 * dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents: 69110
diff changeset
6493 {
761eaec1aae4 * dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents: 69110
diff changeset
6494 fprintf (stderr, "Display %s unavailable, simulating -nw\n",
761eaec1aae4 * dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents: 69110
diff changeset
6495 display);
761eaec1aae4 * dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents: 69110
diff changeset
6496 inhibit_window_system = 1;
761eaec1aae4 * dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents: 69110
diff changeset
6497 }
2364
9a8a5570e842 Fix typo.
Jim Blandy <jimb@redhat.com>
parents: 2359
diff changeset
6498 }
2359
90a5f91329f3 * dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents: 2339
diff changeset
6499
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6500 if (!inhibit_window_system && display_arg
18774
95b4ac950a5d (init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents: 18015
diff changeset
6501 #ifndef CANNOT_DUMP
95b4ac950a5d (init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents: 18015
diff changeset
6502 && initialized
95b4ac950a5d (init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents: 18015
diff changeset
6503 #endif
95b4ac950a5d (init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents: 18015
diff changeset
6504 )
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6505 {
104077
3abca9a8122f * dispnew.c (init_display): Use Qx, Qw32, and Qns.
Chong Yidong <cyd@stupidchicken.com>
parents: 103052
diff changeset
6506 Vinitial_window_system = Qx;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6507 #ifdef HAVE_X11
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6508 Vwindow_system_version = make_number (11);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6509 #endif
41969
e669966d496e Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents: 41120
diff changeset
6510 #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
6511 /* In some versions of ncurses,
15282
7db3a832db9e Comment fix.
Karl Heuer <kwzh@gnu.org>
parents: 15273
diff changeset
6512 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
6513 So call tgetent. */
db889dd732a1 (init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents: 15078
diff changeset
6514 { char b[2044]; tgetent (b, "xterm");}
db889dd732a1 (init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents: 15078
diff changeset
6515 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6516 adjust_frame_glyphs_initially ();
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6517 return;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6518 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6519 #endif /* HAVE_X_WINDOWS */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6520
13408
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6521 #ifdef HAVE_NTGUI
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6522 if (!inhibit_window_system)
13408
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6523 {
104077
3abca9a8122f * dispnew.c (init_display): Use Qx, Qw32, and Qns.
Chong Yidong <cyd@stupidchicken.com>
parents: 103052
diff changeset
6524 Vinitial_window_system = Qw32;
13408
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6525 Vwindow_system_version = make_number (1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6526 adjust_frame_glyphs_initially ();
13408
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6527 return;
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6528 }
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6529 #endif /* HAVE_NTGUI */
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6530
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96236
diff changeset
6531 #ifdef HAVE_NS
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96236
diff changeset
6532 if (!inhibit_window_system
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96236
diff changeset
6533 #ifndef CANNOT_DUMP
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96236
diff changeset
6534 && initialized
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96236
diff changeset
6535 #endif
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96236
diff changeset
6536 )
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96236
diff changeset
6537 {
104077
3abca9a8122f * dispnew.c (init_display): Use Qx, Qw32, and Qns.
Chong Yidong <cyd@stupidchicken.com>
parents: 103052
diff changeset
6538 Vinitial_window_system = Qns;
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96236
diff changeset
6539 Vwindow_system_version = make_number(10);
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96236
diff changeset
6540 adjust_frame_glyphs_initially ();
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96236
diff changeset
6541 return;
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96236
diff changeset
6542 }
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96236
diff changeset
6543 #endif
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 96236
diff changeset
6544
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6545 /* If no window system has been specified, try to use the terminal. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6546 if (! isatty (0))
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6547 {
16896
b2c51d6de440 (init_display): Use `fatal'.
Richard M. Stallman <rms@gnu.org>
parents: 16891
diff changeset
6548 fatal ("standard input is not a tty");
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6549 exit (1);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6550 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6551
86273
77b991c8303d (init_display) [WINDOWSNT]: Hardcode terminal_type.
Jason Rumney <jasonr@gnu.org>
parents: 85826
diff changeset
6552 #ifdef WINDOWSNT
77b991c8303d (init_display) [WINDOWSNT]: Hardcode terminal_type.
Jason Rumney <jasonr@gnu.org>
parents: 85826
diff changeset
6553 terminal_type = "w32console";
77b991c8303d (init_display) [WINDOWSNT]: Hardcode terminal_type.
Jason Rumney <jasonr@gnu.org>
parents: 85826
diff changeset
6554 #else
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
6555 /* Look at the TERM variable. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6556 terminal_type = (char *) getenv ("TERM");
86273
77b991c8303d (init_display) [WINDOWSNT]: Hardcode terminal_type.
Jason Rumney <jasonr@gnu.org>
parents: 85826
diff changeset
6557 #endif
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6558 if (!terminal_type)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6559 {
71946
db54d1f64f25 Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 71945
diff changeset
6560 #ifdef HAVE_WINDOW_SYSTEM
71945
e89be002734a Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 71944
diff changeset
6561 if (! inhibit_window_system)
e89be002734a Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 71944
diff changeset
6562 fprintf (stderr, "Please set the environment variable DISPLAY or TERM (see `tset').\n");
71944
270a672fc28c (init_display): Mention DISPLAY as well as TERM in err msg.
Richard M. Stallman <rms@gnu.org>
parents: 71831
diff changeset
6563 else
270a672fc28c (init_display): Mention DISPLAY as well as TERM in err msg.
Richard M. Stallman <rms@gnu.org>
parents: 71831
diff changeset
6564 #endif /* HAVE_WINDOW_SYSTEM */
71945
e89be002734a Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 71944
diff changeset
6565 fprintf (stderr, "Please set the environment variable TERM; see `tset'.\n");
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6566 exit (1);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6567 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6568
53341
d4e6a050c9b1 Bugfix festival.
Karoly Lorentey <lorentey@elte.hu>
parents: 53339
diff changeset
6569 {
83431
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6570 struct terminal *t;
83008
040dd41ed7d0 Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83004
diff changeset
6571 struct frame *f = XFRAME (selected_frame);
040dd41ed7d0 Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83004
diff changeset
6572
040dd41ed7d0 Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83004
diff changeset
6573 /* Open a display on the controlling tty. */
83431
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6574 t = init_tty (0, terminal_type, 1); /* Errors are fatal. */
83008
040dd41ed7d0 Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83004
diff changeset
6575
040dd41ed7d0 Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83004
diff changeset
6576 /* Convert the initial frame to use the new display. */
83090
72c2a3eb27da Trivial cosmetic change in dispnew.c.
Karoly Lorentey <lorentey@elte.hu>
parents: 83074
diff changeset
6577 if (f->output_method != output_initial)
83008
040dd41ed7d0 Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83004
diff changeset
6578 abort ();
83431
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6579 f->output_method = t->type;
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6580 f->terminal = t;
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6581
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6582 t->reference_count++;
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6583 t->display_info.tty->top_frame = selected_frame;
83362
c3dd82172ed1 Enforce the presence of `window-system' and `tty-type' frame parameters in all frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
6584 change_frame_size (XFRAME (selected_frame),
83431
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6585 FrameRows (t->display_info.tty),
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6586 FrameCols (t->display_info.tty), 0, 0, 1);
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6587
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6588 /* Delete the initial terminal. */
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6589 if (--initial_terminal->reference_count == 0
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6590 && initial_terminal->delete_terminal_hook)
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6591 (*initial_terminal->delete_terminal_hook) (initial_terminal);
83074
34a7a8f40548 Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents: 83067
diff changeset
6592
34a7a8f40548 Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents: 83067
diff changeset
6593 /* Update frame parameters to reflect the new type. */
34a7a8f40548 Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents: 83067
diff changeset
6594 Fmodify_frame_parameters
34a7a8f40548 Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents: 83067
diff changeset
6595 (selected_frame, Fcons (Fcons (Qtty_type,
83431
76396de7f50a Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents: 83413
diff changeset
6596 Ftty_type (selected_frame)), Qnil));
97867
2aa441279c89 (init_display): Set `tty's association in frame's parameters alist to the name
Eli Zaretskii <eliz@gnu.org>
parents: 97646
diff changeset
6597 if (t->display_info.tty->name)
2aa441279c89 (init_display): Set `tty's association in frame's parameters alist to the name
Eli Zaretskii <eliz@gnu.org>
parents: 97646
diff changeset
6598 Fmodify_frame_parameters (selected_frame,
2aa441279c89 (init_display): Set `tty's association in frame's parameters alist to the name
Eli Zaretskii <eliz@gnu.org>
parents: 97646
diff changeset
6599 Fcons (Fcons (Qtty, build_string (t->display_info.tty->name)),
2aa441279c89 (init_display): Set `tty's association in frame's parameters alist to the name
Eli Zaretskii <eliz@gnu.org>
parents: 97646
diff changeset
6600 Qnil));
2aa441279c89 (init_display): Set `tty's association in frame's parameters alist to the name
Eli Zaretskii <eliz@gnu.org>
parents: 97646
diff changeset
6601 else
2aa441279c89 (init_display): Set `tty's association in frame's parameters alist to the name
Eli Zaretskii <eliz@gnu.org>
parents: 97646
diff changeset
6602 Fmodify_frame_parameters (selected_frame, Fcons (Fcons (Qtty, Qnil),
2aa441279c89 (init_display): Set `tty's association in frame's parameters alist to the name
Eli Zaretskii <eliz@gnu.org>
parents: 97646
diff changeset
6603 Qnil));
53341
d4e6a050c9b1 Bugfix festival.
Karoly Lorentey <lorentey@elte.hu>
parents: 53339
diff changeset
6604 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6605
16891
989845750a4d (init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents: 16881
diff changeset
6606 {
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6607 struct frame *sf = SELECTED_FRAME ();
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
6608 int width = FRAME_TOTAL_COLS (sf);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
6609 int height = FRAME_LINES (sf);
16891
989845750a4d (init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents: 16881
diff changeset
6610
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6611 unsigned int total_glyphs = height * (width + 2) * sizeof (struct glyph);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6612
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6613 /* If these sizes are so big they cause overflow, just ignore the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6614 change. It's not clear what better we could do. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6615 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
6616 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
6617 }
989845750a4d (init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents: 16881
diff changeset
6618
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6619 adjust_frame_glyphs_initially ();
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6620 calculate_costs (XFRAME (selected_frame));
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6621
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6622 /* Set up faces of the initial terminal frame of a dumped Emacs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6623 if (initialized
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6624 && !noninteractive
83014
f5cadabb36dd Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents: 83010
diff changeset
6625 && NILP (Vinitial_window_system))
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26591
diff changeset
6626 {
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26591
diff changeset
6627 /* 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
6628 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
6629 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
6630
26902
264b83a3a688 Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents: 26851
diff changeset
6631 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
6632 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
6633 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
6634 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6635 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6636
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6637
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6638
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6639 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6640 Blinking cursor
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6641 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6642
26280
083835afced5 (Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents: 26164
diff changeset
6643 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
6644 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
6645 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
6646 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
6647 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
6648 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
6649 (window, show)
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6650 Lisp_Object window, show;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6651 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6652 /* Don't change cursor state while redisplaying. This could confuse
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6653 output routines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6654 if (!redisplaying_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6655 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6656 if (NILP (window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6657 window = selected_window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6658 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40512
diff changeset
6659 CHECK_WINDOW (window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6660
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6661 XWINDOW (window)->cursor_off_p = NILP (show);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6662 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6663
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6664 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6665 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6666
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6667
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6668 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
6669 Sinternal_show_cursor_p, 0, 1, 0,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6670 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
6671 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
6672 (window)
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6673 Lisp_Object window;
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6674 {
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6675 struct window *w;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6676
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6677 if (NILP (window))
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6678 window = selected_window;
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6679 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40512
diff changeset
6680 CHECK_WINDOW (window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6681
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6682 w = XWINDOW (window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6683 return w->cursor_off_p ? Qnil : Qt;
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6684 }
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6685
95590
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
6686 DEFUN ("last-nonminibuffer-frame", Flast_nonminibuf_frame,
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
6687 Slast_nonminibuf_frame, 0, 0, 0,
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
6688 doc: /* Value is last nonminibuffer frame. */)
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
6689 ()
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
6690 {
95639
2c12b44a3dfc (Flast_nonminibuf_frame): Handle the NULL case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
6691 Lisp_Object frame = Qnil;
2c12b44a3dfc (Flast_nonminibuf_frame): Handle the NULL case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
6692
2c12b44a3dfc (Flast_nonminibuf_frame): Handle the NULL case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
6693 if (last_nonminibuf_frame)
2c12b44a3dfc (Flast_nonminibuf_frame): Handle the NULL case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
6694 XSETFRAME (frame, last_nonminibuf_frame);
95590
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
6695
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
6696 return frame;
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
6697 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6698
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6699 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6700 Initialization
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6701 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6702
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
6703 void
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6704 syms_of_display ()
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6705 {
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
6706 defsubr (&Sredraw_frame);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6707 defsubr (&Sredraw_display);
7810
15c0bf73737e (Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7808
diff changeset
6708 defsubr (&Sframe_or_buffer_changed_p);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6709 defsubr (&Sopen_termscript);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6710 defsubr (&Sding);
71761
1055c0769159 * puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents: 71573
diff changeset
6711 defsubr (&Sredisplay);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6712 defsubr (&Ssleep_for);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6713 defsubr (&Ssend_string_to_terminal);
26280
083835afced5 (Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents: 26164
diff changeset
6714 defsubr (&Sinternal_show_cursor);
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6715 defsubr (&Sinternal_show_cursor_p);
95590
9a4b27c8feec * window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
6716 defsubr (&Slast_nonminibuf_frame);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6717
34893
779bd3fa820e Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents: 34866
diff changeset
6718 #if GLYPH_DEBUG
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
6719 defsubr (&Sdump_redisplay_history);
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
6720 #endif
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
6721
12186
6811992e871c (Fframe_or_buffer_changed_p): Calculate vector size right.
Karl Heuer <kwzh@gnu.org>
parents: 11919
diff changeset
6722 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
6723 staticpro (&frame_and_buffer_state);
15c0bf73737e (Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7808
diff changeset
6724
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6725 Qdisplay_table = intern_c_string ("display-table");
13220
2e9014617492 (Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13105
diff changeset
6726 staticpro (&Qdisplay_table);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6727 Qredisplay_dont_pause = intern_c_string ("redisplay-dont-pause");
30720
64f3338f72d8 (Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30713
diff changeset
6728 staticpro (&Qredisplay_dont_pause);
13220
2e9014617492 (Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13105
diff changeset
6729
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6730 DEFVAR_INT ("baud-rate", &baud_rate,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6731 doc: /* *The output baud rate of the terminal.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6732 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
6733 and the other strategic decisions made during redisplay. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6734
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6735 DEFVAR_BOOL ("inverse-video", &inverse_video,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6736 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
6737 This means everything is in inverse video which otherwise would not be. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6738
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6739 DEFVAR_BOOL ("visible-bell", &visible_bell,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6740 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
6741
bee6cc2e8a90 (syms_of_display) <visible-bell>: Add a reference to
Eli Zaretskii <eliz@gnu.org>
parents: 40271
diff changeset
6742 See also `ring-bell-function'. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6743
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6744 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
6745 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
6746 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
6747 Emacs's frame display when you reenter Emacs.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6748 It is up to you to set this variable if your terminal can do that. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6749
83014
f5cadabb36dd Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents: 83010
diff changeset
6750 DEFVAR_LISP ("initial-window-system", &Vinitial_window_system,
f5cadabb36dd Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents: 83010
diff changeset
6751 doc: /* Name of the window system that Emacs uses for the first frame.
41025
4feeae90afa4 (syms_of_display): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 40979
diff changeset
6752 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
6753 The value is nil if Emacs is using a text-only terminal. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6754
85614
9f3a25157e4f Make `window-system' into a keyboard-local variable (rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85252
diff changeset
6755 DEFVAR_KBOARD ("window-system", Vwindow_system,
9f3a25157e4f Make `window-system' into a keyboard-local variable (rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85252
diff changeset
6756 doc: /* Name of window system through which the selected frame is displayed.
9f3a25157e4f Make `window-system' into a keyboard-local variable (rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85252
diff changeset
6757 The value is a symbol--for instance, `x' for X windows.
9f3a25157e4f Make `window-system' into a keyboard-local variable (rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85252
diff changeset
6758 The value is nil if the selected frame is on a text-only-terminal. */);
9f3a25157e4f Make `window-system' into a keyboard-local variable (rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85252
diff changeset
6759
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6760 DEFVAR_LISP ("window-system-version", &Vwindow_system_version,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6761 doc: /* The version number of the window system in use.
85826
345d3b46b5d3 * s/usg5-4.h:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85614
diff changeset
6762 For X windows, this is 11. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6763
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6764 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
6765 doc: /* Non-nil means put cursor in minibuffer, at end of any message there. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6766
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6767 DEFVAR_LISP ("glyph-table", &Vglyph_table,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6768 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
6769 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
6770 Each element can be:
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6771 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
6772 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
6773 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
6774 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
6775 while outputting it. */);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6776 Vglyph_table = Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6777
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6778 DEFVAR_LISP ("standard-display-table", &Vstandard_display_table,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6779 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
6780 See `buffer-display-table' for more information. */);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6781 Vstandard_display_table = Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6782
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6783 DEFVAR_BOOL ("redisplay-dont-pause", &redisplay_dont_pause,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6784 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
6785 redisplay_dont_pause = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6786
71323
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
6787 #if PERIODIC_PREEMPTION_CHECKING
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
6788 DEFVAR_LISP ("redisplay-preemption-period", &Vredisplay_preemption_period,
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
6789 doc: /* *The period in seconds between checking for input during redisplay.
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
6790 If input is detected, redisplay is pre-empted, and the input is processed.
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
6791 If nil, never pre-empt redisplay. */);
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
6792 Vredisplay_preemption_period = make_float (0.10);
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
6793 #endif
e882f189c3af Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents: 71211
diff changeset
6794
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6795 #ifdef CANNOT_DUMP
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6796 if (noninteractive)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6797 #endif
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6798 {
83014
f5cadabb36dd Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents: 83010
diff changeset
6799 Vinitial_window_system = Qnil;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6800 Vwindow_system_version = Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6801 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6802 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52377
diff changeset
6803
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52377
diff changeset
6804 /* arch-tag: 8d812b1f-04a2-4195-a9c4-381f8457a413
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52377
diff changeset
6805 (do not change this comment) */