Mercurial > emacs
annotate src/dispnew.c @ 109973:08e939f21918
merge trunk
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Wed, 25 Aug 2010 12:49:02 +0900 |
parents | c2d849aa4021 |
children | 9fa0b071facc |
rev | line source |
---|---|
314 | 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 | 4 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
314 | 5 |
6 This file is part of GNU Emacs. | |
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 | 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 | 12 |
13 GNU Emacs is distributed in the hope that it will be useful, | |
14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 GNU General Public License for more details. | |
17 | |
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 | 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 | 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 | 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 | 26 |
21514 | 27 #ifdef HAVE_UNISTD_H |
28 #include <unistd.h> | |
29 #endif | |
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 | 32 #include "termchar.h" |
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 | 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 | 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 | 42 #include "window.h" |
43 #include "commands.h" | |
44 #include "disptab.h" | |
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 | 47 #include "blockinput.h" |
21514 | 48 #include "process.h" |
314 | 49 |
12917 | 50 #include "syssignal.h" |
554 | 51 |
314 | 52 #ifdef HAVE_X_WINDOWS |
53 #include "xterm.h" | |
25012 | 54 #endif /* HAVE_X_WINDOWS */ |
314 | 55 |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
56 #ifdef HAVE_NTGUI |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
57 #include "w32term.h" |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
58 #endif /* HAVE_NTGUI */ |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
59 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
60 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
61 #include "nsterm.h" |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
62 #endif |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
63 |
25012 | 64 /* Include systime.h after xterm.h to avoid double inclusion of time.h. */ |
65 | |
7808
52e2eb6245d4
Include systime.h after xterm.h.
Richard M. Stallman <rms@gnu.org>
parents:
7648
diff
changeset
|
66 #include "systime.h" |
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
67 #include <errno.h> |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
68 |
314 | 69 /* Get number of chars of output now in the buffer of a stdio stream. |
25012 | 70 This ought to be built in in stdio, but it isn't. Some s- files |
71 override this because their stdio internals differ. */ | |
72 | |
5214
c4bf07b226be
(PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents:
5083
diff
changeset
|
73 #ifdef __GNU_LIBRARY__ |
25012 | 74 |
75 /* The s- file might have overridden the definition with one that | |
76 works for the system's C library. But we are using the GNU C | |
77 library, so this is the right definition for every system. */ | |
78 | |
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
79 #ifdef GNU_LIBRARY_PENDING_OUTPUT_COUNT |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
80 #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
|
81 #else |
7443
a9cb818e5316
[__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents:
7247
diff
changeset
|
82 #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
|
83 #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
|
84 #endif |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
85 #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
|
86 #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
|
87 #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
|
88 #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
|
89 #endif |
7443
a9cb818e5316
[__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents:
7247
diff
changeset
|
90 #ifndef PENDING_OUTPUT_COUNT |
314 | 91 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base) |
92 #endif | |
25012 | 93 #endif /* not __GNU_LIBRARY__ */ |
94 | |
41969
e669966d496e
Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents:
41120
diff
changeset
|
95 #if defined(HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES) |
29437 | 96 #include <term.h> /* for tgetent */ |
97 #endif | |
25012 | 98 |
99 /* Structure to pass dimensions around. Used for character bounding | |
100 boxes, glyph matrix dimensions and alike. */ | |
101 | |
102 struct dim | |
103 { | |
104 int width; | |
105 int height; | |
106 }; | |
107 | |
108 | |
109 /* Function prototypes. */ | |
110 | |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
111 static struct glyph_matrix *save_current_matrix (struct frame *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
112 static void restore_current_matrix (struct frame *, struct glyph_matrix *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
113 static int showing_window_margins_p (struct window *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
114 static void fake_current_matrices (Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
115 static void redraw_overlapping_rows (struct window *, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
116 static void redraw_overlapped_rows (struct window *, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
117 static int count_blanks (struct glyph *, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
118 static int count_match (struct glyph *, struct glyph *, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
119 struct glyph *, struct glyph *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
120 static unsigned line_draw_cost (struct glyph_matrix *, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
121 static void update_frame_line (struct frame *, int); |
25012 | 122 static struct dim allocate_matrices_for_frame_redisplay |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
123 (Lisp_Object, int, int, int, int *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
124 static void allocate_matrices_for_window_redisplay (struct window *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
125 static int realloc_glyph_pool (struct glyph_pool *, struct dim); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
126 static void adjust_frame_glyphs (struct frame *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
127 struct glyph_matrix *new_glyph_matrix (struct glyph_pool *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
128 static void free_glyph_matrix (struct glyph_matrix *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
129 static void adjust_glyph_matrix (struct window *, struct glyph_matrix *, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
130 int, int, struct dim); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
131 static void change_frame_size_1 (struct frame *, int, int, int, int, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
132 static void swap_glyph_pointers (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
|
133 #if GLYPH_DEBUG |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
134 static int glyph_row_slice_p (struct glyph_row *, struct glyph_row *); |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
135 #endif |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
136 static void fill_up_frame_row_with_spaces (struct glyph_row *, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
137 static void build_frame_matrix_from_window_tree (struct glyph_matrix *, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
138 struct window *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
139 static void build_frame_matrix_from_leaf_window (struct glyph_matrix *, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
140 struct window *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
141 static struct glyph_pool *new_glyph_pool (void); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
142 static void free_glyph_pool (struct glyph_pool *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
143 static void adjust_frame_glyphs_initially (void); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
144 static void adjust_frame_message_buffer (struct frame *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
145 static void adjust_decode_mode_spec_buffer (struct frame *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
146 static void fill_up_glyph_row_with_spaces (struct glyph_row *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
147 static void build_frame_matrix (struct frame *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
148 void clear_current_matrices (struct frame *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
149 void scroll_glyph_matrix_range (struct glyph_matrix *, int, int, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
150 int, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
151 static void clear_window_matrices (struct window *, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
152 static void fill_up_glyph_row_area_with_spaces (struct glyph_row *, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
153 static int scrolling_window (struct window *, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
154 static int update_window_line (struct window *, int, int *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
155 static void update_marginal_area (struct window *, int, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
156 static int update_text_area (struct window *, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
157 static void make_current (struct glyph_matrix *, struct glyph_matrix *, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
158 int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
159 static void mirror_make_current (struct window *, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
160 void check_window_matrix_pointers (struct window *); |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
161 #if GLYPH_DEBUG |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
162 static void check_matrix_pointers (struct glyph_matrix *, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
163 struct glyph_matrix *); |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
164 #endif |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
165 static void mirror_line_dance (struct window *, int, int, int *, char *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
166 static int update_window_tree (struct window *, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
167 static int update_window (struct window *, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
168 static int update_frame_1 (struct frame *, int, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
169 static void set_window_cursor_after_update (struct window *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
170 static int row_equal_p (struct window *, struct glyph_row *, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
171 struct glyph_row *, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
172 static void adjust_frame_glyphs_for_window_redisplay (struct frame *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
173 static void adjust_frame_glyphs_for_frame_redisplay (struct frame *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
174 static void reverse_rows (struct glyph_matrix *, int, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
175 static int margin_glyphs_to_reserve (struct window *, int, Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
176 static void sync_window_with_frame_matrix_rows (struct window *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
177 struct window *frame_row_to_window (struct window *, int); |
25012 | 178 |
179 | |
180 /* Non-zero means don't pause redisplay for pending input. (This is | |
181 for debugging and for a future implementation of EDT-like | |
182 scrolling. */ | |
183 | |
184 int redisplay_dont_pause; | |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
185 |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
186 /* 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
|
187 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
|
188 regular intervals. */ |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
189 #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
|
190 #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
|
191 #else |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
192 #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
|
193 #endif |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
194 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
195 #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
|
196 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
197 /* 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
|
198 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
199 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
|
200 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
201 /* 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
|
202 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
203 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
|
204 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
|
205 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
206 #endif |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
207 |
554 | 208 /* Nonzero upon entry to redisplay means do not assume anything about |
764 | 209 current contents of actual terminal frame; clear and redraw it. */ |
314 | 210 |
764 | 211 int frame_garbaged; |
314 | 212 |
25012 | 213 /* Nonzero means last display completed. Zero means it was preempted. */ |
314 | 214 |
215 int display_completed; | |
216 | |
25012 | 217 /* Lisp variable visible-bell; enables use of screen-flash instead of |
218 audible bell. */ | |
314 | 219 |
220 int visible_bell; | |
221 | |
764 | 222 /* Invert the color of the whole frame, at a low level. */ |
314 | 223 |
224 int inverse_video; | |
225 | |
226 /* Line speed of the terminal. */ | |
227 | |
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
|
228 EMACS_INT baud_rate; |
314 | 229 |
25012 | 230 /* 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
|
231 creates the first frame. */ |
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
232 |
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
233 Lisp_Object Vinitial_window_system; |
314 | 234 |
235 /* Version number of X windows: 10, 11 or nil. */ | |
25012 | 236 |
314 | 237 Lisp_Object Vwindow_system_version; |
238 | |
25012 | 239 /* Vector of glyph definitions. Indexed by glyph number, the contents |
240 are a string which is how to output the glyph. | |
314 | 241 |
242 If Vglyph_table is nil, a glyph is output by using its low 8 bits | |
25012 | 243 as a character code. |
244 | |
245 This is an obsolete feature that is no longer used. The variable | |
246 is retained for compatibility. */ | |
314 | 247 |
248 Lisp_Object Vglyph_table; | |
249 | |
250 /* Display table to use for vectors that don't specify their own. */ | |
251 | |
252 Lisp_Object Vstandard_display_table; | |
253 | |
25012 | 254 /* 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
|
255 cursor on mini-buffer after the prompt. Positive means at end of |
25012 | 256 text in echo area; negative means at beginning of line. */ |
257 | |
314 | 258 int cursor_in_echo_area; |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
259 |
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
260 Lisp_Object Qdisplay_table, Qredisplay_dont_pause; |
25012 | 261 |
314 | 262 |
25012 | 263 /* 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
|
264 variable always equals the_only_frame. */ |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
265 |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
266 Lisp_Object selected_frame; |
25012 | 267 |
268 /* A frame which is not just a mini-buffer, or 0 if there are no such | |
764 | 269 frames. This is usually the most recent such frame that was |
9572 | 270 selected. In a single-frame version, this variable always holds |
271 the address of the_only_frame. */ | |
25012 | 272 |
273 struct frame *last_nonminibuf_frame; | |
274 | |
275 /* 1 means SIGWINCH happened when not safe. */ | |
276 | |
277 int delayed_size_change; | |
278 | |
279 /* 1 means glyph initialization has been completed at startup. */ | |
280 | |
281 static int glyphs_initialized_initially_p; | |
282 | |
283 /* Updated window if != 0. Set by update_window. */ | |
284 | |
285 struct window *updated_window; | |
286 | |
287 /* Glyph row updated in update_window_line, and area that is updated. */ | |
288 | |
289 struct glyph_row *updated_row; | |
290 int updated_area; | |
291 | |
292 /* A glyph for a space. */ | |
293 | |
294 struct glyph space_glyph; | |
295 | |
296 /* Counts of allocated structures. These counts serve to diagnose | |
297 memory leaks and double frees. */ | |
298 | |
299 int glyph_matrix_count; | |
300 int glyph_pool_count; | |
301 | |
302 /* If non-null, the frame whose frame matrices are manipulated. If | |
303 null, window matrices are worked on. */ | |
304 | |
305 static struct frame *frame_matrix_frame; | |
306 | |
307 /* Non-zero means that fonts have been loaded since the last glyph | |
308 matrix adjustments. Redisplay must stop, and glyph matrices must | |
309 be adjusted when this flag becomes non-zero during display. The | |
310 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
|
311 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
|
312 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
|
313 variable-width fonts. */ |
25012 | 314 |
315 int fonts_changed_p; | |
316 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
317 /* Convert vpos and hpos from frame to window and vice versa. |
25012 | 318 This may only be used for terminal frames. */ |
319 | |
320 #if GLYPH_DEBUG | |
321 | |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
322 static int window_to_frame_vpos (struct window *, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
323 static int window_to_frame_hpos (struct window *, int); |
25012 | 324 #define WINDOW_TO_FRAME_VPOS(W, VPOS) window_to_frame_vpos ((W), (VPOS)) |
325 #define WINDOW_TO_FRAME_HPOS(W, HPOS) window_to_frame_hpos ((W), (HPOS)) | |
326 | |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
327 /* 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
|
328 information. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
329 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
330 struct redisplay_history |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
331 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
332 char trace[512 + 100]; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
333 }; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
334 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
335 /* The size of the history buffer. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
336 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
337 #define REDISPLAY_HISTORY_SIZE 30 |
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 /* The redisplay history buffer. */ |
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 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
|
342 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
343 /* Next free entry in redisplay_history. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
344 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
345 static int history_idx; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
346 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
347 /* 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
|
348 history. */ |
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 unsigned history_tick; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
351 |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
352 static void add_frame_display_history (struct frame *, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108909
diff
changeset
|
353 static void add_window_display_history (struct window *, char *, int); |
71141 | 354 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
355 /* 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
|
356 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
|
357 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
|
358 has been interrupted for pending input. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
359 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
360 static void |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
361 add_window_display_history (w, msg, paused_p) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
362 struct window *w; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
363 char *msg; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
364 int paused_p; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
365 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
366 char *buf; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
367 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
368 if (history_idx >= REDISPLAY_HISTORY_SIZE) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
369 history_idx = 0; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
370 buf = redisplay_history[history_idx].trace; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
371 ++history_idx; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
372 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
373 sprintf (buf, "%d: window %p (`%s')%s\n", |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
374 history_tick++, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
375 w, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
376 ((BUFFERP (w->buffer) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
377 && 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
|
378 ? (char *) SDATA (XBUFFER (w->buffer)->name) |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
379 : "???"), |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
380 paused_p ? " ***paused***" : ""); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
381 strcat (buf, msg); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
382 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
383 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
384 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
385 /* 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
|
386 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
|
387 pending input. */ |
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 static void |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
390 add_frame_display_history (f, paused_p) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
391 struct frame *f; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
392 int paused_p; |
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 char *buf; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
395 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
396 if (history_idx >= REDISPLAY_HISTORY_SIZE) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
397 history_idx = 0; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
398 buf = redisplay_history[history_idx].trace; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
399 ++history_idx; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
400 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
401 sprintf (buf, "%d: update frame %p%s", |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
402 history_tick++, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
403 f, paused_p ? " ***paused***" : ""); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
404 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
405 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
406 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
407 DEFUN ("dump-redisplay-history", Fdump_redisplay_history, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
408 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
|
409 doc: /* Dump redisplay history to stderr. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
410 (void) |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
411 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
412 int i; |
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 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
|
415 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
416 if (i < 0) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
417 i = REDISPLAY_HISTORY_SIZE - 1; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
418 fprintf (stderr, "%s\n", redisplay_history[i].trace); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
419 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
420 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
421 return Qnil; |
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 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
424 |
25012 | 425 #else /* GLYPH_DEBUG == 0 */ |
426 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
427 #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
|
428 #define WINDOW_TO_FRAME_HPOS(W, HPOS) ((HPOS) + WINDOW_LEFT_EDGE_COL (W)) |
25012 | 429 |
430 #endif /* GLYPH_DEBUG == 0 */ | |
431 | |
432 | |
109539
d962ccf8829f
Use __executable_start to find start of text segment for profiling
Andreas Schwab <schwab@linux-m68k.org>
parents:
109360
diff
changeset
|
433 #if defined PROFILING && !HAVE___EXECUTABLE_START |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
434 /* FIXME: only used to find text start for profiling. */ |
314 | 435 |
436 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
437 safe_bcopy (const char *from, char *to, int size) |
314 | 438 { |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
439 abort (); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
440 } |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
441 #endif |
25012 | 442 |
443 /*********************************************************************** | |
444 Glyph Matrices | |
445 ***********************************************************************/ | |
446 | |
447 /* Allocate and return a glyph_matrix structure. POOL is the glyph | |
448 pool from which memory for the matrix should be allocated, or null | |
449 for window-based redisplay where no glyph pools are used. The | |
450 member `pool' of the glyph matrix structure returned is set to | |
451 POOL, the structure is otherwise zeroed. */ | |
452 | |
453 struct glyph_matrix * | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
454 new_glyph_matrix (struct glyph_pool *pool) |
25012 | 455 { |
456 struct glyph_matrix *result; | |
457 | |
458 /* Allocate and clear. */ | |
459 result = (struct glyph_matrix *) xmalloc (sizeof *result); | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
460 memset (result, 0, sizeof *result); |
25012 | 461 |
462 /* Increment number of allocated matrices. This count is used | |
463 to detect memory leaks. */ | |
464 ++glyph_matrix_count; | |
465 | |
466 /* Set pool and return. */ | |
467 result->pool = pool; | |
468 return result; | |
469 } | |
470 | |
471 | |
472 /* Free glyph matrix MATRIX. Passing in a null MATRIX is allowed. | |
473 | |
474 The global counter glyph_matrix_count is decremented when a matrix | |
475 is freed. If the count gets negative, more structures were freed | |
476 than allocated, i.e. one matrix was freed more than once or a bogus | |
477 pointer was passed to this function. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
478 |
25012 | 479 If MATRIX->pool is null, this means that the matrix manages its own |
480 glyph memory---this is done for matrices on X frames. Freeing the | |
481 matrix also frees the glyph memory in this case. */ | |
482 | |
483 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
484 free_glyph_matrix (struct glyph_matrix *matrix) |
25012 | 485 { |
486 if (matrix) | |
487 { | |
488 int i; | |
489 | |
490 /* Detect the case that more matrices are freed than were | |
491 allocated. */ | |
492 if (--glyph_matrix_count < 0) | |
493 abort (); | |
494 | |
495 /* Free glyph memory if MATRIX owns it. */ | |
496 if (matrix->pool == NULL) | |
497 for (i = 0; i < matrix->rows_allocated; ++i) | |
498 xfree (matrix->rows[i].glyphs[LEFT_MARGIN_AREA]); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
499 |
25012 | 500 /* Free row structures and the matrix itself. */ |
501 xfree (matrix->rows); | |
502 xfree (matrix); | |
503 } | |
504 } | |
505 | |
506 | |
507 /* Return the number of glyphs to reserve for a marginal area of | |
508 window W. TOTAL_GLYPHS is the number of glyphs in a complete | |
509 display line of window W. MARGIN gives the width of the marginal | |
510 area in canonical character units. MARGIN should be an integer | |
511 or a float. */ | |
512 | |
513 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
514 margin_glyphs_to_reserve (struct window *w, int total_glyphs, Lisp_Object margin) |
25012 | 515 { |
516 int n; | |
517 | |
518 if (NUMBERP (margin)) | |
519 { | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
520 int width = XFASTINT (w->total_cols); |
25012 | 521 double d = max (0, XFLOATINT (margin)); |
522 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
|
523 n = (int) ((double) total_glyphs / width * d); |
25012 | 524 } |
525 else | |
526 n = 0; | |
527 | |
528 return n; | |
529 } | |
530 | |
531 | |
532 /* Adjust glyph matrix MATRIX on window W or on a frame to changed | |
533 window sizes. | |
534 | |
535 W is null if the function is called for a frame glyph matrix. | |
536 Otherwise it is the window MATRIX is a member of. X and Y are the | |
537 indices of the first column and row of MATRIX within the frame | |
538 matrix, if such a matrix exists. They are zero for purely | |
539 window-based redisplay. DIM is the needed size of the matrix. | |
540 | |
541 In window-based redisplay, where no frame matrices exist, glyph | |
542 matrices manage their own glyph storage. Otherwise, they allocate | |
543 storage from a common frame glyph pool which can be found in | |
544 MATRIX->pool. | |
545 | |
546 The reason for this memory management strategy is to avoid complete | |
547 frame redraws if possible. When we allocate from a common pool, a | |
548 change of the location or size of a sub-matrix within the pool | |
549 requires a complete redisplay of the frame because we cannot easily | |
550 make sure that the current matrices of all windows still agree with | |
551 what is displayed on the screen. While this is usually fast, it | |
552 leads to screen flickering. */ | |
553 | |
554 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
555 adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y, struct dim dim) |
25012 | 556 { |
557 int i; | |
558 int new_rows; | |
559 int marginal_areas_changed_p = 0; | |
25546 | 560 int header_line_changed_p = 0; |
561 int header_line_p = 0; | |
25012 | 562 int left = -1, right = -1; |
80274
b818bce5757f
(adjust_glyph_matrix): Initialize window_height.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
563 int window_width = -1, window_height = -1; |
25012 | 564 |
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
565 /* 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
|
566 Get W's size. */ |
25012 | 567 if (w) |
568 { | |
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
569 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
|
570 |
25546 | 571 header_line_p = WINDOW_WANTS_HEADER_LINE_P (w); |
572 header_line_changed_p = header_line_p != matrix->header_line_p; | |
25012 | 573 } |
25546 | 574 matrix->header_line_p = header_line_p; |
25012 | 575 |
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
576 /* 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
|
577 Do nothing if MATRIX' size, position, vscroll, and marginal areas |
25012 | 578 haven't changed. This optimization is important because preserving |
579 the matrix means preventing redisplay. */ | |
580 if (matrix->pool == NULL) | |
581 { | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
582 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
|
583 right = margin_glyphs_to_reserve (w, dim.width, w->right_margin_cols); |
25012 | 584 xassert (left >= 0 && right >= 0); |
585 marginal_areas_changed_p = (left != matrix->left_margin_glyphs | |
586 || right != matrix->right_margin_glyphs); | |
587 | |
588 if (!marginal_areas_changed_p | |
589 && !fonts_changed_p | |
25546 | 590 && !header_line_changed_p |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
591 && 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
|
592 && matrix->window_top_line == WINDOW_TOP_EDGE_LINE (w) |
25012 | 593 && matrix->window_height == window_height |
594 && matrix->window_vscroll == w->vscroll | |
595 && matrix->window_width == window_width) | |
596 return; | |
597 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
598 |
25012 | 599 /* Enlarge MATRIX->rows if necessary. New rows are cleared. */ |
600 if (matrix->rows_allocated < dim.height) | |
601 { | |
602 int size = dim.height * sizeof (struct glyph_row); | |
603 new_rows = dim.height - matrix->rows_allocated; | |
604 matrix->rows = (struct glyph_row *) xrealloc (matrix->rows, size); | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
605 memset (matrix->rows + matrix->rows_allocated, 0, |
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
606 new_rows * sizeof *matrix->rows); |
25012 | 607 matrix->rows_allocated = dim.height; |
608 } | |
609 else | |
610 new_rows = 0; | |
611 | |
612 /* If POOL is not null, MATRIX is a frame matrix or a window matrix | |
613 on a frame not using window-based redisplay. Set up pointers for | |
614 each row into the glyph pool. */ | |
615 if (matrix->pool) | |
616 { | |
617 xassert (matrix->pool->glyphs); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
618 |
25012 | 619 if (w) |
620 { | |
621 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
|
622 w->left_margin_cols); |
25012 | 623 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
|
624 w->right_margin_cols); |
25012 | 625 } |
626 else | |
627 left = right = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
628 |
25012 | 629 for (i = 0; i < dim.height; ++i) |
630 { | |
631 struct glyph_row *row = &matrix->rows[i]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
632 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
633 row->glyphs[LEFT_MARGIN_AREA] |
25012 | 634 = (matrix->pool->glyphs |
635 + (y + i) * matrix->pool->ncolumns | |
636 + x); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
637 |
25012 | 638 if (w == NULL |
639 || row == matrix->rows + dim.height - 1 | |
25546 | 640 || (row == matrix->rows && matrix->header_line_p)) |
25012 | 641 { |
642 row->glyphs[TEXT_AREA] | |
643 = row->glyphs[LEFT_MARGIN_AREA]; | |
644 row->glyphs[RIGHT_MARGIN_AREA] | |
645 = row->glyphs[TEXT_AREA] + dim.width; | |
646 row->glyphs[LAST_AREA] | |
647 = row->glyphs[RIGHT_MARGIN_AREA]; | |
648 } | |
649 else | |
650 { | |
651 row->glyphs[TEXT_AREA] | |
652 = row->glyphs[LEFT_MARGIN_AREA] + left; | |
653 row->glyphs[RIGHT_MARGIN_AREA] | |
654 = row->glyphs[TEXT_AREA] + dim.width - left - right; | |
655 row->glyphs[LAST_AREA] | |
656 = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | |
657 } | |
658 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
659 |
25012 | 660 matrix->left_margin_glyphs = left; |
661 matrix->right_margin_glyphs = right; | |
662 } | |
663 else | |
664 { | |
665 /* 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
|
666 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
|
667 Allocate glyph memory from the heap. */ |
25012 | 668 if (dim.width > matrix->matrix_w |
669 || new_rows | |
25546 | 670 || header_line_changed_p |
25012 | 671 || marginal_areas_changed_p) |
672 { | |
673 struct glyph_row *row = matrix->rows; | |
674 struct glyph_row *end = row + matrix->rows_allocated; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
675 |
25012 | 676 while (row < end) |
677 { | |
678 row->glyphs[LEFT_MARGIN_AREA] | |
679 = (struct glyph *) xrealloc (row->glyphs[LEFT_MARGIN_AREA], | |
680 (dim.width | |
681 * sizeof (struct glyph))); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
682 |
25012 | 683 /* The mode line never has marginal areas. */ |
684 if (row == matrix->rows + dim.height - 1 | |
25546 | 685 || (row == matrix->rows && matrix->header_line_p)) |
25012 | 686 { |
687 row->glyphs[TEXT_AREA] | |
688 = row->glyphs[LEFT_MARGIN_AREA]; | |
689 row->glyphs[RIGHT_MARGIN_AREA] | |
690 = row->glyphs[TEXT_AREA] + dim.width; | |
691 row->glyphs[LAST_AREA] | |
692 = row->glyphs[RIGHT_MARGIN_AREA]; | |
693 } | |
694 else | |
695 { | |
696 row->glyphs[TEXT_AREA] | |
697 = row->glyphs[LEFT_MARGIN_AREA] + left; | |
698 row->glyphs[RIGHT_MARGIN_AREA] | |
699 = row->glyphs[TEXT_AREA] + dim.width - left - right; | |
700 row->glyphs[LAST_AREA] | |
701 = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | |
702 } | |
703 ++row; | |
704 } | |
705 } | |
706 | |
707 xassert (left >= 0 && right >= 0); | |
708 matrix->left_margin_glyphs = left; | |
709 matrix->right_margin_glyphs = right; | |
710 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
711 |
25012 | 712 /* Number of rows to be used by MATRIX. */ |
713 matrix->nrows = dim.height; | |
31932
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
714 xassert (matrix->nrows >= 0); |
25012 | 715 |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
716 if (w) |
25012 | 717 { |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
718 if (matrix == w->current_matrix) |
25012 | 719 { |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
720 /* 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
|
721 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
|
722 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
|
723 building desired matrices when this function runs. */ |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
724 if (window_width < 0) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
725 window_width = window_box_width (w, -1); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
726 |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
727 /* 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
|
728 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
|
729 of the window. */ |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
730 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
|
731 && !header_line_changed_p |
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
732 && new_rows == 0 |
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
733 && dim.width == matrix->matrix_w |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
734 && 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
|
735 && 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
|
736 && matrix->window_width == window_width) |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
737 { |
38528
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
738 /* Find the last row in the window. */ |
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
739 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
|
740 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
|
741 { |
38748
bb32ae33769e
(adjust_glyph_matrix): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
38734
diff
changeset
|
742 ++i; |
38528
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
743 break; |
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
744 } |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
745 |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
746 /* 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
|
747 are invalidated below. */ |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
748 if (INTEGERP (w->window_end_vpos) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
749 && XFASTINT (w->window_end_vpos) >= i) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
750 w->window_end_valid = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
751 |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
752 while (i < matrix->nrows) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
753 matrix->rows[i++].enabled_p = 0; |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
754 } |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
755 else |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
756 { |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
757 for (i = 0; i < matrix->nrows; ++i) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
758 matrix->rows[i].enabled_p = 0; |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
759 } |
25012 | 760 } |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
761 else if (matrix == w->desired_matrix) |
25012 | 762 { |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
763 /* 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
|
764 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
|
765 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
|
766 redisplays. */ |
25012 | 767 for (i = 0; i < matrix->nrows; ++i) |
768 matrix->rows[i].enabled_p = 0; | |
769 } | |
770 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
771 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
772 |
25012 | 773 /* Remember last values to be able to optimize frame redraws. */ |
774 matrix->matrix_x = x; | |
775 matrix->matrix_y = y; | |
776 matrix->matrix_w = dim.width; | |
777 matrix->matrix_h = dim.height; | |
778 | |
779 /* Record the top y location and height of W at the time the matrix | |
780 was last adjusted. This is used to optimize redisplay above. */ | |
781 if (w) | |
782 { | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
783 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
|
784 matrix->window_top_line = WINDOW_TOP_EDGE_LINE (w); |
25012 | 785 matrix->window_height = window_height; |
786 matrix->window_width = window_width; | |
787 matrix->window_vscroll = w->vscroll; | |
788 } | |
789 } | |
790 | |
791 | |
792 /* Reverse the contents of rows in MATRIX between START and END. The | |
793 contents of the row at END - 1 end up at START, END - 2 at START + | |
794 1 etc. This is part of the implementation of rotate_matrix (see | |
795 below). */ | |
314 | 796 |
797 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
798 reverse_rows (struct glyph_matrix *matrix, int start, int end) |
314 | 799 { |
25012 | 800 int i, j; |
801 | |
802 for (i = start, j = end - 1; i < j; ++i, --j) | |
803 { | |
804 /* Non-ISO HP/UX compiler doesn't like auto struct | |
805 initialization. */ | |
806 struct glyph_row temp; | |
807 temp = matrix->rows[i]; | |
808 matrix->rows[i] = matrix->rows[j]; | |
809 matrix->rows[j] = temp; | |
810 } | |
314 | 811 } |
812 | |
25012 | 813 |
814 /* Rotate the contents of rows in MATRIX in the range FIRST .. LAST - | |
815 1 by BY positions. BY < 0 means rotate left, i.e. towards lower | |
816 indices. (Note: this does not copy glyphs, only glyph pointers in | |
817 row structures are moved around). | |
818 | |
819 The algorithm used for rotating the vector was, I believe, first | |
820 described by Kernighan. See the vector R as consisting of two | |
821 sub-vectors AB, where A has length BY for BY >= 0. The result | |
822 after rotating is then BA. Reverse both sub-vectors to get ArBr | |
823 and reverse the result to get (ArBr)r which is BA. Similar for | |
824 rotating right. */ | |
825 | |
826 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
827 rotate_matrix (struct glyph_matrix *matrix, int first, int last, int by) |
314 | 828 { |
25012 | 829 if (by < 0) |
830 { | |
831 /* Up (rotate left, i.e. towards lower indices). */ | |
832 by = -by; | |
833 reverse_rows (matrix, first, first + by); | |
834 reverse_rows (matrix, first + by, last); | |
835 reverse_rows (matrix, first, last); | |
836 } | |
837 else if (by > 0) | |
314 | 838 { |
25012 | 839 /* Down (rotate right, i.e. towards higher indices). */ |
840 reverse_rows (matrix, last - by, last); | |
841 reverse_rows (matrix, first, last - by); | |
842 reverse_rows (matrix, first, last); | |
314 | 843 } |
25012 | 844 } |
845 | |
846 | |
847 /* Increment buffer positions in glyph rows of MATRIX. Do it for rows | |
848 with indices START <= index < END. Increment positions by DELTA/ | |
849 DELTA_BYTES. */ | |
850 | |
851 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
852 increment_matrix_positions (struct glyph_matrix *matrix, int start, int end, int delta, int delta_bytes) |
25012 | 853 { |
854 /* Check that START and END are reasonable values. */ | |
855 xassert (start >= 0 && start <= matrix->nrows); | |
856 xassert (end >= 0 && end <= matrix->nrows); | |
857 xassert (start <= end); | |
858 | |
859 for (; start < end; ++start) | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
860 increment_row_positions (matrix->rows + start, delta, delta_bytes); |
25012 | 861 } |
862 | |
863 | |
864 /* Enable a range of rows in glyph matrix MATRIX. START and END are | |
865 the row indices of the first and last + 1 row to enable. If | |
866 ENABLED_P is non-zero, enabled_p flags in rows will be set to 1. */ | |
867 | |
868 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
869 enable_glyph_matrix_rows (struct glyph_matrix *matrix, int start, int end, int enabled_p) |
25012 | 870 { |
31932
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
871 xassert (start <= end); |
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
872 xassert (start >= 0 && start < matrix->nrows); |
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
873 xassert (end >= 0 && end <= matrix->nrows); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
874 |
25012 | 875 for (; start < end; ++start) |
876 matrix->rows[start].enabled_p = enabled_p != 0; | |
877 } | |
878 | |
879 | |
880 /* Clear MATRIX. | |
881 | |
882 This empties all rows in MATRIX by setting the enabled_p flag for | |
883 all rows of the matrix to zero. The function prepare_desired_row | |
884 will eventually really clear a row when it sees one with a zero | |
885 enabled_p flag. | |
886 | |
887 Resets update hints to defaults value. The only update hint | |
888 currently present is the flag MATRIX->no_scrolling_p. */ | |
889 | |
890 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
891 clear_glyph_matrix (struct glyph_matrix *matrix) |
25012 | 892 { |
893 if (matrix) | |
314 | 894 { |
25012 | 895 enable_glyph_matrix_rows (matrix, 0, matrix->nrows, 0); |
896 matrix->no_scrolling_p = 0; | |
314 | 897 } |
898 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
899 |
25012 | 900 |
901 /* Shift part of the glyph matrix MATRIX of window W up or down. | |
902 Increment y-positions in glyph rows between START and END by DY, | |
903 and recompute their visible height. */ | |
904 | |
905 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
906 shift_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int start, int end, int dy) |
25012 | 907 { |
908 int min_y, max_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
909 |
25012 | 910 xassert (start <= end); |
911 xassert (start >= 0 && start < matrix->nrows); | |
912 xassert (end >= 0 && end <= matrix->nrows); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
913 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
914 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
|
915 max_y = WINDOW_BOX_HEIGHT_NO_MODE_LINE (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
916 |
25012 | 917 for (; start < end; ++start) |
918 { | |
919 struct glyph_row *row = &matrix->rows[start]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
920 |
25012 | 921 row->y += dy; |
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
922 row->visible_height = row->height; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
923 |
25012 | 924 if (row->y < min_y) |
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
925 row->visible_height -= min_y - row->y; |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
926 if (row->y + row->height > max_y) |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
927 row->visible_height -= row->y + row->height - max_y; |
25012 | 928 } |
929 } | |
930 | |
931 | |
932 /* Mark all rows in current matrices of frame F as invalid. Marking | |
933 invalid is done by setting enabled_p to zero for all rows in a | |
934 current matrix. */ | |
935 | |
936 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
937 clear_current_matrices (register struct frame *f) |
25012 | 938 { |
939 /* Clear frame current matrix, if we have one. */ | |
940 if (f->current_matrix) | |
941 clear_glyph_matrix (f->current_matrix); | |
942 | |
943 /* Clear the matrix of the menu bar window, if such a window exists. | |
944 The menu bar window is currently used to display menus on X when | |
945 no toolkit support is compiled in. */ | |
946 if (WINDOWP (f->menu_bar_window)) | |
947 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->current_matrix); | |
948 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
949 /* 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
|
950 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
|
951 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix); |
25012 | 952 |
953 /* Clear current window matrices. */ | |
954 xassert (WINDOWP (FRAME_ROOT_WINDOW (f))); | |
955 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 0); | |
956 } | |
957 | |
958 | |
959 /* Clear out all display lines of F for a coming redisplay. */ | |
314 | 960 |
21514 | 961 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
962 clear_desired_matrices (register struct frame *f) |
314 | 963 { |
25012 | 964 if (f->desired_matrix) |
965 clear_glyph_matrix (f->desired_matrix); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
966 |
25012 | 967 if (WINDOWP (f->menu_bar_window)) |
968 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->desired_matrix); | |
969 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
970 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
|
971 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->desired_matrix); |
25012 | 972 |
973 /* Do it for window matrices. */ | |
974 xassert (WINDOWP (FRAME_ROOT_WINDOW (f))); | |
975 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 1); | |
976 } | |
977 | |
978 | |
979 /* Clear matrices in window tree rooted in W. If DESIRED_P is | |
980 non-zero clear desired matrices, otherwise clear current matrices. */ | |
981 | |
982 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
983 clear_window_matrices (struct window *w, int desired_p) |
25012 | 984 { |
985 while (w) | |
314 | 986 { |
25012 | 987 if (!NILP (w->hchild)) |
988 { | |
989 xassert (WINDOWP (w->hchild)); | |
990 clear_window_matrices (XWINDOW (w->hchild), desired_p); | |
991 } | |
992 else if (!NILP (w->vchild)) | |
314 | 993 { |
25012 | 994 xassert (WINDOWP (w->vchild)); |
995 clear_window_matrices (XWINDOW (w->vchild), desired_p); | |
996 } | |
997 else | |
998 { | |
999 if (desired_p) | |
1000 clear_glyph_matrix (w->desired_matrix); | |
1001 else | |
314 | 1002 { |
25012 | 1003 clear_glyph_matrix (w->current_matrix); |
1004 w->window_end_valid = Qnil; | |
314 | 1005 } |
25012 | 1006 } |
1007 | |
1008 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
1009 } | |
1010 } | |
1011 | |
1012 | |
1013 | |
1014 /*********************************************************************** | |
1015 Glyph Rows | |
1016 | |
1017 See dispextern.h for an overall explanation of glyph rows. | |
1018 ***********************************************************************/ | |
1019 | |
1020 /* Clear glyph row ROW. Do it in a way that makes it robust against | |
1021 changes in the glyph_row structure, i.e. addition or removal of | |
1022 structure members. */ | |
1023 | |
33527
c4c7abc48752
(null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents:
33101
diff
changeset
|
1024 static struct glyph_row null_row; |
c4c7abc48752
(null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents:
33101
diff
changeset
|
1025 |
25012 | 1026 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1027 clear_glyph_row (struct glyph_row *row) |
25012 | 1028 { |
1029 struct glyph *p[1 + LAST_AREA]; | |
1030 | |
1031 /* Save pointers. */ | |
1032 p[LEFT_MARGIN_AREA] = row->glyphs[LEFT_MARGIN_AREA]; | |
1033 p[TEXT_AREA] = row->glyphs[TEXT_AREA]; | |
1034 p[RIGHT_MARGIN_AREA] = row->glyphs[RIGHT_MARGIN_AREA]; | |
1035 p[LAST_AREA] = row->glyphs[LAST_AREA]; | |
1036 | |
1037 /* Clear. */ | |
1038 *row = null_row; | |
1039 | |
1040 /* Restore pointers. */ | |
1041 row->glyphs[LEFT_MARGIN_AREA] = p[LEFT_MARGIN_AREA]; | |
1042 row->glyphs[TEXT_AREA] = p[TEXT_AREA]; | |
1043 row->glyphs[RIGHT_MARGIN_AREA] = p[RIGHT_MARGIN_AREA]; | |
1044 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
|
1045 |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1046 #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
|
1047 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
|
1048 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
|
1049 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
|
1050 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
|
1051 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
|
1052 are that the flickering has the same reason as here. */ |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
1053 memset (p[0], 0, (char *) p[LAST_AREA] - (char *) p[0]); |
30041
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1054 #endif |
25012 | 1055 } |
1056 | |
1057 | |
1058 /* Make ROW an empty, enabled row of canonical character height, | |
1059 in window W starting at y-position Y. */ | |
1060 | |
1061 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1062 blank_row (struct window *w, struct glyph_row *row, int y) |
25012 | 1063 { |
1064 int min_y, max_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1065 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1066 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
|
1067 max_y = WINDOW_BOX_HEIGHT_NO_MODE_LINE (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1068 |
25012 | 1069 clear_glyph_row (row); |
1070 row->y = y; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1071 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
|
1072 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
|
1073 row->visible_height = row->height; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1074 |
25012 | 1075 if (row->y < min_y) |
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1076 row->visible_height -= min_y - row->y; |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1077 if (row->y + row->height > max_y) |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1078 row->visible_height -= row->y + row->height - max_y; |
25012 | 1079 |
1080 row->enabled_p = 1; | |
1081 } | |
1082 | |
1083 | |
1084 /* Increment buffer positions in glyph row ROW. DELTA and DELTA_BYTES | |
1085 are the amounts by which to change positions. Note that the first | |
1086 glyph of the text area of a row can have a buffer position even if | |
1087 the used count of the text area is zero. Such rows display line | |
1088 ends. */ | |
1089 | |
1090 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1091 increment_row_positions (struct glyph_row *row, int delta, int delta_bytes) |
25012 | 1092 { |
1093 int area, i; | |
1094 | |
1095 /* Increment start and end positions. */ | |
1096 MATRIX_ROW_START_CHARPOS (row) += delta; | |
1097 MATRIX_ROW_START_BYTEPOS (row) += delta_bytes; | |
1098 MATRIX_ROW_END_CHARPOS (row) += delta; | |
1099 MATRIX_ROW_END_BYTEPOS (row) += delta_bytes; | |
108656
0b28d05fa415
Initial reimplementation of calculating line edge positions in bidi lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107991
diff
changeset
|
1100 CHARPOS (row->start.pos) += delta; |
0b28d05fa415
Initial reimplementation of calculating line edge positions in bidi lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107991
diff
changeset
|
1101 BYTEPOS (row->start.pos) += delta_bytes; |
0b28d05fa415
Initial reimplementation of calculating line edge positions in bidi lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107991
diff
changeset
|
1102 CHARPOS (row->end.pos) += delta; |
0b28d05fa415
Initial reimplementation of calculating line edge positions in bidi lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107991
diff
changeset
|
1103 BYTEPOS (row->end.pos) += delta_bytes; |
25012 | 1104 |
65003
74ab28cf1192
(increment_row_positions): Skip non-enabled rows.
Kim F. Storm <storm@cua.dk>
parents:
64776
diff
changeset
|
1105 if (!row->enabled_p) |
74ab28cf1192
(increment_row_positions): Skip non-enabled rows.
Kim F. Storm <storm@cua.dk>
parents:
64776
diff
changeset
|
1106 return; |
74ab28cf1192
(increment_row_positions): Skip non-enabled rows.
Kim F. Storm <storm@cua.dk>
parents:
64776
diff
changeset
|
1107 |
25012 | 1108 /* Increment positions in glyphs. */ |
1109 for (area = 0; area < LAST_AREA; ++area) | |
1110 for (i = 0; i < row->used[area]; ++i) | |
1111 if (BUFFERP (row->glyphs[area][i].object) | |
1112 && row->glyphs[area][i].charpos > 0) | |
1113 row->glyphs[area][i].charpos += delta; | |
1114 | |
1115 /* Capture the case of rows displaying a line end. */ | |
1116 if (row->used[TEXT_AREA] == 0 | |
1117 && MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
1118 row->glyphs[TEXT_AREA]->charpos += delta; | |
1119 } | |
1120 | |
1121 | |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1122 #if 0 |
25012 | 1123 /* Swap glyphs between two glyph rows A and B. This exchanges glyph |
1124 contents, i.e. glyph structure contents are exchanged between A and | |
1125 B without changing glyph pointers in A and B. */ | |
1126 | |
1127 static void | |
1128 swap_glyphs_in_rows (a, b) | |
1129 struct glyph_row *a, *b; | |
1130 { | |
1131 int area; | |
1132 | |
1133 for (area = 0; area < LAST_AREA; ++area) | |
1134 { | |
1135 /* Number of glyphs to swap. */ | |
1136 int max_used = max (a->used[area], b->used[area]); | |
1137 | |
1138 /* Start of glyphs in area of row A. */ | |
1139 struct glyph *glyph_a = a->glyphs[area]; | |
1140 | |
1141 /* End + 1 of glyphs in area of row A. */ | |
1142 struct glyph *glyph_a_end = a->glyphs[max_used]; | |
1143 | |
1144 /* Start of glyphs in area of row B. */ | |
1145 struct glyph *glyph_b = b->glyphs[area]; | |
1146 | |
1147 while (glyph_a < glyph_a_end) | |
1148 { | |
1149 /* Non-ISO HP/UX compiler doesn't like auto struct | |
1150 initialization. */ | |
1151 struct glyph temp; | |
1152 temp = *glyph_a; | |
1153 *glyph_a = *glyph_b; | |
1154 *glyph_b = temp; | |
1155 ++glyph_a; | |
1156 ++glyph_b; | |
314 | 1157 } |
1158 } | |
1159 } | |
25012 | 1160 |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1161 #endif /* 0 */ |
25012 | 1162 |
1163 /* Exchange pointers to glyph memory between glyph rows A and B. */ | |
1164 | |
1165 static INLINE void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1166 swap_glyph_pointers (struct glyph_row *a, struct glyph_row *b) |
25012 | 1167 { |
1168 int i; | |
1169 for (i = 0; i < LAST_AREA + 1; ++i) | |
1170 { | |
1171 struct glyph *temp = a->glyphs[i]; | |
1172 a->glyphs[i] = b->glyphs[i]; | |
1173 b->glyphs[i] = temp; | |
1174 } | |
1175 } | |
1176 | |
1177 | |
1178 /* Copy glyph row structure FROM to glyph row structure TO, except | |
1179 that glyph pointers in the structures are left unchanged. */ | |
1180 | |
1181 INLINE void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1182 copy_row_except_pointers (struct glyph_row *to, struct glyph_row *from) |
25012 | 1183 { |
1184 struct glyph *pointers[1 + LAST_AREA]; | |
1185 | |
1186 /* Save glyph pointers of TO. */ | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
1187 memcpy (pointers, to->glyphs, sizeof to->glyphs); |
25012 | 1188 |
1189 /* Do a structure assignment. */ | |
1190 *to = *from; | |
1191 | |
1192 /* Restore original pointers of TO. */ | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
1193 memcpy (to->glyphs, pointers, sizeof to->glyphs); |
25012 | 1194 } |
1195 | |
1196 | |
1197 /* Copy contents of glyph row FROM to glyph row TO. Glyph pointers in | |
1198 TO and FROM are left unchanged. Glyph contents are copied from the | |
1199 glyph memory of FROM to the glyph memory of TO. Increment buffer | |
1200 positions in row TO by DELTA/ DELTA_BYTES. */ | |
1201 | |
1202 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1203 copy_glyph_row_contents (struct glyph_row *to, struct glyph_row *from, int delta, int delta_bytes) |
25012 | 1204 { |
1205 int area; | |
1206 | |
1207 /* This is like a structure assignment TO = FROM, except that | |
1208 glyph pointers in the rows are left unchanged. */ | |
1209 copy_row_except_pointers (to, from); | |
1210 | |
1211 /* Copy glyphs from FROM to TO. */ | |
1212 for (area = 0; area < LAST_AREA; ++area) | |
1213 if (from->used[area]) | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
1214 memcpy (to->glyphs[area], from->glyphs[area], |
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
1215 from->used[area] * sizeof (struct glyph)); |
25012 | 1216 |
1217 /* Increment buffer positions in TO by DELTA. */ | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
1218 increment_row_positions (to, delta, delta_bytes); |
25012 | 1219 } |
1220 | |
1221 | |
1222 /* Assign glyph row FROM to glyph row TO. This works like a structure | |
1223 assignment TO = FROM, except that glyph pointers are not copied but | |
1224 exchanged between TO and FROM. Pointers must be exchanged to avoid | |
1225 a memory leak. */ | |
1226 | |
1227 static INLINE void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1228 assign_row (struct glyph_row *to, struct glyph_row *from) |
25012 | 1229 { |
1230 swap_glyph_pointers (to, from); | |
1231 copy_row_except_pointers (to, from); | |
1232 } | |
1233 | |
1234 | |
1235 /* Test whether the glyph memory of the glyph row WINDOW_ROW, which is | |
1236 a row in a window matrix, is a slice of the glyph memory of the | |
1237 glyph row FRAME_ROW which is a row in a frame glyph matrix. Value | |
1238 is non-zero if the glyph memory of WINDOW_ROW is part of the glyph | |
1239 memory of FRAME_ROW. */ | |
1240 | |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
1241 #if GLYPH_DEBUG |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
1242 |
25012 | 1243 static int |
1244 glyph_row_slice_p (window_row, frame_row) | |
1245 struct glyph_row *window_row, *frame_row; | |
1246 { | |
1247 struct glyph *window_glyph_start = window_row->glyphs[0]; | |
1248 struct glyph *frame_glyph_start = frame_row->glyphs[0]; | |
1249 struct glyph *frame_glyph_end = frame_row->glyphs[LAST_AREA]; | |
1250 | |
1251 return (frame_glyph_start <= window_glyph_start | |
1252 && window_glyph_start < frame_glyph_end); | |
1253 } | |
1254 | |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
1255 #endif /* GLYPH_DEBUG */ |
25012 | 1256 |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1257 #if 0 |
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1258 |
25012 | 1259 /* Find the row in the window glyph matrix WINDOW_MATRIX being a slice |
1260 of ROW in the frame matrix FRAME_MATRIX. Value is null if no row | |
1261 in WINDOW_MATRIX is found satisfying the condition. */ | |
1262 | |
1263 static struct glyph_row * | |
1264 find_glyph_row_slice (window_matrix, frame_matrix, row) | |
1265 struct glyph_matrix *window_matrix, *frame_matrix; | |
1266 int row; | |
1267 { | |
1268 int i; | |
1269 | |
1270 xassert (row >= 0 && row < frame_matrix->nrows); | |
1271 | |
1272 for (i = 0; i < window_matrix->nrows; ++i) | |
1273 if (glyph_row_slice_p (window_matrix->rows + i, | |
1274 frame_matrix->rows + row)) | |
1275 break; | |
1276 | |
1277 return i < window_matrix->nrows ? window_matrix->rows + i : 0; | |
1278 } | |
1279 | |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1280 #endif /* 0 */ |
25012 | 1281 |
1282 /* Prepare ROW for display. Desired rows are cleared lazily, | |
1283 i.e. they are only marked as to be cleared by setting their | |
1284 enabled_p flag to zero. When a row is to be displayed, a prior | |
1285 call to this function really clears it. */ | |
1286 | |
1287 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1288 prepare_desired_row (struct glyph_row *row) |
25012 | 1289 { |
1290 if (!row->enabled_p) | |
1291 { | |
107624
552007beee69
Finish and debug display of invisible text.
Eli Zaretskii <eliz@gnu.org>
parents:
107617
diff
changeset
|
1292 unsigned rp = row->reversed_p; |
552007beee69
Finish and debug display of invisible text.
Eli Zaretskii <eliz@gnu.org>
parents:
107617
diff
changeset
|
1293 |
25012 | 1294 clear_glyph_row (row); |
1295 row->enabled_p = 1; | |
107624
552007beee69
Finish and debug display of invisible text.
Eli Zaretskii <eliz@gnu.org>
parents:
107617
diff
changeset
|
1296 row->reversed_p = rp; |
25012 | 1297 } |
1298 } | |
1299 | |
1300 | |
1301 /* Return a hash code for glyph row ROW. */ | |
1302 | |
1303 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1304 line_hash_code (struct glyph_row *row) |
25012 | 1305 { |
1306 int hash = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1307 |
25012 | 1308 if (row->enabled_p) |
1309 { | |
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1310 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
|
1311 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
|
1312 |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1313 while (glyph < end) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1314 { |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1315 int c = glyph->u.ch; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1316 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
|
1317 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
|
1318 c -= SPACEGLYPH; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1319 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
|
1320 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
|
1321 ++glyph; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1322 } |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1323 |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1324 if (hash == 0) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1325 hash = 1; |
25012 | 1326 } |
1327 | |
1328 return hash; | |
1329 } | |
1330 | |
1331 | |
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
|
1332 /* Return the cost of drawing line VPOS in MATRIX. The cost equals |
25012 | 1333 the number of characters in the line. If must_write_spaces is |
1334 zero, leading and trailing spaces are ignored. */ | |
1335 | |
1336 static unsigned int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1337 line_draw_cost (struct glyph_matrix *matrix, int vpos) |
25012 | 1338 { |
1339 struct glyph_row *row = matrix->rows + vpos; | |
1340 struct glyph *beg = row->glyphs[TEXT_AREA]; | |
1341 struct glyph *end = beg + row->used[TEXT_AREA]; | |
1342 int len; | |
1343 Lisp_Object *glyph_table_base = GLYPH_TABLE_BASE; | |
1344 int glyph_table_len = GLYPH_TABLE_LENGTH; | |
1345 | |
1346 /* 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
|
1347 if (!FRAME_MUST_WRITE_SPACES (SELECTED_FRAME ())) /* XXX Is SELECTED_FRAME OK here? */ |
25012 | 1348 { |
1349 /* 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
|
1350 while (end > beg && CHAR_GLYPH_SPACE_P (*(end - 1))) |
25012 | 1351 --end; |
1352 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1353 /* All blank line. */ |
25012 | 1354 if (end == beg) |
1355 return 0; | |
1356 | |
1357 /* Skip over leading spaces. */ | |
1358 while (CHAR_GLYPH_SPACE_P (*beg)) | |
1359 ++beg; | |
1360 } | |
1361 | |
1362 /* If we don't have a glyph-table, each glyph is one character, | |
1363 so return the number of glyphs. */ | |
1364 if (glyph_table_base == 0) | |
1365 len = end - beg; | |
1366 else | |
1367 { | |
1368 /* Otherwise, scan the glyphs and accumulate their total length | |
1369 in LEN. */ | |
1370 len = 0; | |
1371 while (beg < end) | |
1372 { | |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
1373 GLYPH g; |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
1374 |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
1375 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
|
1376 |
92387
41d029d73eac
(line_draw_cost): Fix invalid glyph check.
Kim F. Storm <storm@cua.dk>
parents:
92276
diff
changeset
|
1377 if (GLYPH_INVALID_P (g) |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1378 || GLYPH_SIMPLE_P (glyph_table_base, glyph_table_len, g)) |
25012 | 1379 len += 1; |
1380 else | |
1381 len += GLYPH_LENGTH (glyph_table_base, g); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1382 |
25012 | 1383 ++beg; |
1384 } | |
1385 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1386 |
25012 | 1387 return len; |
1388 } | |
1389 | |
1390 | |
1391 /* Test two glyph rows A and B for equality. Value is non-zero if A | |
1392 and B have equal contents. W is the window to which the glyphs | |
1393 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
|
1394 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
|
1395 flags of A and B, too. */ |
25012 | 1396 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1397 static INLINE int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1398 row_equal_p (struct window *w, struct glyph_row *a, struct glyph_row *b, int mouse_face_p) |
25012 | 1399 { |
1400 if (a == b) | |
1401 return 1; | |
1402 else if (a->hash != b->hash) | |
1403 return 0; | |
1404 else | |
1405 { | |
1406 struct glyph *a_glyph, *b_glyph, *a_end; | |
1407 int area; | |
1408 | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1409 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
|
1410 return 0; |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1411 |
25012 | 1412 /* Compare glyphs. */ |
1413 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) | |
1414 { | |
1415 if (a->used[area] != b->used[area]) | |
1416 return 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1417 |
25012 | 1418 a_glyph = a->glyphs[area]; |
1419 a_end = a_glyph + a->used[area]; | |
1420 b_glyph = b->glyphs[area]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1421 |
25012 | 1422 while (a_glyph < a_end |
1423 && GLYPH_EQUAL_P (a_glyph, b_glyph)) | |
1424 ++a_glyph, ++b_glyph; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1425 |
25012 | 1426 if (a_glyph != a_end) |
1427 return 0; | |
1428 } | |
1429 | |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
1430 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
|
1431 || 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
|
1432 || 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
|
1433 || 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
|
1434 || 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
|
1435 || 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
|
1436 || 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
|
1437 || 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
|
1438 || a->overlapped_p != b->overlapped_p |
25012 | 1439 || (MATRIX_ROW_CONTINUATION_LINE_P (a) |
1440 != MATRIX_ROW_CONTINUATION_LINE_P (b)) | |
107636
b5cb7368c1bc
Continue work on continuation lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107624
diff
changeset
|
1441 || a->reversed_p != b->reversed_p |
25012 | 1442 /* Different partially visible characters on left margin. */ |
1443 || a->x != b->x | |
1444 /* Different height. */ | |
1445 || a->ascent != b->ascent | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1446 || a->phys_ascent != b->phys_ascent |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1447 || a->phys_height != b->phys_height |
25012 | 1448 || a->visible_height != b->visible_height) |
1449 return 0; | |
1450 } | |
1451 | |
1452 return 1; | |
1453 } | |
1454 | |
1455 | |
314 | 1456 |
25012 | 1457 /*********************************************************************** |
1458 Glyph Pool | |
1459 | |
1460 See dispextern.h for an overall explanation of glyph pools. | |
1461 ***********************************************************************/ | |
1462 | |
1463 /* Allocate a glyph_pool structure. The structure returned is | |
1464 initialized with zeros. The global variable glyph_pool_count is | |
1465 incremented for each pool allocated. */ | |
1466 | |
1467 static struct glyph_pool * | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1468 new_glyph_pool (void) |
25012 | 1469 { |
1470 struct glyph_pool *result; | |
1471 | |
1472 /* Allocate a new glyph_pool and clear it. */ | |
1473 result = (struct glyph_pool *) xmalloc (sizeof *result); | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
1474 memset (result, 0, sizeof *result); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1475 |
25012 | 1476 /* For memory leak and double deletion checking. */ |
1477 ++glyph_pool_count; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1478 |
25012 | 1479 return result; |
1480 } | |
1481 | |
1482 | |
1483 /* Free a glyph_pool structure POOL. The function may be called with | |
1484 a null POOL pointer. The global variable glyph_pool_count is | |
1485 decremented with every pool structure freed. If this count gets | |
1486 negative, more structures were freed than allocated, i.e. one | |
1487 structure must have been freed more than once or a bogus pointer | |
1488 was passed to free_glyph_pool. */ | |
1489 | |
1490 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1491 free_glyph_pool (struct glyph_pool *pool) |
25012 | 1492 { |
1493 if (pool) | |
1494 { | |
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
|
1495 /* More freed than allocated? */ |
25012 | 1496 --glyph_pool_count; |
1497 xassert (glyph_pool_count >= 0); | |
1498 | |
1499 xfree (pool->glyphs); | |
1500 xfree (pool); | |
1501 } | |
1502 } | |
1503 | |
1504 | |
1505 /* Enlarge a glyph pool POOL. MATRIX_DIM gives the number of rows and | |
1506 columns we need. This function never shrinks a pool. The only | |
1507 case in which this would make sense, would be when a frame's size | |
1508 is changed from a large value to a smaller one. But, if someone | |
1509 does it once, we can expect that he will do it again. | |
1510 | |
1511 Value is non-zero if the pool changed in a way which makes | |
1512 re-adjusting window glyph matrices necessary. */ | |
1513 | |
1514 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1515 realloc_glyph_pool (struct glyph_pool *pool, struct dim matrix_dim) |
25012 | 1516 { |
1517 int needed; | |
1518 int changed_p; | |
1519 | |
1520 changed_p = (pool->glyphs == 0 | |
1521 || matrix_dim.height != pool->nrows | |
1522 || matrix_dim.width != pool->ncolumns); | |
1523 | |
1524 /* Enlarge the glyph pool. */ | |
1525 needed = matrix_dim.width * matrix_dim.height; | |
1526 if (needed > pool->nglyphs) | |
1527 { | |
1528 int size = needed * sizeof (struct glyph); | |
1529 | |
1530 if (pool->glyphs) | |
109660
85236524c2a3
Fix redisplay bugs due to uninitialized glyphs in frame glyph pool.
Eli Zaretskii <eliz@gnu.org>
parents:
109573
diff
changeset
|
1531 { |
85236524c2a3
Fix redisplay bugs due to uninitialized glyphs in frame glyph pool.
Eli Zaretskii <eliz@gnu.org>
parents:
109573
diff
changeset
|
1532 pool->glyphs = (struct glyph *) xrealloc (pool->glyphs, size); |
85236524c2a3
Fix redisplay bugs due to uninitialized glyphs in frame glyph pool.
Eli Zaretskii <eliz@gnu.org>
parents:
109573
diff
changeset
|
1533 memset (pool->glyphs + pool->nglyphs, 0, |
85236524c2a3
Fix redisplay bugs due to uninitialized glyphs in frame glyph pool.
Eli Zaretskii <eliz@gnu.org>
parents:
109573
diff
changeset
|
1534 size - pool->nglyphs * sizeof (struct glyph)); |
85236524c2a3
Fix redisplay bugs due to uninitialized glyphs in frame glyph pool.
Eli Zaretskii <eliz@gnu.org>
parents:
109573
diff
changeset
|
1535 } |
25012 | 1536 else |
1537 { | |
1538 pool->glyphs = (struct glyph *) xmalloc (size); | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
1539 memset (pool->glyphs, 0, size); |
25012 | 1540 } |
1541 | |
1542 pool->nglyphs = needed; | |
1543 } | |
1544 | |
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
|
1545 /* Remember the number of rows and columns because (a) we use them |
25012 | 1546 to do sanity checks, and (b) the number of columns determines |
1547 where rows in the frame matrix start---this must be available to | |
1548 determine pointers to rows of window sub-matrices. */ | |
1549 pool->nrows = matrix_dim.height; | |
1550 pool->ncolumns = matrix_dim.width; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1551 |
25012 | 1552 return changed_p; |
1553 } | |
1554 | |
1555 | |
1556 | |
1557 /*********************************************************************** | |
1558 Debug Code | |
1559 ***********************************************************************/ | |
1560 | |
1561 #if GLYPH_DEBUG | |
1562 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1563 |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
1564 /* 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
|
1565 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
|
1566 stdout. |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
1567 */ |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1568 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1569 void |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1570 flush_stdout () |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1571 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1572 fflush (stdout); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1573 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1574 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1575 |
25012 | 1576 /* Check that no glyph pointers have been lost in MATRIX. If a |
1577 pointer has been lost, e.g. by using a structure assignment between | |
1578 rows, at least one pointer must occur more than once in the rows of | |
1579 MATRIX. */ | |
1580 | |
1581 void | |
1582 check_matrix_pointer_lossage (matrix) | |
1583 struct glyph_matrix *matrix; | |
1584 { | |
1585 int i, j; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1586 |
25012 | 1587 for (i = 0; i < matrix->nrows; ++i) |
1588 for (j = 0; j < matrix->nrows; ++j) | |
1589 xassert (i == j | |
1590 || (matrix->rows[i].glyphs[TEXT_AREA] | |
1591 != matrix->rows[j].glyphs[TEXT_AREA])); | |
1592 } | |
1593 | |
1594 | |
1595 /* Get a pointer to glyph row ROW in MATRIX, with bounds checks. */ | |
1596 | |
1597 struct glyph_row * | |
1598 matrix_row (matrix, row) | |
1599 struct glyph_matrix *matrix; | |
1600 int row; | |
1601 { | |
1602 xassert (matrix && matrix->rows); | |
1603 xassert (row >= 0 && row < matrix->nrows); | |
1604 | |
1605 /* That's really too slow for normal testing because this function | |
1606 is called almost everywhere. Although---it's still astonishingly | |
1607 fast, so it is valuable to have for debugging purposes. */ | |
314 | 1608 #if 0 |
25012 | 1609 check_matrix_pointer_lossage (matrix); |
1610 #endif | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1611 |
25012 | 1612 return matrix->rows + row; |
1613 } | |
1614 | |
1615 | |
1616 #if 0 /* This function makes invalid assumptions when text is | |
1617 partially invisible. But it might come handy for debugging | |
1618 nevertheless. */ | |
1619 | |
1620 /* Check invariants that must hold for an up to date current matrix of | |
1621 window W. */ | |
1622 | |
1623 static void | |
1624 check_matrix_invariants (w) | |
314 | 1625 struct window *w; |
1626 { | |
25012 | 1627 struct glyph_matrix *matrix = w->current_matrix; |
1628 int yb = window_text_bottom_y (w); | |
1629 struct glyph_row *row = matrix->rows; | |
1630 struct glyph_row *last_text_row = NULL; | |
1631 struct buffer *saved = current_buffer; | |
1632 struct buffer *buffer = XBUFFER (w->buffer); | |
1633 int c; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1634 |
25012 | 1635 /* This can sometimes happen for a fresh window. */ |
1636 if (matrix->nrows < 2) | |
1637 return; | |
1638 | |
1639 set_buffer_temp (buffer); | |
1640 | |
1641 /* Note: last row is always reserved for the mode line. */ | |
1642 while (MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
1643 && MATRIX_ROW_BOTTOM_Y (row) < yb) | |
1644 { | |
1645 struct glyph_row *next = row + 1; | |
1646 | |
1647 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
1648 last_text_row = row; | |
1649 | |
1650 /* Check that character and byte positions are in sync. */ | |
1651 xassert (MATRIX_ROW_START_BYTEPOS (row) | |
1652 == CHAR_TO_BYTE (MATRIX_ROW_START_CHARPOS (row))); | |
108656
0b28d05fa415
Initial reimplementation of calculating line edge positions in bidi lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107991
diff
changeset
|
1653 xassert (BYTEPOS (row->start.pos) |
0b28d05fa415
Initial reimplementation of calculating line edge positions in bidi lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107991
diff
changeset
|
1654 == CHAR_TO_BYTE (CHARPOS (row->start.pos))); |
25012 | 1655 |
1656 /* CHAR_TO_BYTE aborts when invoked for a position > Z. We can | |
1657 have such a position temporarily in case of a minibuffer | |
1658 displaying something like `[Sole completion]' at its end. */ | |
1659 if (MATRIX_ROW_END_CHARPOS (row) < BUF_ZV (current_buffer)) | |
108656
0b28d05fa415
Initial reimplementation of calculating line edge positions in bidi lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107991
diff
changeset
|
1660 { |
0b28d05fa415
Initial reimplementation of calculating line edge positions in bidi lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107991
diff
changeset
|
1661 xassert (MATRIX_ROW_END_BYTEPOS (row) |
0b28d05fa415
Initial reimplementation of calculating line edge positions in bidi lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107991
diff
changeset
|
1662 == CHAR_TO_BYTE (MATRIX_ROW_END_CHARPOS (row))); |
0b28d05fa415
Initial reimplementation of calculating line edge positions in bidi lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107991
diff
changeset
|
1663 xassert (BYTEPOS (row->end.pos) |
0b28d05fa415
Initial reimplementation of calculating line edge positions in bidi lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107991
diff
changeset
|
1664 == CHAR_TO_BYTE (CHARPOS (row->end.pos))); |
0b28d05fa415
Initial reimplementation of calculating line edge positions in bidi lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107991
diff
changeset
|
1665 } |
25012 | 1666 |
1667 /* Check that end position of `row' is equal to start position | |
1668 of next row. */ | |
1669 if (next->enabled_p && MATRIX_ROW_DISPLAYS_TEXT_P (next)) | |
1670 { | |
1671 xassert (MATRIX_ROW_END_CHARPOS (row) | |
1672 == MATRIX_ROW_START_CHARPOS (next)); | |
1673 xassert (MATRIX_ROW_END_BYTEPOS (row) | |
1674 == MATRIX_ROW_START_BYTEPOS (next)); | |
108656
0b28d05fa415
Initial reimplementation of calculating line edge positions in bidi lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107991
diff
changeset
|
1675 xassert (CHARPOS (row->end.pos) == CHARPOS (next->start.pos)); |
0b28d05fa415
Initial reimplementation of calculating line edge positions in bidi lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107991
diff
changeset
|
1676 xassert (BYTEPOS (row->end.pos) == BYTEPOS (next->start.pos)); |
25012 | 1677 } |
1678 row = next; | |
1679 } | |
1680 | |
1681 xassert (w->current_matrix->nrows == w->desired_matrix->nrows); | |
1682 xassert (w->desired_matrix->rows != NULL); | |
1683 set_buffer_temp (saved); | |
1684 } | |
1685 | |
1686 #endif /* 0 */ | |
1687 | |
1688 #endif /* GLYPH_DEBUG != 0 */ | |
1689 | |
1690 | |
1691 | |
1692 /********************************************************************** | |
1693 Allocating/ Adjusting Glyph Matrices | |
1694 **********************************************************************/ | |
1695 | |
1696 /* Allocate glyph matrices over a window tree for a frame-based | |
1697 redisplay | |
1698 | |
1699 X and Y are column/row within the frame glyph matrix where | |
1700 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
|
1701 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
|
1702 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
|
1703 matrix adjustments should not be performed. |
25012 | 1704 |
1705 The function returns the total width/height of the sub-matrices of | |
1706 the window tree. If called on a frame root window, the computation | |
1707 will take the mini-buffer window into account. | |
1708 | |
1709 *WINDOW_CHANGE_FLAGS is set to a bit mask with bits | |
1710 | |
1711 NEW_LEAF_MATRIX set if any window in the tree did not have a | |
1712 glyph matrices yet, and | |
1713 | |
1714 CHANGED_LEAF_MATRIX set if the dimension or location of a matrix of | |
1715 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
|
1716 DIM_ONLY_P) |
25012 | 1717 |
1718 *WINDOW_CHANGE_FLAGS must be initialized by the caller of this | |
1719 function. | |
1720 | |
1721 Windows are arranged into chains of windows on the same level | |
1722 through the next fields of window structures. Such a level can be | |
1723 either a sequence of horizontally adjacent windows from left to | |
1724 right, or a sequence of vertically adjacent windows from top to | |
1725 bottom. Each window in a horizontal sequence can be either a leaf | |
1726 window or a vertical sequence; a window in a vertical sequence can | |
1727 be either a leaf or a horizontal sequence. All windows in a | |
1728 horizontal sequence have the same height, and all windows in a | |
1729 vertical sequence have the same width. | |
1730 | |
1731 This function uses, for historical reasons, a more general | |
1732 algorithm to determine glyph matrix dimensions that would be | |
1733 necessary. | |
1734 | |
1735 The matrix height of a horizontal sequence is determined by the | |
1736 maximum height of any matrix in the sequence. The matrix width of | |
1737 a horizontal sequence is computed by adding up matrix widths of | |
1738 windows in the sequence. | |
1739 | |
1740 |<------- result width ------->| | |
1741 +---------+----------+---------+ --- | |
1742 | | | | | | |
1743 | | | | | |
1744 +---------+ | | result height | |
1745 | +---------+ | |
1746 | | | | |
1747 +----------+ --- | |
1748 | |
1749 The matrix width of a vertical sequence is the maximum matrix width | |
1750 of any window in the sequence. Its height is computed by adding up | |
1751 matrix heights of windows in the sequence. | |
1752 | |
1753 |<---- result width -->| | |
1754 +---------+ --- | |
1755 | | | | |
1756 | | | | |
1757 +---------+--+ | | |
1758 | | | | |
1759 | | result height | |
1760 | | | |
1761 +------------+---------+ | | |
1762 | | | | |
1763 | | | | |
1764 +------------+---------+ --- */ | |
1765 | |
1766 /* Bit indicating that a new matrix will be allocated or has been | |
1767 allocated. */ | |
1768 | |
1769 #define NEW_LEAF_MATRIX (1 << 0) | |
1770 | |
1771 /* Bit indicating that a matrix will or has changed its location or | |
1772 size. */ | |
1773 | |
1774 #define CHANGED_LEAF_MATRIX (1 << 1) | |
1775 | |
1776 static struct dim | |
109360
f37b85834f7e
Convert more function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109179
diff
changeset
|
1777 allocate_matrices_for_frame_redisplay (Lisp_Object window, int x, int y, |
f37b85834f7e
Convert more function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109179
diff
changeset
|
1778 int dim_only_p, int *window_change_flags) |
25012 | 1779 { |
1780 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (window))); | |
1781 int x0 = x, y0 = y; | |
1782 int wmax = 0, hmax = 0; | |
1783 struct dim total; | |
1784 struct dim dim; | |
1785 struct window *w; | |
1786 int in_horz_combination_p; | |
1787 | |
1788 /* What combination is WINDOW part of? Compute this once since the | |
1789 result is the same for all windows in the `next' chain. The | |
1790 special case of a root window (parent equal to nil) is treated | |
1791 like a vertical combination because a root window's `next' | |
1792 points to the mini-buffer window, if any, which is arranged | |
1793 vertically below other windows. */ | |
1794 in_horz_combination_p | |
1795 = (!NILP (XWINDOW (window)->parent) | |
1796 && !NILP (XWINDOW (XWINDOW (window)->parent)->hchild)); | |
1797 | |
1798 /* For WINDOW and all windows on the same level. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1799 do |
25012 | 1800 { |
1801 w = XWINDOW (window); | |
1802 | |
1803 /* 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
|
1804 on whether this is a combination or a leaf window. */ |
25012 | 1805 if (!NILP (w->hchild)) |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1806 dim = allocate_matrices_for_frame_redisplay (w->hchild, x, y, |
25012 | 1807 dim_only_p, |
1808 window_change_flags); | |
1809 else if (!NILP (w->vchild)) | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1810 dim = allocate_matrices_for_frame_redisplay (w->vchild, x, y, |
25012 | 1811 dim_only_p, |
1812 window_change_flags); | |
1813 else | |
1814 { | |
1815 /* If not already done, allocate sub-matrix structures. */ | |
1816 if (w->desired_matrix == NULL) | |
1817 { | |
1818 w->desired_matrix = new_glyph_matrix (f->desired_pool); | |
1819 w->current_matrix = new_glyph_matrix (f->current_pool); | |
1820 *window_change_flags |= NEW_LEAF_MATRIX; | |
1821 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1822 |
25012 | 1823 /* Width and height MUST be chosen so that there are no |
1824 holes in the frame matrix. */ | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1825 dim.width = required_matrix_width (w); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1826 dim.height = required_matrix_height (w); |
25012 | 1827 |
1828 /* Will matrix be re-allocated? */ | |
1829 if (x != w->desired_matrix->matrix_x | |
1830 || y != w->desired_matrix->matrix_y | |
1831 || dim.width != w->desired_matrix->matrix_w | |
1832 || dim.height != w->desired_matrix->matrix_h | |
1833 || (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
|
1834 w->left_margin_cols) |
25012 | 1835 != w->desired_matrix->left_margin_glyphs) |
1836 || (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
|
1837 w->right_margin_cols) |
25012 | 1838 != w->desired_matrix->right_margin_glyphs)) |
1839 *window_change_flags |= CHANGED_LEAF_MATRIX; | |
1840 | |
1841 /* Actually change matrices, if allowed. Do not consider | |
1842 CHANGED_LEAF_MATRIX computed above here because the pool | |
1843 may have been changed which we don't now here. We trust | |
1844 that we only will be called with DIM_ONLY_P != 0 when | |
1845 necessary. */ | |
1846 if (!dim_only_p) | |
1847 { | |
1848 adjust_glyph_matrix (w, w->desired_matrix, x, y, dim); | |
1849 adjust_glyph_matrix (w, w->current_matrix, x, y, dim); | |
1850 } | |
1851 } | |
1852 | |
1853 /* If we are part of a horizontal combination, advance x for | |
1854 windows to the right of W; otherwise advance y for windows | |
1855 below W. */ | |
1856 if (in_horz_combination_p) | |
1857 x += dim.width; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1858 else |
25012 | 1859 y += dim.height; |
1860 | |
1861 /* Remember maximum glyph matrix dimensions. */ | |
1862 wmax = max (wmax, dim.width); | |
1863 hmax = max (hmax, dim.height); | |
1864 | |
1865 /* Next window on same level. */ | |
1866 window = w->next; | |
1867 } | |
1868 while (!NILP (window)); | |
1869 | |
1870 /* Set `total' to the total glyph matrix dimension of this window | |
1871 level. In a vertical combination, the width is the width of the | |
1872 widest window; the height is the y we finally reached, corrected | |
1873 by the y we started with. In a horizontal combination, the total | |
1874 height is the height of the tallest window, and the width is the | |
1875 x we finally reached, corrected by the x we started with. */ | |
1876 if (in_horz_combination_p) | |
1877 { | |
1878 total.width = x - x0; | |
1879 total.height = hmax; | |
1880 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1881 else |
25012 | 1882 { |
1883 total.width = wmax; | |
1884 total.height = y - y0; | |
1885 } | |
1886 | |
1887 return total; | |
1888 } | |
1889 | |
1890 | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1891 /* 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
|
1892 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1893 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1894 required_matrix_height (struct window *w) |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1895 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1896 #ifdef HAVE_WINDOW_SYSTEM |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1897 struct frame *f = XFRAME (w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1898 |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1899 if (FRAME_WINDOW_P (f)) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1900 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1901 int ch_height = FRAME_SMALLEST_FONT_HEIGHT (f); |
85252 | 1902 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
|
1903 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
|
1904 / ch_height) * w->nrows_scale_factor |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1905 /* 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
|
1906 bottom of the window. */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1907 + 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
|
1908 /* 2 for header and mode line. */ |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1909 + 2); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1910 } |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1911 #endif /* HAVE_WINDOW_SYSTEM */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1912 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1913 return WINDOW_TOTAL_LINES (w); |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1914 } |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1915 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1916 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1917 /* 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
|
1918 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1919 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1920 required_matrix_width (struct window *w) |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1921 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1922 #ifdef HAVE_WINDOW_SYSTEM |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1923 struct frame *f = XFRAME (w->frame); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1924 if (FRAME_WINDOW_P (f)) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1925 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1926 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
|
1927 int window_pixel_width = WINDOW_TOTAL_WIDTH (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1928 |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1929 /* 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
|
1930 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
|
1931 / ch_width) * w->ncols_scale_factor |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1932 /* 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
|
1933 + 2 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1934 /* One partially visible column at the right |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1935 edge of each marginal area. */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1936 + 1 + 1); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1937 } |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1938 #endif /* HAVE_WINDOW_SYSTEM */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1939 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1940 return XINT (w->total_cols); |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1941 } |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1942 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1943 |
25012 | 1944 /* 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
|
1945 window whose matrices must be allocated/reallocated. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1946 |
25012 | 1947 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1948 allocate_matrices_for_window_redisplay (struct window *w) |
25012 | 1949 { |
1950 while (w) | |
314 | 1951 { |
25012 | 1952 if (!NILP (w->vchild)) |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1953 allocate_matrices_for_window_redisplay (XWINDOW (w->vchild)); |
25012 | 1954 else if (!NILP (w->hchild)) |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1955 allocate_matrices_for_window_redisplay (XWINDOW (w->hchild)); |
25012 | 1956 else |
314 | 1957 { |
25012 | 1958 /* W is a leaf window. */ |
1959 struct dim dim; | |
1960 | |
1961 /* If matrices are not yet allocated, allocate them now. */ | |
1962 if (w->desired_matrix == NULL) | |
314 | 1963 { |
25012 | 1964 w->desired_matrix = new_glyph_matrix (NULL); |
1965 w->current_matrix = new_glyph_matrix (NULL); | |
314 | 1966 } |
25012 | 1967 |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1968 dim.width = required_matrix_width (w); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1969 dim.height = required_matrix_height (w); |
25012 | 1970 adjust_glyph_matrix (w, w->desired_matrix, 0, 0, dim); |
1971 adjust_glyph_matrix (w, w->current_matrix, 0, 0, dim); | |
1972 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1973 |
25012 | 1974 w = NILP (w->next) ? NULL : XWINDOW (w->next); |
1975 } | |
1976 } | |
1977 | |
1978 | |
1979 /* Re-allocate/ re-compute glyph matrices on frame F. If F is null, | |
1980 do it for all frames; otherwise do it just for the given frame. | |
1981 This function must be called when a new frame is created, its size | |
1982 changes, or its window configuration changes. */ | |
1983 | |
1984 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1985 adjust_glyphs (struct frame *f) |
25012 | 1986 { |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1987 /* 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
|
1988 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
|
1989 BLOCK_INPUT; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1990 |
25012 | 1991 if (f) |
1992 adjust_frame_glyphs (f); | |
1993 else | |
1994 { | |
1995 Lisp_Object tail, lisp_frame; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1996 |
25012 | 1997 FOR_EACH_FRAME (tail, lisp_frame) |
1998 adjust_frame_glyphs (XFRAME (lisp_frame)); | |
1999 } | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2000 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2001 UNBLOCK_INPUT; |
25012 | 2002 } |
2003 | |
2004 | |
2005 /* Adjust frame glyphs when Emacs is initialized. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2006 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2007 To be called from init_display. |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2008 |
25012 | 2009 We need a glyph matrix because redraw will happen soon. |
2010 Unfortunately, window sizes on selected_frame are not yet set to | |
2011 meaningful values. I believe we can assume that there are only two | |
2012 windows on the frame---the mini-buffer and the root window. Frame | |
2013 height and width seem to be correct so far. So, set the sizes of | |
2014 windows to estimated values. */ | |
2015 | |
2016 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2017 adjust_frame_glyphs_initially (void) |
25012 | 2018 { |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2019 struct frame *sf = SELECTED_FRAME (); |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2020 struct window *root = XWINDOW (sf->root_window); |
25012 | 2021 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
|
2022 int frame_lines = FRAME_LINES (sf); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2023 int frame_cols = FRAME_COLS (sf); |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2024 int top_margin = FRAME_TOP_MARGIN (sf); |
25012 | 2025 |
2026 /* 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
|
2027 XSETFASTINT (root->top_line, top_margin); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2028 XSETFASTINT (root->total_cols, frame_cols); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2029 set_window_height (sf->root_window, frame_lines - 1 - top_margin, 0); |
25012 | 2030 |
2031 /* 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
|
2032 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
|
2033 XSETFASTINT (mini->total_cols, frame_cols); |
25012 | 2034 set_window_height (root->next, 1, 0); |
2035 | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2036 adjust_frame_glyphs (sf); |
25012 | 2037 glyphs_initialized_initially_p = 1; |
2038 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2039 |
25012 | 2040 |
2041 /* Allocate/reallocate glyph matrices of a single frame F. */ | |
2042 | |
2043 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2044 adjust_frame_glyphs (struct frame *f) |
25012 | 2045 { |
2046 if (FRAME_WINDOW_P (f)) | |
2047 adjust_frame_glyphs_for_window_redisplay (f); | |
2048 else | |
2049 adjust_frame_glyphs_for_frame_redisplay (f); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2050 |
25012 | 2051 /* Don't forget the message buffer and the buffer for |
2052 decode_mode_spec. */ | |
2053 adjust_frame_message_buffer (f); | |
2054 adjust_decode_mode_spec_buffer (f); | |
2055 | |
2056 f->glyphs_initialized_p = 1; | |
2057 } | |
2058 | |
77267
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2059 /* 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
|
2060 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
|
2061 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2062 showing_window_margins_p (struct window *w) |
77267
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2063 { |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2064 while (w) |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2065 { |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2066 if (!NILP (w->hchild)) |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2067 { |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2068 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
|
2069 return 1; |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2070 } |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2071 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
|
2072 { |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2073 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
|
2074 return 1; |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2075 } |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2076 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
|
2077 || !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
|
2078 return 1; |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2079 |
77267
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2080 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
|
2081 } |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2082 return 0; |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2083 } |
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2084 |
25012 | 2085 |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2086 /* 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
|
2087 windows from the frame's current matrix. */ |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2088 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2089 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2090 fake_current_matrices (Lisp_Object window) |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2091 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2092 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2093 |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2094 for (; !NILP (window); window = w->next) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2095 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2096 w = XWINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2097 |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2098 if (!NILP (w->hchild)) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2099 fake_current_matrices (w->hchild); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2100 else if (!NILP (w->vchild)) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2101 fake_current_matrices (w->vchild); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2102 else |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2103 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2104 int i; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2105 struct frame *f = XFRAME (w->frame); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2106 struct glyph_matrix *m = w->current_matrix; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2107 struct glyph_matrix *fm = f->current_matrix; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2108 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2109 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
|
2110 xassert (m->matrix_w == WINDOW_TOTAL_COLS (w)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2111 |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2112 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
|
2113 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2114 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
|
2115 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
|
2116 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2117 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
|
2118 && 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
|
2119 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2120 r->enabled_p = fr->enabled_p; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2121 if (r->enabled_p) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2122 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2123 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
|
2124 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
|
2125 r->used[TEXT_AREA] = (m->matrix_w |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2126 - r->used[LEFT_MARGIN_AREA] |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2127 - r->used[RIGHT_MARGIN_AREA]); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2128 r->mode_line_p = 0; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2129 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2130 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2131 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2132 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2133 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2134 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2135 |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2136 /* 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
|
2137 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
|
2138 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2139 static struct glyph_matrix * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2140 save_current_matrix (struct frame *f) |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2141 { |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2142 int i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2143 struct glyph_matrix *saved; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2144 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2145 saved = (struct glyph_matrix *) xmalloc (sizeof *saved); |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
2146 memset (saved, 0, sizeof *saved); |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2147 saved->nrows = f->current_matrix->nrows; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2148 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
|
2149 * sizeof *saved->rows); |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
2150 memset (saved->rows, 0, saved->nrows * sizeof *saved->rows); |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2151 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2152 for (i = 0; i < saved->nrows; ++i) |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2153 { |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2154 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
|
2155 struct glyph_row *to = saved->rows + i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2156 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
|
2157 to->glyphs[TEXT_AREA] = (struct glyph *) xmalloc (nbytes); |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
2158 memcpy (to->glyphs[TEXT_AREA], from->glyphs[TEXT_AREA], nbytes); |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2159 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
|
2160 } |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2161 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2162 return saved; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2163 } |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2164 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2165 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2166 /* 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
|
2167 and free memory associated with SAVED. */ |
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2168 |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2169 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2170 restore_current_matrix (struct frame *f, struct glyph_matrix *saved) |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2171 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2172 int i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2173 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2174 for (i = 0; i < saved->nrows; ++i) |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2175 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2176 struct glyph_row *from = saved->rows + i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2177 struct glyph_row *to = f->current_matrix->rows + i; |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2178 size_t nbytes = from->used[TEXT_AREA] * sizeof (struct glyph); |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
2179 memcpy (to->glyphs[TEXT_AREA], from->glyphs[TEXT_AREA], nbytes); |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2180 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
|
2181 xfree (from->glyphs[TEXT_AREA]); |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2182 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2183 |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2184 xfree (saved->rows); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2185 xfree (saved); |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2186 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2187 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2188 |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2189 |
25012 | 2190 /* Allocate/reallocate glyph matrices of a single frame F for |
2191 frame-based redisplay. */ | |
2192 | |
2193 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2194 adjust_frame_glyphs_for_frame_redisplay (struct frame *f) |
25012 | 2195 { |
2196 struct dim matrix_dim; | |
2197 int pool_changed_p; | |
2198 int window_change_flags; | |
2199 int top_window_y; | |
2200 | |
2201 if (!FRAME_LIVE_P (f)) | |
2202 return; | |
2203 | |
2204 top_window_y = FRAME_TOP_MARGIN (f); | |
2205 | |
2206 /* Allocate glyph pool structures if not already done. */ | |
2207 if (f->desired_pool == NULL) | |
2208 { | |
2209 f->desired_pool = new_glyph_pool (); | |
2210 f->current_pool = new_glyph_pool (); | |
2211 } | |
2212 | |
2213 /* Allocate frames matrix structures if needed. */ | |
2214 if (f->desired_matrix == NULL) | |
2215 { | |
2216 f->desired_matrix = new_glyph_matrix (f->desired_pool); | |
2217 f->current_matrix = new_glyph_matrix (f->current_pool); | |
2218 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2219 |
25012 | 2220 /* Compute window glyph matrices. (This takes the mini-buffer |
2221 window into account). The result is the size of the frame glyph | |
2222 matrix needed. The variable window_change_flags is set to a bit | |
2223 mask indicating whether new matrices will be allocated or | |
2224 existing matrices change their size or location within the frame | |
2225 matrix. */ | |
2226 window_change_flags = 0; | |
2227 matrix_dim | |
2228 = allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f), | |
2229 0, top_window_y, | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2230 1, |
25012 | 2231 &window_change_flags); |
2232 | |
2233 /* Add in menu bar lines, if any. */ | |
2234 matrix_dim.height += top_window_y; | |
2235 | |
2236 /* Enlarge pools as necessary. */ | |
2237 pool_changed_p = realloc_glyph_pool (f->desired_pool, matrix_dim); | |
2238 realloc_glyph_pool (f->current_pool, matrix_dim); | |
2239 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2240 /* Set up glyph pointers within window matrices. Do this only if |
25012 | 2241 absolutely necessary since it requires a frame redraw. */ |
2242 if (pool_changed_p || window_change_flags) | |
2243 { | |
2244 /* Do it for window matrices. */ | |
2245 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
|
2246 0, top_window_y, 0, |
25012 | 2247 &window_change_flags); |
2248 | |
2249 /* Size of frame matrices must equal size of frame. Note | |
2250 that we are called for X frames with window widths NOT equal | |
2251 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
|
2252 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
|
2253 && matrix_dim.height == FRAME_LINES (f)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2254 |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2255 /* Pointers to glyph memory in glyph rows are exchanged during |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2256 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
|
2257 frame's current matrix consists of pointers into both the |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2258 desired and current glyph pool of the frame. Adjusting a |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2259 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
|
2260 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
|
2261 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
|
2262 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
|
2263 matrix' contents from that copy. */ |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2264 if (display_completed |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2265 && !FRAME_GARBAGED_P (f) |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2266 && 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
|
2267 && 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
|
2268 /* 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
|
2269 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
|
2270 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
|
2271 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
|
2272 && !showing_window_margins_p (XWINDOW (FRAME_ROOT_WINDOW (f)))) |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2273 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2274 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
|
2275 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
|
2276 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
|
2277 restore_current_matrix (f, copy); |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2278 fake_current_matrices (FRAME_ROOT_WINDOW (f)); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2279 } |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2280 else |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2281 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2282 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
|
2283 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
|
2284 SET_FRAME_GARBAGED (f); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2285 } |
25012 | 2286 } |
2287 } | |
2288 | |
2289 | |
2290 /* Allocate/reallocate glyph matrices of a single frame F for | |
2291 window-based redisplay. */ | |
2292 | |
2293 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2294 adjust_frame_glyphs_for_window_redisplay (struct frame *f) |
25012 | 2295 { |
2296 struct window *w; | |
2297 | |
2298 xassert (FRAME_WINDOW_P (f) && FRAME_LIVE_P (f)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2299 |
25012 | 2300 /* Allocate/reallocate window matrices. */ |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2301 allocate_matrices_for_window_redisplay (XWINDOW (FRAME_ROOT_WINDOW (f))); |
25012 | 2302 |
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
|
2303 #ifdef HAVE_X_WINDOWS |
25012 | 2304 /* Allocate/ reallocate matrices of the dummy window used to display |
2305 the menu bar under X when no X toolkit support is available. */ | |
49322 | 2306 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) |
25012 | 2307 { |
2308 /* Allocate a dummy window if not already done. */ | |
2309 if (NILP (f->menu_bar_window)) | |
2310 { | |
2311 f->menu_bar_window = make_window (); | |
2312 w = XWINDOW (f->menu_bar_window); | |
2313 XSETFRAME (w->frame, f); | |
2314 w->pseudo_window_p = 1; | |
2315 } | |
2316 else | |
2317 w = XWINDOW (f->menu_bar_window); | |
2318 | |
2319 /* Set window dimensions to frame dimensions and allocate or | |
2320 adjust glyph matrices of W. */ | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2321 XSETFASTINT (w->top_line, 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2322 XSETFASTINT (w->left_col, 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2323 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
|
2324 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
|
2325 allocate_matrices_for_window_redisplay (w); |
25012 | 2326 } |
73402
c76709b3cbc0
(adjust_frame_glyphs_for_window_redisplay): Fix #endif comments.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73383
diff
changeset
|
2327 #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
|
2328 #endif /* HAVE_X_WINDOWS */ |
25012 | 2329 |
49322 | 2330 #ifndef USE_GTK |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2331 /* 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
|
2332 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
|
2333 if (NILP (f->tool_bar_window)) |
25012 | 2334 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2335 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
|
2336 w = XWINDOW (f->tool_bar_window); |
25012 | 2337 XSETFRAME (w->frame, f); |
2338 w->pseudo_window_p = 1; | |
2339 } | |
2340 else | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2341 w = XWINDOW (f->tool_bar_window); |
25012 | 2342 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2343 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
|
2344 XSETFASTINT (w->left_col, 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2345 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
|
2346 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
|
2347 allocate_matrices_for_window_redisplay (w); |
49322 | 2348 #endif |
25012 | 2349 } |
2350 | |
2351 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2352 /* Adjust/ allocate message buffer of frame F. |
25012 | 2353 |
2354 Note that the message buffer is never freed. Since I could not | |
2355 find a free in 19.34, I assume that freeing it would be | |
2356 problematic in some way and don't do it either. | |
2357 | |
2358 (Implementation note: It should be checked if we can free it | |
2359 eventually without causing trouble). */ | |
2360 | |
2361 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2362 adjust_frame_message_buffer (struct frame *f) |
25012 | 2363 { |
2364 int size = FRAME_MESSAGE_BUF_SIZE (f) + 1; | |
2365 | |
2366 if (FRAME_MESSAGE_BUF (f)) | |
2367 { | |
2368 char *buffer = FRAME_MESSAGE_BUF (f); | |
2369 char *new_buffer = (char *) xrealloc (buffer, size); | |
2370 FRAME_MESSAGE_BUF (f) = new_buffer; | |
2371 } | |
2372 else | |
2373 FRAME_MESSAGE_BUF (f) = (char *) xmalloc (size); | |
2374 } | |
2375 | |
2376 | |
2377 /* Re-allocate buffer for decode_mode_spec on frame F. */ | |
2378 | |
2379 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2380 adjust_decode_mode_spec_buffer (struct frame *f) |
25012 | 2381 { |
2382 f->decode_mode_spec_buffer | |
2383 = (char *) xrealloc (f->decode_mode_spec_buffer, | |
2384 FRAME_MESSAGE_BUF_SIZE (f) + 1); | |
2385 } | |
2386 | |
2387 | |
2388 | |
2389 /********************************************************************** | |
2390 Freeing Glyph Matrices | |
2391 **********************************************************************/ | |
2392 | |
2393 /* Free glyph memory for a frame F. F may be null. This function can | |
2394 be called for the same frame more than once. The root window of | |
2395 F may be nil when this function is called. This is the case when | |
2396 the function is called when F is destroyed. */ | |
2397 | |
2398 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2399 free_glyphs (struct frame *f) |
25012 | 2400 { |
2401 if (f && f->glyphs_initialized_p) | |
2402 { | |
27968
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2403 /* 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
|
2404 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
|
2405 BLOCK_INPUT; |
25012 | 2406 f->glyphs_initialized_p = 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2407 |
25012 | 2408 /* Release window sub-matrices. */ |
2409 if (!NILP (f->root_window)) | |
2410 free_window_matrices (XWINDOW (f->root_window)); | |
2411 | |
2412 /* Free the dummy window for menu bars without X toolkit and its | |
2413 glyph matrices. */ | |
2414 if (!NILP (f->menu_bar_window)) | |
2415 { | |
2416 struct window *w = XWINDOW (f->menu_bar_window); | |
2417 free_glyph_matrix (w->desired_matrix); | |
2418 free_glyph_matrix (w->current_matrix); | |
2419 w->desired_matrix = w->current_matrix = NULL; | |
2420 f->menu_bar_window = Qnil; | |
2421 } | |
2422 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2423 /* 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
|
2424 if (!NILP (f->tool_bar_window)) |
25012 | 2425 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2426 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 2427 free_glyph_matrix (w->desired_matrix); |
2428 free_glyph_matrix (w->current_matrix); | |
2429 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
|
2430 f->tool_bar_window = Qnil; |
25012 | 2431 } |
2432 | |
2433 /* Release frame glyph matrices. Reset fields to zero in | |
2434 case we are called a second time. */ | |
2435 if (f->desired_matrix) | |
2436 { | |
2437 free_glyph_matrix (f->desired_matrix); | |
2438 free_glyph_matrix (f->current_matrix); | |
2439 f->desired_matrix = f->current_matrix = NULL; | |
2440 } | |
2441 | |
2442 /* Release glyph pools. */ | |
2443 if (f->desired_pool) | |
2444 { | |
2445 free_glyph_pool (f->desired_pool); | |
2446 free_glyph_pool (f->current_pool); | |
2447 f->desired_pool = f->current_pool = NULL; | |
314 | 2448 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2449 |
27968
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2450 UNBLOCK_INPUT; |
314 | 2451 } |
2452 } | |
2453 | |
25012 | 2454 |
2455 /* Free glyph sub-matrices in the window tree rooted at W. This | |
2456 function may be called with a null pointer, and it may be called on | |
2457 the same tree more than once. */ | |
2458 | |
2459 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2460 free_window_matrices (struct window *w) |
25012 | 2461 { |
2462 while (w) | |
2463 { | |
2464 if (!NILP (w->hchild)) | |
2465 free_window_matrices (XWINDOW (w->hchild)); | |
2466 else if (!NILP (w->vchild)) | |
2467 free_window_matrices (XWINDOW (w->vchild)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2468 else |
25012 | 2469 { |
2470 /* This is a leaf window. Free its memory and reset fields | |
2471 to zero in case this function is called a second time for | |
2472 W. */ | |
2473 free_glyph_matrix (w->current_matrix); | |
2474 free_glyph_matrix (w->desired_matrix); | |
2475 w->current_matrix = w->desired_matrix = NULL; | |
2476 } | |
2477 | |
2478 /* Next window on same level. */ | |
2479 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
2480 } | |
2481 } | |
2482 | |
2483 | |
2484 /* Check glyph memory leaks. This function is called from | |
2485 shut_down_emacs. Note that frames are not destroyed when Emacs | |
2486 exits. We therefore free all glyph memory for all active frames | |
2487 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
|
2488 |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2489 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2490 check_glyph_memory (void) |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2491 { |
25012 | 2492 Lisp_Object tail, frame; |
2493 | |
2494 /* Free glyph memory for all frames. */ | |
2495 FOR_EACH_FRAME (tail, frame) | |
2496 free_glyphs (XFRAME (frame)); | |
2497 | |
2498 /* Check that nothing is left allocated. */ | |
2499 if (glyph_matrix_count) | |
2500 abort (); | |
2501 if (glyph_pool_count) | |
2502 abort (); | |
2503 } | |
2504 | |
2505 | |
2506 | |
2507 /********************************************************************** | |
2508 Building a Frame Matrix | |
2509 **********************************************************************/ | |
2510 | |
2511 /* Most of the redisplay code works on glyph matrices attached to | |
2512 windows. This is a good solution most of the time, but it is not | |
2513 suitable for terminal code. Terminal output functions cannot rely | |
2514 on being able to set an arbitrary terminal window. Instead they | |
2515 must be provided with a view of the whole frame, i.e. the whole | |
2516 screen. We build such a view by constructing a frame matrix from | |
2517 window matrices in this section. | |
2518 | |
2519 Windows that must be updated have their must_be_update_p flag set. | |
2520 For all such windows, their desired matrix is made part of the | |
2521 desired frame matrix. For other windows, their current matrix is | |
2522 made part of the desired frame matrix. | |
2523 | |
2524 +-----------------+----------------+ | |
2525 | desired | desired | | |
2526 | | | | |
2527 +-----------------+----------------+ | |
2528 | current | | |
2529 | | | |
2530 +----------------------------------+ | |
2531 | |
2532 Desired window matrices can be made part of the frame matrix in a | |
2533 cheap way: We exploit the fact that the desired frame matrix and | |
2534 desired window matrices share their glyph memory. This is not | |
2535 possible for current window matrices. Their glyphs are copied to | |
2536 the desired frame matrix. The latter is equivalent to | |
2537 preserve_other_columns in the old redisplay. | |
2538 | |
2539 Used glyphs counters for frame matrix rows are the result of adding | |
2540 up glyph lengths of the window matrices. A line in the frame | |
2541 matrix is enabled, if a corresponding line in a window matrix is | |
2542 enabled. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2543 |
25012 | 2544 After building the desired frame matrix, it will be passed to |
2545 terminal code, which will manipulate both the desired and current | |
2546 frame matrix. Changes applied to the frame's current matrix have | |
2547 to be visible in current window matrices afterwards, of course. | |
2548 | |
2549 This problem is solved like this: | |
2550 | |
2551 1. Window and frame matrices share glyphs. Window matrices are | |
2552 constructed in a way that their glyph contents ARE the glyph | |
2553 contents needed in a frame matrix. Thus, any modification of | |
2554 glyphs done in terminal code will be reflected in window matrices | |
2555 automatically. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2556 |
25012 | 2557 2. Exchanges of rows in a frame matrix done by terminal code are |
2558 intercepted by hook functions so that corresponding row operations | |
2559 on window matrices can be performed. This is necessary because we | |
2560 use pointers to glyphs in glyph row structures. To satisfy the | |
2561 assumption of point 1 above that glyphs are updated implicitly in | |
2562 window matrices when they are manipulated via the frame matrix, | |
2563 window and frame matrix must of course agree where to find the | |
2564 glyphs for their rows. Possible manipulations that must be | |
2565 mirrored are assignments of rows of the desired frame matrix to the | |
2566 current frame matrix and scrolling the current frame matrix. */ | |
2567 | |
2568 /* Build frame F's desired matrix from window matrices. Only windows | |
2569 which have the flag must_be_updated_p set have to be updated. Menu | |
2570 bar lines of a frame are not covered by window matrices, so make | |
2571 sure not to touch them in this function. */ | |
2572 | |
2573 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2574 build_frame_matrix (struct frame *f) |
25012 | 2575 { |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2576 int i; |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2577 |
25012 | 2578 /* F must have a frame matrix when this function is called. */ |
2579 xassert (!FRAME_WINDOW_P (f)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2580 |
25012 | 2581 /* Clear all rows in the frame matrix covered by window matrices. |
2582 Menu bar lines are not covered by windows. */ | |
2583 for (i = FRAME_TOP_MARGIN (f); i < f->desired_matrix->nrows; ++i) | |
2584 clear_glyph_row (MATRIX_ROW (f->desired_matrix, i)); | |
2585 | |
2586 /* Build the matrix by walking the window tree. */ | |
2587 build_frame_matrix_from_window_tree (f->desired_matrix, | |
2588 XWINDOW (FRAME_ROOT_WINDOW (f))); | |
2589 } | |
2590 | |
2591 | |
2592 /* Walk a window tree, building a frame matrix MATRIX from window | |
2593 matrices. W is the root of a window tree. */ | |
2594 | |
2595 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2596 build_frame_matrix_from_window_tree (struct glyph_matrix *matrix, struct window *w) |
25012 | 2597 { |
2598 while (w) | |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2599 { |
25012 | 2600 if (!NILP (w->hchild)) |
2601 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->hchild)); | |
2602 else if (!NILP (w->vchild)) | |
2603 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->vchild)); | |
2604 else | |
2605 build_frame_matrix_from_leaf_window (matrix, w); | |
2606 | |
2607 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
|
2608 } |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2609 } |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2610 |
25012 | 2611 |
2612 /* Add a window's matrix to a frame matrix. FRAME_MATRIX is the | |
2613 desired frame matrix built. W is a leaf window whose desired or | |
2614 current matrix is to be added to FRAME_MATRIX. W's flag | |
2615 must_be_updated_p determines which matrix it contributes to | |
2616 FRAME_MATRIX. If must_be_updated_p is non-zero, W's desired matrix | |
2617 is added to FRAME_MATRIX, otherwise W's current matrix is added. | |
2618 Adding a desired matrix means setting up used counters and such in | |
2619 frame rows, while adding a current window matrix to FRAME_MATRIX | |
2620 means copying glyphs. The latter case corresponds to | |
2621 preserve_other_columns in the old redisplay. */ | |
2622 | |
2623 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2624 build_frame_matrix_from_leaf_window (struct glyph_matrix *frame_matrix, struct window *w) |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2625 { |
25012 | 2626 struct glyph_matrix *window_matrix; |
2627 int window_y, frame_y; | |
2628 /* 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
|
2629 GLYPH right_border_glyph; |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2630 |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2631 SET_GLYPH_FROM_CHAR (right_border_glyph, 0); |
25012 | 2632 |
2633 /* Set window_matrix to the matrix we have to add to FRAME_MATRIX. */ | |
2634 if (w->must_be_updated_p) | |
2635 { | |
2636 window_matrix = w->desired_matrix; | |
2637 | |
2638 /* Decide whether we want to add a vertical border glyph. */ | |
2639 if (!WINDOW_RIGHTMOST_P (w)) | |
2640 { | |
2641 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
|
2642 Lisp_Object gc; |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2643 |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2644 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
|
2645 if (dp |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2646 && (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
|
2647 && 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
|
2648 { |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2649 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
|
2650 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
|
2651 } |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2652 |
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2653 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
|
2654 SET_GLYPH_FACE (right_border_glyph, VERTICAL_BORDER_FACE_ID); |
25012 | 2655 } |
2656 } | |
2657 else | |
2658 window_matrix = w->current_matrix; | |
2659 | |
2660 /* For all rows in the window matrix and corresponding rows in the | |
2661 frame matrix. */ | |
2662 window_y = 0; | |
2663 frame_y = window_matrix->matrix_y; | |
2664 while (window_y < window_matrix->nrows) | |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2665 { |
25012 | 2666 struct glyph_row *frame_row = frame_matrix->rows + frame_y; |
2667 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
|
2668 int current_row_p = window_matrix == w->current_matrix; |
25012 | 2669 |
2670 /* Fill up the frame row with spaces up to the left margin of the | |
2671 window row. */ | |
2672 fill_up_frame_row_with_spaces (frame_row, window_matrix->matrix_x); | |
2673 | |
2674 /* Fill up areas in the window matrix row with spaces. */ | |
2675 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
|
2676 |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2677 /* 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
|
2678 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
|
2679 row instead. */ |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2680 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
|
2681 && !window_row->enabled_p) |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2682 { |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2683 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
|
2684 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
|
2685 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2686 |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2687 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
|
2688 { |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2689 /* Copy window row to frame row. */ |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
2690 memcpy (frame_row->glyphs[TEXT_AREA] + window_matrix->matrix_x, |
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
2691 window_row->glyphs[0], |
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
2692 window_matrix->matrix_w * sizeof (struct glyph)); |
25012 | 2693 } |
2694 else | |
2695 { | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2696 xassert (window_row->enabled_p); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2697 |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2698 /* 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
|
2699 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
|
2700 frame_row->enabled_p = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2701 |
25012 | 2702 /* Maybe insert a vertical border between horizontally adjacent |
2703 windows. */ | |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2704 if (GLYPH_CHAR (right_border_glyph) != 0) |
25012 | 2705 { |
2706 struct glyph *border = window_row->glyphs[LAST_AREA] - 1; | |
2707 SET_CHAR_GLYPH_FROM_GLYPH (*border, right_border_glyph); | |
2708 } | |
2709 | |
59902
4a0a167cb6c4
(build_frame_matrix_from_leaf_window)
Kim F. Storm <storm@cua.dk>
parents:
59879
diff
changeset
|
2710 #if GLYPH_DEBUG |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2711 /* 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
|
2712 frame_y. */ |
25012 | 2713 xassert (glyph_row_slice_p (window_row, frame_row)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2714 |
25012 | 2715 /* If rows are in sync, we don't have to copy glyphs because |
2716 frame and window share glyphs. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2717 |
25241
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2718 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
|
2719 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
|
2720 #endif |
25012 | 2721 } |
2722 | |
2723 /* Set number of used glyphs in the frame matrix. Since we fill | |
2724 up with spaces, and visit leaf windows from left to right it | |
2725 can be done simply. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2726 frame_row->used[TEXT_AREA] |
25012 | 2727 = window_matrix->matrix_x + window_matrix->matrix_w; |
2728 | |
2729 /* Next row. */ | |
2730 ++window_y; | |
2731 ++frame_y; | |
2732 } | |
2733 } | |
2734 | |
63547
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2735 /* 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
|
2736 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
|
2737 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
|
2738 for instance, vertical separators, truncation markers, etc. */ |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2739 |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2740 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2741 spec_glyph_lookup_face (struct window *w, GLYPH *glyph) |
63547
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2742 { |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2743 int lface_id = GLYPH_FACE (*glyph); |
63547
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2744 /* 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
|
2745 if (lface_id > 0) |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2746 { |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2747 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
|
2748 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
|
2749 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
|
2750 } |
63547
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2751 } |
25012 | 2752 |
2753 /* Add spaces to a glyph row ROW in a window matrix. | |
2754 | |
2755 Each row has the form: | |
2756 | |
2757 +---------+-----------------------------+------------+ | |
2758 | left | text | right | | |
2759 +---------+-----------------------------+------------+ | |
2760 | |
2761 Left and right marginal areas are optional. This function adds | |
2762 spaces to areas so that there are no empty holes between areas. | |
2763 In other words: If the right area is not empty, the text area | |
2764 is filled up with spaces up to the right area. If the text area | |
2765 is not empty, the left area is filled up. | |
2766 | |
2767 To be called for frame-based redisplay, only. */ | |
2768 | |
2769 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2770 fill_up_glyph_row_with_spaces (struct glyph_row *row) |
25012 | 2771 { |
2772 fill_up_glyph_row_area_with_spaces (row, LEFT_MARGIN_AREA); | |
2773 fill_up_glyph_row_area_with_spaces (row, TEXT_AREA); | |
2774 fill_up_glyph_row_area_with_spaces (row, RIGHT_MARGIN_AREA); | |
2775 } | |
2776 | |
2777 | |
2778 /* Fill area AREA of glyph row ROW with spaces. To be called for | |
2779 frame-based redisplay only. */ | |
2780 | |
2781 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2782 fill_up_glyph_row_area_with_spaces (struct glyph_row *row, int area) |
25012 | 2783 { |
2784 if (row->glyphs[area] < row->glyphs[area + 1]) | |
2785 { | |
2786 struct glyph *end = row->glyphs[area + 1]; | |
2787 struct glyph *text = row->glyphs[area] + row->used[area]; | |
2788 | |
2789 while (text < end) | |
2790 *text++ = space_glyph; | |
2791 row->used[area] = text - row->glyphs[area]; | |
2792 } | |
2793 } | |
2794 | |
2795 | |
2796 /* Add spaces to the end of ROW in a frame matrix until index UPTO is | |
2797 reached. In frame matrices only one area, TEXT_AREA, is used. */ | |
2798 | |
2799 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2800 fill_up_frame_row_with_spaces (struct glyph_row *row, int upto) |
25012 | 2801 { |
2802 int i = row->used[TEXT_AREA]; | |
2803 struct glyph *glyph = row->glyphs[TEXT_AREA]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2804 |
25012 | 2805 while (i < upto) |
2806 glyph[i++] = space_glyph; | |
2807 | |
2808 row->used[TEXT_AREA] = i; | |
2809 } | |
2810 | |
2811 | |
2812 | |
2813 /********************************************************************** | |
2814 Mirroring operations on frame matrices in window matrices | |
2815 **********************************************************************/ | |
2816 | |
2817 /* Set frame being updated via frame-based redisplay to F. This | |
2818 function must be called before updates to make explicit that we are | |
2819 working on frame matrices or not. */ | |
2820 | |
2821 static INLINE void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2822 set_frame_matrix_frame (struct frame *f) |
25012 | 2823 { |
2824 frame_matrix_frame = f; | |
2825 } | |
2826 | |
2827 | |
2828 /* Make sure glyph row ROW in CURRENT_MATRIX is up to date. | |
2829 DESIRED_MATRIX is the desired matrix corresponding to | |
2830 CURRENT_MATRIX. The update is done by exchanging glyph pointers | |
2831 between rows in CURRENT_MATRIX and DESIRED_MATRIX. If | |
2832 frame_matrix_frame is non-null, this indicates that the exchange is | |
2833 done in frame matrices, and that we have to perform analogous | |
2834 operations in window matrices of frame_matrix_frame. */ | |
2835 | |
2836 static INLINE void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2837 make_current (struct glyph_matrix *desired_matrix, struct glyph_matrix *current_matrix, int row) |
25012 | 2838 { |
2839 struct glyph_row *current_row = MATRIX_ROW (current_matrix, row); | |
2840 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
|
2841 int mouse_face_p = current_row->mouse_face_p; |
25012 | 2842 |
2843 /* Do current_row = desired_row. This exchanges glyph pointers | |
2844 between both rows, and does a structure assignment otherwise. */ | |
2845 assign_row (current_row, desired_row); | |
2846 | |
2847 /* Enable current_row to mark it as valid. */ | |
2848 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
|
2849 current_row->mouse_face_p = mouse_face_p; |
25012 | 2850 |
2851 /* If we are called on frame matrices, perform analogous operations | |
2852 for window matrices. */ | |
2853 if (frame_matrix_frame) | |
2854 mirror_make_current (XWINDOW (frame_matrix_frame->root_window), row); | |
2855 } | |
2856 | |
2857 | |
2858 /* W is the root of a window tree. FRAME_ROW is the index of a row in | |
2859 W's frame which has been made current (by swapping pointers between | |
2860 current and desired matrix). Perform analogous operations in the | |
2861 matrices of leaf windows in the window tree rooted at W. */ | |
2862 | |
2863 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2864 mirror_make_current (struct window *w, int frame_row) |
25012 | 2865 { |
2866 while (w) | |
2867 { | |
2868 if (!NILP (w->hchild)) | |
2869 mirror_make_current (XWINDOW (w->hchild), frame_row); | |
2870 else if (!NILP (w->vchild)) | |
2871 mirror_make_current (XWINDOW (w->vchild), frame_row); | |
2872 else | |
2873 { | |
2874 /* Row relative to window W. Don't use FRAME_TO_WINDOW_VPOS | |
2875 here because the checks performed in debug mode there | |
2876 will not allow the conversion. */ | |
2877 int row = frame_row - w->desired_matrix->matrix_y; | |
2878 | |
2879 /* If FRAME_ROW is within W, assign the desired row to the | |
2880 current row (exchanging glyph pointers). */ | |
2881 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
|
2882 { |
25012 | 2883 struct glyph_row *current_row |
2884 = MATRIX_ROW (w->current_matrix, row); | |
2885 struct glyph_row *desired_row | |
2886 = 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
|
2887 |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2888 if (desired_row->enabled_p) |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2889 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
|
2890 else |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2891 swap_glyph_pointers (desired_row, current_row); |
25012 | 2892 current_row->enabled_p = 1; |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2893 } |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2894 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2895 |
25012 | 2896 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2897 } |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2898 } |
25012 | 2899 |
2900 | |
2901 /* Perform row dance after scrolling. We are working on the range of | |
2902 lines UNCHANGED_AT_TOP + 1 to UNCHANGED_AT_TOP + NLINES (not | |
2903 including) in MATRIX. COPY_FROM is a vector containing, for each | |
2904 row I in the range 0 <= I < NLINES, the index of the original line | |
2905 to move to I. This index is relative to the row range, i.e. 0 <= | |
2906 index < NLINES. RETAINED_P is a vector containing zero for each | |
2907 row 0 <= I < NLINES which is empty. | |
2908 | |
2909 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
|
2910 |
25012 | 2911 void |
109360
f37b85834f7e
Convert more function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109179
diff
changeset
|
2912 mirrored_line_dance (struct glyph_matrix *matrix, int unchanged_at_top, int nlines, |
f37b85834f7e
Convert more function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109179
diff
changeset
|
2913 int *copy_from, char *retained_p) |
25012 | 2914 { |
2915 /* A copy of original rows. */ | |
2916 struct glyph_row *old_rows; | |
2917 | |
2918 /* Rows to assign to. */ | |
2919 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
|
2920 |
25012 | 2921 int i; |
2922 | |
2923 /* Make a copy of the original rows. */ | |
2924 old_rows = (struct glyph_row *) alloca (nlines * sizeof *old_rows); | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
2925 memcpy (old_rows, new_rows, nlines * sizeof *old_rows); |
25012 | 2926 |
2927 /* Assign new rows, maybe clear lines. */ | |
2928 for (i = 0; i < nlines; ++i) | |
2929 { | |
2930 int enabled_before_p = new_rows[i].enabled_p; | |
2931 | |
2932 xassert (i + unchanged_at_top < matrix->nrows); | |
2933 xassert (unchanged_at_top + copy_from[i] < matrix->nrows); | |
2934 new_rows[i] = old_rows[copy_from[i]]; | |
2935 new_rows[i].enabled_p = enabled_before_p; | |
2936 | |
2937 /* RETAINED_P is zero for empty lines. */ | |
2938 if (!retained_p[copy_from[i]]) | |
2939 new_rows[i].enabled_p = 0; | |
2940 } | |
2941 | |
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
|
2942 /* Do the same for window matrices, if MATRIX is a frame matrix. */ |
25012 | 2943 if (frame_matrix_frame) |
2944 mirror_line_dance (XWINDOW (frame_matrix_frame->root_window), | |
2945 unchanged_at_top, nlines, copy_from, retained_p); | |
2946 } | |
2947 | |
2948 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2949 /* 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
|
2950 the current frame matrix. */ |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2951 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2952 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2953 sync_window_with_frame_matrix_rows (struct window *w) |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2954 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2955 struct frame *f = XFRAME (w->frame); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2956 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
|
2957 int left, right, x, width; |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
2958 |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
2959 /* 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
|
2960 xassert (NILP (w->hchild) && NILP (w->vchild)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2961 xassert (!FRAME_WINDOW_P (f)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2962 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2963 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
|
2964 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
|
2965 x = w->current_matrix->matrix_x; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
2966 width = w->current_matrix->matrix_w; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
2967 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2968 window_row = w->current_matrix->rows; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2969 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
|
2970 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
|
2971 |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
2972 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
|
2973 { |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
2974 window_row->glyphs[LEFT_MARGIN_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
2975 = frame_row->glyphs[0] + x; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
2976 window_row->glyphs[TEXT_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
2977 = window_row->glyphs[LEFT_MARGIN_AREA] + left; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
2978 window_row->glyphs[LAST_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
2979 = window_row->glyphs[LEFT_MARGIN_AREA] + width; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
2980 window_row->glyphs[RIGHT_MARGIN_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
2981 = window_row->glyphs[LAST_AREA] - right; |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2982 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2983 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2984 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2985 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2986 /* 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
|
2987 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
|
2988 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2989 struct window * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2990 frame_row_to_window (struct window *w, int row) |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2991 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2992 struct window *found = NULL; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2993 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2994 while (w && !found) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2995 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2996 if (!NILP (w->hchild)) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2997 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
|
2998 else if (!NILP (w->vchild)) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2999 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
|
3000 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
|
3001 && row < WINDOW_BOTTOM_EDGE_LINE (w)) |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3002 found = w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3003 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3004 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3005 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3006 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3007 return found; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3008 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3009 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3010 |
25012 | 3011 /* Perform a line dance in the window tree rooted at W, after |
3012 scrolling a frame matrix in mirrored_line_dance. | |
3013 | |
3014 We are working on the range of lines UNCHANGED_AT_TOP + 1 to | |
3015 UNCHANGED_AT_TOP + NLINES (not including) in W's frame matrix. | |
3016 COPY_FROM is a vector containing, for each row I in the range 0 <= | |
3017 I < NLINES, the index of the original line to move to I. This | |
3018 index is relative to the row range, i.e. 0 <= index < NLINES. | |
3019 RETAINED_P is a vector containing zero for each row 0 <= I < NLINES | |
3020 which is empty. */ | |
3021 | |
3022 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3023 mirror_line_dance (struct window *w, int unchanged_at_top, int nlines, int *copy_from, char *retained_p) |
25012 | 3024 { |
3025 while (w) | |
3026 { | |
3027 if (!NILP (w->hchild)) | |
3028 mirror_line_dance (XWINDOW (w->hchild), unchanged_at_top, | |
3029 nlines, copy_from, retained_p); | |
3030 else if (!NILP (w->vchild)) | |
3031 mirror_line_dance (XWINDOW (w->vchild), unchanged_at_top, | |
3032 nlines, copy_from, retained_p); | |
3033 else | |
3034 { | |
3035 /* W is a leaf window, and we are working on its current | |
3036 matrix m. */ | |
3037 struct glyph_matrix *m = w->current_matrix; | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3038 int i, sync_p = 0; |
25012 | 3039 struct glyph_row *old_rows; |
3040 | |
3041 /* Make a copy of the original rows of matrix m. */ | |
3042 old_rows = (struct glyph_row *) alloca (m->nrows * sizeof *old_rows); | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
3043 memcpy (old_rows, m->rows, m->nrows * sizeof *old_rows); |
25012 | 3044 |
3045 for (i = 0; i < nlines; ++i) | |
3046 { | |
3047 /* Frame relative line assigned to. */ | |
3048 int frame_to = i + unchanged_at_top; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3049 |
25012 | 3050 /* Frame relative line assigned. */ |
3051 int frame_from = copy_from[i] + unchanged_at_top; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3052 |
25012 | 3053 /* Window relative line assigned to. */ |
3054 int window_to = frame_to - m->matrix_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3055 |
25012 | 3056 /* Window relative line assigned. */ |
3057 int window_from = frame_from - m->matrix_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3058 |
25012 | 3059 /* Is assigned line inside window? */ |
3060 int from_inside_window_p | |
3061 = window_from >= 0 && window_from < m->matrix_h; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3062 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3063 /* Is assigned to line inside window? */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3064 int to_inside_window_p |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3065 = window_to >= 0 && window_to < m->matrix_h; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3066 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3067 if (from_inside_window_p && to_inside_window_p) |
25012 | 3068 { |
3069 /* Enabled setting before assignment. */ | |
3070 int enabled_before_p; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3071 |
25012 | 3072 /* Do the assignment. The enabled_p flag is saved |
3073 over the assignment because the old redisplay did | |
3074 that. */ | |
3075 enabled_before_p = m->rows[window_to].enabled_p; | |
3076 m->rows[window_to] = old_rows[window_from]; | |
3077 m->rows[window_to].enabled_p = enabled_before_p; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3078 |
25012 | 3079 /* If frame line is empty, window line is empty, too. */ |
3080 if (!retained_p[copy_from[i]]) | |
3081 m->rows[window_to].enabled_p = 0; | |
3082 } | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3083 else if (to_inside_window_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3084 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3085 /* A copy between windows. This is an infrequent |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3086 case not worth optimizing. */ |
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 window *root = XWINDOW (FRAME_ROOT_WINDOW (f)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3089 struct window *w2; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3090 struct glyph_matrix *m2; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3091 int m2_from; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3092 |
60684
18bf961ed63a
(mirror_line_dance): Set W2 according to FRAME_FROM.
Richard M. Stallman <rms@gnu.org>
parents:
59905
diff
changeset
|
3093 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
|
3094 /* 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
|
3095 -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
|
3096 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
|
3097 if (w2) |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3098 { |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3099 m2 = w2->current_matrix; |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3100 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
|
3101 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
|
3102 m2->rows + m2_from); |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3103 |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3104 /* 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
|
3105 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
|
3106 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
|
3107 } |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3108 sync_p = 1; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3109 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3110 else if (from_inside_window_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3111 sync_p = 1; |
25012 | 3112 } |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3113 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3114 /* 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
|
3115 pointers are in sync with the frame matrix. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3116 if (sync_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3117 sync_window_with_frame_matrix_rows (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3118 |
25012 | 3119 /* Check that no pointers are lost. */ |
3120 CHECK_MATRIX (m); | |
3121 } | |
3122 | |
3123 /* Next window on same level. */ | |
3124 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
3125 } | |
3126 } | |
3127 | |
3128 | |
3129 #if GLYPH_DEBUG | |
3130 | |
3131 /* Check that window and frame matrices agree about their | |
3132 understanding where glyphs of the rows are to find. For each | |
3133 window in the window tree rooted at W, check that rows in the | |
3134 matrices of leaf window agree with their frame matrices about | |
3135 glyph pointers. */ | |
314 | 3136 |
21514 | 3137 void |
25012 | 3138 check_window_matrix_pointers (w) |
314 | 3139 struct window *w; |
3140 { | |
25012 | 3141 while (w) |
3142 { | |
3143 if (!NILP (w->hchild)) | |
3144 check_window_matrix_pointers (XWINDOW (w->hchild)); | |
3145 else if (!NILP (w->vchild)) | |
3146 check_window_matrix_pointers (XWINDOW (w->vchild)); | |
3147 else | |
3148 { | |
3149 struct frame *f = XFRAME (w->frame); | |
3150 check_matrix_pointers (w->desired_matrix, f->desired_matrix); | |
3151 check_matrix_pointers (w->current_matrix, f->current_matrix); | |
3152 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3153 |
25012 | 3154 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
3155 } | |
3156 } | |
3157 | |
3158 | |
3159 /* Check that window rows are slices of frame rows. WINDOW_MATRIX is | |
3160 a window and FRAME_MATRIX is the corresponding frame matrix. For | |
3161 each row in WINDOW_MATRIX check that it's a slice of the | |
3162 corresponding frame row. If it isn't, abort. */ | |
3163 | |
3164 static void | |
3165 check_matrix_pointers (window_matrix, frame_matrix) | |
3166 struct glyph_matrix *window_matrix, *frame_matrix; | |
3167 { | |
3168 /* Row number in WINDOW_MATRIX. */ | |
3169 int i = 0; | |
3170 | |
3171 /* Row number corresponding to I in FRAME_MATRIX. */ | |
3172 int j = window_matrix->matrix_y; | |
3173 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3174 /* For all rows check that the row in the window matrix is a |
25012 | 3175 slice of the row in the frame matrix. If it isn't we didn't |
3176 mirror an operation on the frame matrix correctly. */ | |
3177 while (i < window_matrix->nrows) | |
3178 { | |
3179 if (!glyph_row_slice_p (window_matrix->rows + i, | |
3180 frame_matrix->rows + j)) | |
3181 abort (); | |
3182 ++i, ++j; | |
3183 } | |
3184 } | |
3185 | |
3186 #endif /* GLYPH_DEBUG != 0 */ | |
3187 | |
3188 | |
3189 | |
3190 /********************************************************************** | |
3191 VPOS and HPOS translations | |
3192 **********************************************************************/ | |
3193 | |
3194 #if GLYPH_DEBUG | |
3195 | |
3196 /* Translate vertical position VPOS which is relative to window W to a | |
3197 vertical position relative to W's frame. */ | |
3198 | |
3199 static int | |
3200 window_to_frame_vpos (w, vpos) | |
3201 struct window *w; | |
3202 int vpos; | |
3203 { | |
3204 struct frame *f = XFRAME (w->frame); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3205 |
25012 | 3206 xassert (!FRAME_WINDOW_P (f)); |
3207 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
|
3208 vpos += WINDOW_TOP_EDGE_LINE (w); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3209 xassert (vpos >= 0 && vpos <= FRAME_LINES (f)); |
25012 | 3210 return vpos; |
3211 } | |
3212 | |
3213 | |
3214 /* 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
|
3215 a horizontal position relative to W's frame. */ |
25012 | 3216 |
3217 static int | |
3218 window_to_frame_hpos (w, hpos) | |
3219 struct window *w; | |
3220 int hpos; | |
3221 { | |
65308
7b2a711dc863
(window_to_frame_hpos, update_window):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65016
diff
changeset
|
3222 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
|
3223 hpos += WINDOW_LEFT_EDGE_COL (w); |
25012 | 3224 return hpos; |
314 | 3225 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3226 |
25012 | 3227 #endif /* GLYPH_DEBUG */ |
3228 | |
3229 | |
314 | 3230 |
25012 | 3231 /********************************************************************** |
3232 Redrawing Frames | |
3233 **********************************************************************/ | |
3234 | |
3235 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
|
3236 doc: /* Clear frame FRAME and output again what is supposed to appear on it. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
3237 (Lisp_Object frame) |
25012 | 3238 { |
3239 struct frame *f; | |
3240 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
3241 CHECK_LIVE_FRAME (frame); |
25012 | 3242 f = XFRAME (frame); |
3243 | |
3244 /* Ignore redraw requests, if frame has no glyphs yet. | |
3245 (Implementation note: It still has to be checked why we are | |
3246 called so early here). */ | |
3247 if (!glyphs_initialized_initially_p) | |
3248 return Qnil; | |
3249 | |
3250 update_begin (f); | |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3251 #ifdef MSDOS |
35445
9af454aee182
(Fredraw_frame): Remove reference to
Andrew Innes <andrewi@gnu.org>
parents:
35374
diff
changeset
|
3252 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
|
3253 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
|
3254 #endif |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
3255 clear_frame (f); |
25012 | 3256 clear_current_matrices (f); |
3257 update_end (f); | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3258 if (FRAME_TERMCAP_P (f)) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3259 fflush (FRAME_TTY (f)->output); |
25012 | 3260 windows_or_buffers_changed++; |
3261 /* Mark all windows as inaccurate, so that every window will have | |
3262 its redisplay done. */ | |
3263 mark_window_display_accurate (FRAME_ROOT_WINDOW (f), 0); | |
3264 set_window_update_flags (XWINDOW (FRAME_ROOT_WINDOW (f)), 1); | |
3265 f->garbaged = 0; | |
3266 return Qnil; | |
3267 } | |
3268 | |
3269 | |
3270 /* Redraw frame F. This is nothing more than a call to the Lisp | |
3271 function redraw-frame. */ | |
3272 | |
3273 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3274 redraw_frame (struct frame *f) |
25012 | 3275 { |
3276 Lisp_Object frame; | |
3277 XSETFRAME (frame, f); | |
3278 Fredraw_frame (frame); | |
3279 } | |
3280 | |
3281 | |
3282 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
|
3283 doc: /* Clear and redisplay all visible frames. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
3284 (void) |
25012 | 3285 { |
3286 Lisp_Object tail, frame; | |
3287 | |
3288 FOR_EACH_FRAME (tail, frame) | |
3289 if (FRAME_VISIBLE_P (XFRAME (frame))) | |
3290 Fredraw_frame (frame); | |
3291 | |
3292 return Qnil; | |
3293 } | |
3294 | |
3295 | |
3296 /* This is used when frame_garbaged is set. Call Fredraw_frame on all | |
3297 visible frames marked as garbaged. */ | |
3298 | |
3299 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3300 redraw_garbaged_frames (void) |
25012 | 3301 { |
3302 Lisp_Object tail, frame; | |
3303 | |
3304 FOR_EACH_FRAME (tail, frame) | |
3305 if (FRAME_VISIBLE_P (XFRAME (frame)) | |
3306 && FRAME_GARBAGED_P (XFRAME (frame))) | |
3307 Fredraw_frame (frame); | |
3308 } | |
3309 | |
3310 | |
3311 | |
3312 /*********************************************************************** | |
3313 Frame Update | |
3314 ***********************************************************************/ | |
3315 | |
3316 /* Update frame F based on the data in desired matrices. | |
3317 | |
3318 If FORCE_P is non-zero, don't let redisplay be stopped by detecting | |
3319 pending input. If INHIBIT_HAIRY_ID_P is non-zero, don't try | |
3320 scrolling. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3321 |
25012 | 3322 Value is non-zero if redisplay was stopped due to pending input. */ |
314 | 3323 |
3324 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3325 update_frame (struct frame *f, int force_p, int inhibit_hairy_id_p) |
25012 | 3326 { |
3327 /* 1 means display has been paused because of pending input. */ | |
3328 int paused_p; | |
3329 struct window *root_window = XWINDOW (f->root_window); | |
3330 | |
76065
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
3331 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
|
3332 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
|
3333 #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
|
3334 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
|
3335 force_p = 1; |
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
3336 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
|
3337 { |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3338 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
|
3339 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
|
3340 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
|
3341 |
71378
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3342 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
|
3343 { |
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3344 paused_p = 1; |
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3345 goto do_pause; |
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3346 } |
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3347 |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3348 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
|
3349 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
|
3350 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3351 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
|
3352 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
|
3353 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
|
3354 } |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3355 #endif |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3356 |
25012 | 3357 if (FRAME_WINDOW_P (f)) |
3358 { | |
3359 /* We are working on window matrix basis. All windows whose | |
3360 flag must_be_updated_p is set have to be updated. */ | |
3361 | |
3362 /* Record that we are not working on frame matrices. */ | |
3363 set_frame_matrix_frame (NULL); | |
3364 | |
3365 /* Update all windows in the window tree of F, maybe stopping | |
3366 when pending input is detected. */ | |
3367 update_begin (f); | |
3368 | |
3369 /* Update the menu bar on X frames that don't have toolkit | |
3370 support. */ | |
3371 if (WINDOWP (f->menu_bar_window)) | |
3372 update_window (XWINDOW (f->menu_bar_window), 1); | |
3373 | |
3374 /* 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
|
3375 if (WINDOWP (f->tool_bar_window)) |
25012 | 3376 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3377 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 3378 |
3379 /* Update tool-bar window. */ | |
3380 if (w->must_be_updated_p) | |
3381 { | |
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
|
3382 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
|
3383 |
25012 | 3384 update_window (w, 1); |
3385 w->must_be_updated_p = 0; | |
3386 | |
3387 /* Swap tool-bar strings. We swap because we want to | |
3388 reuse strings. */ | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3389 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
|
3390 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
|
3391 f->desired_tool_bar_string = tem; |
25012 | 3392 } |
3393 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3394 |
25012 | 3395 |
3396 /* Update windows. */ | |
3397 paused_p = update_window_tree (root_window, force_p); | |
3398 update_end (f); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3399 |
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3400 /* This flush is a performance bottleneck under X, |
83037 | 3401 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
|
3402 It is necessary when resizing the window with the mouse, or |
83037 | 3403 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
|
3404 if (f->force_flush_display_p) |
83037 | 3405 { |
3406 FRAME_RIF (f)->flush_display (f); | |
3407 f->force_flush_display_p = 0; | |
3408 } | |
25012 | 3409 } |
3410 else | |
3411 { | |
3412 /* We are working on frame matrix basis. Set the frame on whose | |
3413 frame matrix we operate. */ | |
3414 set_frame_matrix_frame (f); | |
3415 | |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3416 /* Build F's desired matrix from window matrices. */ |
25012 | 3417 build_frame_matrix (f); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3418 |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3419 /* Update the display */ |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3420 update_begin (f); |
25012 | 3421 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
|
3422 update_end (f); |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3423 |
98508
c370f470d5ba
(update_frame): Flush termscript for MSDOS frames as well as for TTY.
Eli Zaretskii <eliz@gnu.org>
parents:
98497
diff
changeset
|
3424 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
|
3425 { |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3426 if (FRAME_TTY (f)->termscript) |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3427 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
|
3428 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
|
3429 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
|
3430 } |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3431 |
25012 | 3432 /* 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
|
3433 #if GLYPH_DEBUG |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3434 check_window_matrix_pointers (root_window); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3435 add_frame_display_history (f, paused_p); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3436 #endif |
25012 | 3437 } |
3438 | |
71378
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3439 do_pause: |
25012 | 3440 /* Reset flags indicating that a window should be updated. */ |
3441 set_window_update_flags (root_window, 0); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3442 |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3443 display_completed = !paused_p; |
25012 | 3444 return paused_p; |
3445 } | |
3446 | |
3447 | |
3448 | |
3449 /************************************************************************ | |
3450 Window-based updates | |
3451 ************************************************************************/ | |
3452 | |
3453 /* Perform updates in window tree rooted at W. FORCE_P non-zero means | |
3454 don't stop updating when input is pending. */ | |
3455 | |
3456 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3457 update_window_tree (struct window *w, int force_p) |
25012 | 3458 { |
3459 int paused_p = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3460 |
25012 | 3461 while (w && !paused_p) |
3462 { | |
3463 if (!NILP (w->hchild)) | |
3464 paused_p |= update_window_tree (XWINDOW (w->hchild), force_p); | |
3465 else if (!NILP (w->vchild)) | |
3466 paused_p |= update_window_tree (XWINDOW (w->vchild), force_p); | |
3467 else if (w->must_be_updated_p) | |
3468 paused_p |= update_window (w, force_p); | |
3469 | |
3470 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
3471 } | |
3472 | |
3473 return paused_p; | |
3474 } | |
3475 | |
3476 | |
3477 /* Update window W if its flag must_be_updated_p is non-zero. If | |
3478 FORCE_P is non-zero, don't stop updating if input is pending. */ | |
3479 | |
3480 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3481 update_single_window (struct window *w, int force_p) |
25012 | 3482 { |
3483 if (w->must_be_updated_p) | |
3484 { | |
3485 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
3486 | |
3487 /* Record that this is not a frame-based redisplay. */ | |
3488 set_frame_matrix_frame (NULL); | |
3489 | |
76065
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
3490 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
|
3491 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
|
3492 #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
|
3493 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
|
3494 force_p = 1; |
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
3495 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
|
3496 { |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3497 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
|
3498 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
|
3499 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
|
3500 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3501 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
|
3502 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
|
3503 |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3504 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
|
3505 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
|
3506 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
|
3507 } |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3508 #endif |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3509 |
25012 | 3510 /* Update W. */ |
3511 update_begin (f); | |
3512 update_window (w, force_p); | |
3513 update_end (f); | |
3514 | |
3515 /* Reset flag in W. */ | |
3516 w->must_be_updated_p = 0; | |
3517 } | |
3518 } | |
3519 | |
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
3520 #ifdef HAVE_WINDOW_SYSTEM |
25012 | 3521 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3522 /* 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
|
3523 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
|
3524 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3525 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3526 redraw_overlapped_rows (struct window *w, int yb) |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3527 { |
30165
d7ec5b3caccc
(redraw_overlapped_rows): Add missing local.
Gerd Moellmann <gerd@gnu.org>
parents:
30161
diff
changeset
|
3528 int i; |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3529 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3530 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3531 /* 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
|
3532 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
|
3533 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
|
3534 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
|
3535 current rows is 0. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3536 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
|
3537 { |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3538 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
|
3539 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3540 if (!row->enabled_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3541 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3542 else if (row->mode_line_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3543 continue; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3544 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3545 if (row->overlapped_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3546 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3547 enum glyph_row_area area; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3548 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3549 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
|
3550 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3551 updated_row = row; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3552 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
|
3553 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
|
3554 area == TEXT_AREA ? row->x : 0); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3555 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
|
3556 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
|
3557 row->used[area]); |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3558 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
|
3559 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3560 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3561 row->overlapped_p = 0; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3562 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3563 |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3564 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
|
3565 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3566 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3567 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3568 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3569 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3570 /* 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
|
3571 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
|
3572 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3573 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3574 redraw_overlapping_rows (struct window *w, int yb) |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3575 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3576 int i, bottom_y; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3577 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
|
3578 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3579 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3580 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
|
3581 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3582 row = w->current_matrix->rows + i; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3583 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3584 if (!row->enabled_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3585 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3586 else if (row->mode_line_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3587 continue; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3588 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3589 bottom_y = MATRIX_ROW_BOTTOM_Y (row); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3590 |
102882
40a6ace09cb5
(redraw_overlapping_rows): Fix detection of
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
101690
diff
changeset
|
3591 if (row->overlapping_p) |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3592 { |
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
|
3593 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
|
3594 |
102882
40a6ace09cb5
(redraw_overlapping_rows): Fix detection of
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
101690
diff
changeset
|
3595 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
|
3596 && !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
|
3597 overlaps |= OVERLAPS_PRED; |
102882
40a6ace09cb5
(redraw_overlapping_rows): Fix detection of
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
101690
diff
changeset
|
3598 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
|
3599 && !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
|
3600 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
|
3601 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
3602 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
|
3603 { |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
3604 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
|
3605 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
|
3606 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
3607 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
|
3608 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
|
3609 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
3610 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
|
3611 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
|
3612 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
3613 /* 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
|
3614 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
|
3615 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
|
3616 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
|
3617 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
|
3618 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
|
3619 } |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3620 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3621 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3622 if (bottom_y >= yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3623 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3624 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3625 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3626 |
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
3627 #endif /* HAVE_WINDOW_SYSTEM */ |
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
3628 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3629 |
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3630 #ifdef GLYPH_DEBUG |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3631 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3632 /* 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
|
3633 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
|
3634 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3635 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3636 check_current_matrix_flags (struct window *w) |
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3637 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3638 int last_seen_p = 0; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3639 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
|
3640 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3641 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
|
3642 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3643 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
|
3644 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
|
3645 last_seen_p = 1; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3646 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
|
3647 abort (); |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3648 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3649 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3650 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3651 #endif /* GLYPH_DEBUG */ |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3652 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3653 |
25012 | 3654 /* Update display of window W. FORCE_P non-zero means that we should |
3655 not stop when detecting pending input. */ | |
3656 | |
3657 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3658 update_window (struct window *w, int force_p) |
25012 | 3659 { |
3660 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
3661 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
|
3662 #if !PERIODIC_PREEMPTION_CHECKING |
25012 | 3663 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
|
3664 #endif |
83241
3dcba0bc766b
Merged in changes from CVS trunk. (Long time no see!) :-)
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
3665 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
|
3666 #if GLYPH_DEBUG |
25012 | 3667 /* 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
|
3668 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
|
3669 #endif |
25012 | 3670 |
3671 /* 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
|
3672 #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
|
3673 if (!force_p) |
59580
f43d0816e9c3
* keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
Jan Djärv <jan.h.d@swipnet.se>
parents:
58986
diff
changeset
|
3674 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
|
3675 #endif |
25012 | 3676 |
3677 /* If forced to complete the update, or if no input is pending, do | |
3678 the update. */ | |
34517
7c8d2cec3d08
(update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents:
34279
diff
changeset
|
3679 if (force_p || !input_pending || !NILP (do_mouse_tracking)) |
25012 | 3680 { |
3681 struct glyph_row *row, *end; | |
3682 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
|
3683 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
|
3684 int yb, changed_p = 0, mouse_face_overwritten_p = 0, n_updated; |
25012 | 3685 |
3686 rif->update_window_begin_hook (w); | |
3687 yb = window_text_bottom_y (w); | |
3688 | |
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
|
3689 /* 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
|
3690 Adjust y-positions of other rows by the header line height. */ |
25012 | 3691 row = desired_matrix->rows; |
3692 end = row + desired_matrix->nrows - 1; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3693 |
25012 | 3694 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
|
3695 { |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
3696 header_line_row = row; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
3697 ++row; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
3698 } |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
3699 else |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
3700 header_line_row = NULL; |
25012 | 3701 |
3702 /* Update the mode line, if necessary. */ | |
3703 mode_line_row = MATRIX_MODE_LINE_ROW (desired_matrix); | |
3704 if (mode_line_row->mode_line_p && mode_line_row->enabled_p) | |
3705 { | |
3706 mode_line_row->y = yb; | |
3707 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
|
3708 desired_matrix), |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3709 &mouse_face_overwritten_p); |
25012 | 3710 } |
3711 | |
3712 /* Find first enabled row. Optimizations in redisplay_internal | |
3713 may lead to an update with only one row enabled. There may | |
3714 be also completely empty matrices. */ | |
3715 while (row < end && !row->enabled_p) | |
3716 ++row; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3717 |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
3718 /* Try reusing part of the display by copying. */ |
25012 | 3719 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
|
3720 { |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
3721 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
|
3722 if (rc < 0) |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
3723 { |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
3724 /* 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
|
3725 paused_p = 0; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
3726 goto set_cursor; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
3727 } |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
3728 else if (rc > 0) |
54847
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
3729 { |
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
3730 /* We've scrolled the display. */ |
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
3731 force_p = 1; |
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
3732 changed_p = 1; |
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
3733 } |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
3734 } |
25012 | 3735 |
3736 /* 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
|
3737 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
|
3738 if (row->enabled_p) |
25012 | 3739 { |
3740 int vpos = MATRIX_ROW_VPOS (row, desired_matrix); | |
3741 int i; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3742 |
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
|
3743 /* We'll have to play a little bit with when to |
25012 | 3744 detect_input_pending. If it's done too often, |
3745 scrolling large windows with repeated scroll-up | |
3746 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
|
3747 #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
|
3748 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
|
3749 { |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3750 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
|
3751 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
|
3752 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
|
3753 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
|
3754 { |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3755 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
|
3756 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
|
3757 break; |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3758 } |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3759 } |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3760 #else |
34622
877ed6cab304
(update_window): Detect pending input every nth line
Gerd Moellmann <gerd@gnu.org>
parents:
34517
diff
changeset
|
3761 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
|
3762 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
|
3763 #endif |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3764 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
|
3765 &mouse_face_overwritten_p); |
25012 | 3766 |
3767 /* Mark all rows below the last visible one in the current | |
3768 matrix as invalid. This is necessary because of | |
3769 variable line heights. Consider the case of three | |
3770 successive redisplays, where the first displays 5 | |
3771 lines, the second 3 lines, and the third 5 lines again. | |
3772 If the second redisplay wouldn't mark rows in the | |
3773 current matrix invalid, the third redisplay might be | |
3774 tempted to optimize redisplay based on lines displayed | |
3775 in the first redisplay. */ | |
3776 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) | |
3777 for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i) | |
3778 MATRIX_ROW (w->current_matrix, i)->enabled_p = 0; | |
3779 } | |
3780 | |
3781 /* Was display preempted? */ | |
3782 paused_p = row < end; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3783 |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
3784 set_cursor: |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3785 |
54176
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
3786 /* 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
|
3787 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
|
3788 that can be scrolled. */ |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
3789 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
|
3790 { |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
3791 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
|
3792 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
|
3793 } |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
3794 |
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
|
3795 /* Fix the appearance of overlapping/overlapped rows. */ |
25012 | 3796 if (!paused_p && !w->pseudo_window_p) |
3797 { | |
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
3798 #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
|
3799 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
|
3800 { |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3801 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
|
3802 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
|
3803 } |
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
3804 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3805 |
25012 | 3806 /* Make cursor visible at cursor position of W. */ |
3807 set_window_cursor_after_update (w); | |
3808 | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3809 #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
|
3810 for debugging only. See the comment of check_matrix_invariants. */ |
25012 | 3811 IF_DEBUG (check_matrix_invariants (w)); |
3812 #endif | |
3813 } | |
3814 | |
3815 #if GLYPH_DEBUG | |
3816 /* Remember the redisplay method used to display the matrix. */ | |
3817 strcpy (w->current_matrix->method, w->desired_matrix->method); | |
3818 #endif | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3819 |
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
3820 #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
|
3821 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
|
3822 #endif |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
3823 |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
3824 /* 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
|
3825 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
|
3826 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
|
3827 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
|
3828 rif->update_window_end_hook (w, !paused_p, mouse_face_overwritten_p); |
25012 | 3829 } |
3830 else | |
3831 paused_p = 1; | |
3832 | |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
3833 #if GLYPH_DEBUG |
34944
4fc804373f2a
(update_window): Don't check_current_matrix_flags.
Gerd Moellmann <gerd@gnu.org>
parents:
34929
diff
changeset
|
3834 /* check_current_matrix_flags (w); */ |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3835 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
|
3836 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3837 |
25012 | 3838 clear_glyph_matrix (desired_matrix); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3839 |
25012 | 3840 return paused_p; |
3841 } | |
3842 | |
3843 | |
3844 /* Update the display of area AREA in window W, row number VPOS. | |
3845 AREA can be either LEFT_MARGIN_AREA or RIGHT_MARGIN_AREA. */ | |
3846 | |
3847 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3848 update_marginal_area (struct window *w, int area, int vpos) |
25012 | 3849 { |
3850 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
|
3851 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
25012 | 3852 |
3853 /* Let functions in xterm.c know what area subsequent X positions | |
3854 will be relative to. */ | |
3855 updated_area = area; | |
3856 | |
3857 /* Set cursor to start of glyphs, write them, and clear to the end | |
3858 of the area. I don't think that something more sophisticated is | |
3859 necessary here, since marginal areas will not be the default. */ | |
3860 rif->cursor_to (vpos, 0, desired_row->y, 0); | |
3861 if (desired_row->used[area]) | |
3862 rif->write_glyphs (desired_row->glyphs[area], desired_row->used[area]); | |
3863 rif->clear_end_of_line (-1); | |
3864 } | |
3865 | |
3866 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3867 /* 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
|
3868 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
|
3869 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3870 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3871 update_text_area (struct window *w, int vpos) |
314 | 3872 { |
25012 | 3873 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); |
3874 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
|
3875 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
|
3876 int changed_p = 0; |
25012 | 3877 |
3878 /* Let functions in xterm.c know what area subsequent X positions | |
3879 will be relative to. */ | |
3880 updated_area = TEXT_AREA; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3881 |
25012 | 3882 /* If rows are at different X or Y, or rows have different height, |
3883 or the current row is marked invalid, write the entire line. */ | |
3884 if (!current_row->enabled_p | |
3885 || desired_row->y != current_row->y | |
3886 || desired_row->ascent != current_row->ascent | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3887 || 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
|
3888 || desired_row->phys_height != current_row->phys_height |
25012 | 3889 || 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
|
3890 || 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
|
3891 /* 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
|
3892 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
|
3893 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
|
3894 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
|
3895 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
|
3896 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
|
3897 || (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
|
3898 && !(current_row->mode_line_p && vpos > 0)) |
25012 | 3899 || current_row->x != desired_row->x) |
3900 { | |
3901 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
|
3902 |
25012 | 3903 if (desired_row->used[TEXT_AREA]) |
3904 rif->write_glyphs (desired_row->glyphs[TEXT_AREA], | |
3905 desired_row->used[TEXT_AREA]); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3906 |
25012 | 3907 /* Clear to end of window. */ |
3908 rif->clear_end_of_line (-1); | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3909 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
|
3910 |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
3911 /* 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
|
3912 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
|
3913 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
|
3914 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
|
3915 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
|
3916 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
|
3917 redisplay. */ |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
3918 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
|
3919 w->phys_cursor_on_p = 0; |
25012 | 3920 } |
3921 else | |
3922 { | |
3923 int stop, i, x; | |
3924 struct glyph *current_glyph = current_row->glyphs[TEXT_AREA]; | |
3925 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
|
3926 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
|
3927 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
|
3928 int abort_skipping = 0; |
35268
d93bf580d166
(update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents:
35006
diff
changeset
|
3929 |
69110
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
3930 /* 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
|
3931 unless the current row also does so at the same position, |
25012 | 3932 make sure we write at least one glyph, so that the face |
3933 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
|
3934 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
|
3935 && (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
|
3936 || (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
|
3937 && !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
|
3938 --desired_stop_pos; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3939 |
25012 | 3940 stop = min (current_row->used[TEXT_AREA], desired_stop_pos); |
3941 i = 0; | |
3942 x = desired_row->x; | |
36097
1dfaaf6d6166
(update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents:
35924
diff
changeset
|
3943 |
1dfaaf6d6166
(update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents:
35924
diff
changeset
|
3944 /* 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
|
3945 in common. */ |
25012 | 3946 while (i < stop) |
3947 { | |
98589
b4502c55e86b
(update_text_area): Avoid looping due to large glyph
Chong Yidong <cyd@stupidchicken.com>
parents:
98508
diff
changeset
|
3948 int can_skip_p = !abort_skipping; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3949 |
25012 | 3950 /* 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
|
3951 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
|
3952 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
|
3953 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
|
3954 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
|
3955 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
|
3956 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
|
3957 `f' on the screen. */ |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
3958 if (overlapping_glyphs_p && i > 0) |
25012 | 3959 { |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
3960 struct glyph *glyph = ¤t_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
|
3961 int left, right; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3962 |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
3963 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
|
3964 &left, &right); |
98589
b4502c55e86b
(update_text_area): Avoid looping due to large glyph
Chong Yidong <cyd@stupidchicken.com>
parents:
98508
diff
changeset
|
3965 can_skip_p = (right == 0 && !abort_skipping); |
25012 | 3966 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3967 |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3968 if (can_skip_p) |
25012 | 3969 { |
98589
b4502c55e86b
(update_text_area): Avoid looping due to large glyph
Chong Yidong <cyd@stupidchicken.com>
parents:
98508
diff
changeset
|
3970 int start_hpos = i; |
b4502c55e86b
(update_text_area): Avoid looping due to large glyph
Chong Yidong <cyd@stupidchicken.com>
parents:
98508
diff
changeset
|
3971 |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3972 while (i < stop |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3973 && GLYPH_EQUAL_P (desired_glyph, current_glyph)) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3974 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3975 x += desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3976 ++desired_glyph, ++current_glyph, ++i; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3977 } |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3978 |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3979 /* 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
|
3980 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
|
3981 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
|
3982 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
|
3983 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
|
3984 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
|
3985 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
|
3986 taken care of by draw_glyphs. */ |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3987 if (overlapping_glyphs_p |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3988 && i > 0 |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3989 && i < current_row->used[TEXT_AREA] |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3990 && (current_row->used[TEXT_AREA] |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3991 != desired_row->used[TEXT_AREA])) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3992 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3993 int left, right; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3994 |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3995 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
|
3996 &left, &right); |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3997 while (left > 0 && i > 0) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3998 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
3999 --i, --desired_glyph, --current_glyph; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4000 x -= desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4001 left -= desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4002 } |
98589
b4502c55e86b
(update_text_area): Avoid looping due to large glyph
Chong Yidong <cyd@stupidchicken.com>
parents:
98508
diff
changeset
|
4003 |
b4502c55e86b
(update_text_area): Avoid looping due to large glyph
Chong Yidong <cyd@stupidchicken.com>
parents:
98508
diff
changeset
|
4004 /* 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
|
4005 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
|
4006 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
|
4007 the pixel width. */ |
b4502c55e86b
(update_text_area): Avoid looping due to large glyph
Chong Yidong <cyd@stupidchicken.com>
parents:
98508
diff
changeset
|
4008 abort_skipping = (i < start_hpos); |
25012 | 4009 } |
4010 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4011 |
25012 | 4012 /* Try to avoid writing the entire rest of the desired row |
4013 by looking for a resync point. This mainly prevents | |
4014 mode line flickering in the case the mode line is in | |
4015 fixed-pitch font, which it usually will be. */ | |
4016 if (i < desired_row->used[TEXT_AREA]) | |
4017 { | |
4018 int start_x = x, start_hpos = i; | |
4019 struct glyph *start = desired_glyph; | |
4020 int current_x = x; | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4021 int skip_first_p = !can_skip_p; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4022 |
25012 | 4023 /* Find the next glyph that's equal again. */ |
4024 while (i < stop | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4025 && (skip_first_p |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4026 || !GLYPH_EQUAL_P (desired_glyph, current_glyph)) |
25012 | 4027 && x == current_x) |
4028 { | |
4029 x += desired_glyph->pixel_width; | |
4030 current_x += current_glyph->pixel_width; | |
4031 ++desired_glyph, ++current_glyph, ++i; | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4032 skip_first_p = 0; |
25012 | 4033 } |
4034 | |
4035 if (i == start_hpos || x != current_x) | |
4036 { | |
4037 i = start_hpos; | |
4038 x = start_x; | |
4039 desired_glyph = start; | |
4040 break; | |
4041 } | |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4042 |
25012 | 4043 rif->cursor_to (vpos, start_hpos, desired_row->y, start_x); |
4044 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
|
4045 changed_p = 1; |
25012 | 4046 } |
4047 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4048 |
25012 | 4049 /* Write the rest. */ |
4050 if (i < desired_row->used[TEXT_AREA]) | |
4051 { | |
4052 rif->cursor_to (vpos, i, desired_row->y, x); | |
4053 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
|
4054 changed_p = 1; |
25012 | 4055 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4056 |
25012 | 4057 /* Maybe clear to end of line. */ |
4058 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)) | |
4059 { | |
4060 /* If new row extends to the end of the text area, nothing | |
4061 has to be cleared, if and only if we did a write_glyphs | |
4062 above. This is made sure by setting desired_stop_pos | |
4063 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
|
4064 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
|
4065 || ((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
|
4066 == 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
|
4067 && MATRIX_ROW_EXTENDS_FACE_P (current_row))); |
25012 | 4068 } |
4069 else if (MATRIX_ROW_EXTENDS_FACE_P (current_row)) | |
4070 { | |
4071 /* If old row extends to the end of the text area, clear. */ | |
4072 if (i >= desired_row->used[TEXT_AREA]) | |
4073 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
|
4074 desired_row->pixel_width); |
25012 | 4075 rif->clear_end_of_line (-1); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4076 changed_p = 1; |
25012 | 4077 } |
4078 else if (desired_row->pixel_width < current_row->pixel_width) | |
4079 { | |
4080 /* Otherwise clear to the end of the old row. Everything | |
4081 after that position should be clear already. */ | |
4082 int x; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4083 |
25012 | 4084 if (i >= desired_row->used[TEXT_AREA]) |
4085 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
|
4086 desired_row->pixel_width); |
25012 | 4087 |
4088 /* If cursor is displayed at the end of the line, make sure | |
4089 it's cleared. Nowadays we don't have a phys_cursor_glyph | |
4090 with which to erase the cursor (because this method | |
4091 doesn't work with lbearing/rbearing), so we must do it | |
4092 this way. */ | |
4093 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
|
4094 && (desired_row->reversed_p |
74557d25410e
Implement cursor on the left fringe for R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107737
diff
changeset
|
4095 ? (w->phys_cursor.hpos < 0) |
74557d25410e
Implement cursor on the left fringe for R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107737
diff
changeset
|
4096 : (w->phys_cursor.hpos >= desired_row->used[TEXT_AREA]))) |
25012 | 4097 { |
4098 w->phys_cursor_on_p = 0; | |
4099 x = -1; | |
4100 } | |
4101 else | |
53055
4cb0d5b004e9
(update_text_area): Fix redisplay error when hscroll
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4102 x = current_row->pixel_width; |
25012 | 4103 rif->clear_end_of_line (x); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4104 changed_p = 1; |
25012 | 4105 } |
4106 } | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4107 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4108 return changed_p; |
25012 | 4109 } |
4110 | |
4111 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4112 /* 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
|
4113 changed. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4114 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4115 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4116 update_window_line (struct window *w, int vpos, int *mouse_face_overwritten_p) |
25012 | 4117 { |
4118 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); | |
4119 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
|
4120 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
|
4121 int changed_p = 0; |
25012 | 4122 |
4123 /* Set the row being updated. This is important to let xterm.c | |
4124 know what line height values are in effect. */ | |
4125 updated_row = desired_row; | |
4126 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4127 /* 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
|
4128 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
|
4129 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
|
4130 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
|
4131 if (desired_row->mode_line_p |
59b455472b56
(update_window_line): Make sure to always draw
Gerd Moellmann <gerd@gnu.org>
parents:
31690
diff
changeset
|
4132 || desired_row->visible_height > 0) |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4133 { |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4134 xassert (desired_row->enabled_p); |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4135 |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4136 /* 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
|
4137 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
|
4138 && !NILP (w->left_margin_cols)) |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4139 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4140 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4141 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
|
4142 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4143 |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4144 /* Update the display of the text area. */ |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4145 if (update_text_area (w, vpos)) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4146 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4147 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4148 if (current_row->mouse_face_p) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4149 *mouse_face_overwritten_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4150 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4151 |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4152 /* 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
|
4153 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
|
4154 && !NILP (w->right_margin_cols)) |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4155 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4156 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4157 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
|
4158 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4159 |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4160 /* Draw truncation marks etc. */ |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4161 if (!current_row->enabled_p |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4162 || desired_row->y != current_row->y |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4163 || 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
|
4164 || 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
|
4165 || 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
|
4166 || current_row->redraw_fringe_bitmaps_p |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4167 || 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
|
4168 || 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
|
4169 || (MATRIX_ROW_CONTINUATION_LINE_P (desired_row) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4170 != MATRIX_ROW_CONTINUATION_LINE_P (current_row))) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4171 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
|
4172 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4173 |
25012 | 4174 /* Update current_row from desired_row. */ |
4175 make_current (w->desired_matrix, w->current_matrix, vpos); | |
4176 updated_row = NULL; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4177 return changed_p; |
25012 | 4178 } |
4179 | |
4180 | |
4181 /* Set the cursor after an update of window W. This function may only | |
4182 be called from update_window. */ | |
4183 | |
4184 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4185 set_window_cursor_after_update (struct window *w) |
25012 | 4186 { |
4187 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
|
4188 struct redisplay_interface *rif = FRAME_RIF (f); |
25012 | 4189 int cx, cy, vpos, hpos; |
4190 | |
4191 /* Not intended for frame matrix updates. */ | |
4192 xassert (FRAME_WINDOW_P (f)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4193 |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4194 if (cursor_in_echo_area |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4195 && !NILP (echo_area_buffer[0]) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4196 /* 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
|
4197 show the cursor for the message instead. */ |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4198 && XWINDOW (minibuf_window) == w |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4199 && EQ (minibuf_window, echo_area_window) |
25012 | 4200 /* These cases apply only to the frame that contains |
4201 the active mini-buffer window. */ | |
4202 && FRAME_HAS_MINIBUF_P (f) | |
4203 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) | |
4204 { | |
4205 cx = cy = vpos = hpos = 0; | |
4206 | |
4207 if (cursor_in_echo_area >= 0) | |
4208 { | |
4209 /* If the mini-buffer is several lines high, find the last | |
4210 line that has any text on it. Note: either all lines | |
4211 are enabled or none. Otherwise we wouldn't be able to | |
4212 determine Y. */ | |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4213 struct glyph_row *row, *last_row; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4214 struct glyph *glyph; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4215 int yb = window_text_bottom_y (w); |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4216 |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4217 last_row = NULL; |
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4218 row = w->current_matrix->rows; |
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4219 while (row->enabled_p |
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4220 && (last_row == NULL |
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4221 || MATRIX_ROW_BOTTOM_Y (row) <= yb)) |
25012 | 4222 { |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4223 if (row->used[TEXT_AREA] |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4224 && row->glyphs[TEXT_AREA][0].charpos >= 0) |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4225 last_row = row; |
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4226 ++row; |
25012 | 4227 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4228 |
25012 | 4229 if (last_row) |
4230 { | |
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4231 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
|
4232 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
|
4233 |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4234 while (last > start && last->charpos < 0) |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4235 --last; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4236 |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4237 for (glyph = start; glyph < last; ++glyph) |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4238 { |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4239 cx += glyph->pixel_width; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4240 ++hpos; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4241 } |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4242 |
25012 | 4243 cy = last_row->y; |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4244 vpos = MATRIX_ROW_VPOS (last_row, w->current_matrix); |
25012 | 4245 } |
4246 } | |
4247 } | |
4248 else | |
4249 { | |
4250 cx = w->cursor.x; | |
4251 cy = w->cursor.y; | |
4252 hpos = w->cursor.hpos; | |
4253 vpos = w->cursor.vpos; | |
4254 } | |
4255 | |
4256 /* 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
|
4257 hpos = max (-1, hpos); /* -1 is for when cursor is on the left fringe */ |
25012 | 4258 hpos = min (w->current_matrix->matrix_w - 1, hpos); |
4259 vpos = max (0, vpos); | |
4260 vpos = min (w->current_matrix->nrows - 1, vpos); | |
4261 rif->cursor_to (vpos, hpos, cy, cx); | |
4262 } | |
4263 | |
4264 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4265 /* 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
|
4266 tree rooted at W. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4267 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4268 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4269 set_window_update_flags (struct window *w, int on_p) |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4270 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4271 while (w) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4272 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4273 if (!NILP (w->hchild)) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4274 set_window_update_flags (XWINDOW (w->hchild), on_p); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4275 else if (!NILP (w->vchild)) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4276 set_window_update_flags (XWINDOW (w->vchild), on_p); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4277 else |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4278 w->must_be_updated_p = on_p; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4279 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4280 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4281 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4282 } |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4283 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4284 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4285 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4286 /*********************************************************************** |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4287 Window-Based Scrolling |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4288 ***********************************************************************/ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4289 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4290 /* Structure describing rows in scrolling_window. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4291 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4292 struct row_entry |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4293 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4294 /* 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
|
4295 int old_uses, new_uses; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4296 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4297 /* Vpos of row in new matrix. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4298 int new_line_number; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4299 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4300 /* 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
|
4301 int bucket; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4302 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4303 /* The row described by this entry. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4304 struct glyph_row *row; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4305 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4306 /* Hash collision chain. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4307 struct row_entry *next; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4308 }; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4309 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4310 /* 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
|
4311 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
|
4312 that we need a larger one. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4313 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4314 static struct row_entry *row_entry_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4315 static int row_entry_pool_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4316 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4317 /* Index of next free entry in row_entry_pool. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4318 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4319 static int row_entry_idx; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4320 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4321 /* 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
|
4322 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
|
4323 current matrix. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4324 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4325 static struct row_entry **row_table; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4326 static int row_table_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4327 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4328 /* 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
|
4329 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
|
4330 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4331 static struct row_entry **old_lines, **new_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4332 static int old_lines_size, new_lines_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4333 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4334 /* 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
|
4335 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4336 static struct run *run_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4337 static int runs_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4338 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4339 /* A vector of runs of lines found during scrolling. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4340 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4341 static struct run **runs; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4342 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4343 /* 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
|
4344 of window W. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4345 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4346 static INLINE struct row_entry * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4347 add_row_entry (struct window *w, struct glyph_row *row) |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4348 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4349 struct row_entry *entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4350 int i = row->hash % row_table_size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4351 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4352 entry = row_table[i]; |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
4353 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
|
4354 entry = entry->next; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4355 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4356 if (entry == NULL) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4357 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4358 entry = row_entry_pool + row_entry_idx++; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4359 entry->row = row; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4360 entry->old_uses = entry->new_uses = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4361 entry->new_line_number = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4362 entry->bucket = i; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4363 entry->next = row_table[i]; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4364 row_table[i] = entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4365 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4366 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4367 return entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4368 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4369 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4370 |
25012 | 4371 /* 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
|
4372 HEADER_LINE_P non-zero means W has a header line. |
25012 | 4373 |
4374 The algorithm is taken from Communications of the ACM, Apr78 "A | |
4375 Technique for Isolating Differences Between Files." It should take | |
4376 O(N) time. | |
4377 | |
4378 A short outline of the steps of the algorithm | |
4379 | |
4380 1. Skip lines equal at the start and end of both matrices. | |
4381 | |
4382 2. Enter rows in the current and desired matrix into a symbol | |
4383 table, counting how often they appear in both matrices. | |
4384 | |
4385 3. Rows that appear exactly once in both matrices serve as anchors, | |
4386 i.e. we assume that such lines are likely to have been moved. | |
4387 | |
4388 4. Starting from anchor lines, extend regions to be scrolled both | |
4389 forward and backward. | |
4390 | |
4391 Value is | |
4392 | |
4393 -1 if all rows were found to be equal. | |
4394 0 to indicate that we did not scroll the display, or | |
4395 1 if we did scroll. */ | |
4396 | |
4397 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4398 scrolling_window (struct window *w, int header_line_p) |
25012 | 4399 { |
4400 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
4401 struct glyph_matrix *current_matrix = w->current_matrix; | |
4402 int yb = window_text_bottom_y (w); | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4403 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
|
4404 int nruns, nbytes, n, run_idx; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4405 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
|
4406 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
25012 | 4407 |
4408 /* 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
|
4409 for (i = header_line_p ? 1 : 0; i < current_matrix->nrows - 1; ++i) |
25012 | 4410 { |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4411 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
|
4412 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
|
4413 |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4414 if (c->enabled_p |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4415 && d->enabled_p |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4416 && !d->redraw_fringe_bitmaps_p |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4417 && c->y == d->y |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4418 && MATRIX_ROW_BOTTOM_Y (c) <= yb |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4419 && MATRIX_ROW_BOTTOM_Y (d) <= yb |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4420 && row_equal_p (w, c, d, 1)) |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4421 { |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4422 assign_row (c, d); |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4423 d->enabled_p = 0; |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4424 } |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4425 else |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4426 break; |
25012 | 4427 } |
4428 | |
4429 /* Give up if some rows in the desired matrix are not enabled. */ | |
4430 if (!MATRIX_ROW (desired_matrix, i)->enabled_p) | |
4431 return -1; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4432 |
25012 | 4433 first_old = first_new = i; |
4434 | |
4435 /* Set last_new to the index + 1 of the last enabled row in the | |
4436 desired matrix. */ | |
4437 i = first_new + 1; | |
4438 while (i < desired_matrix->nrows - 1 | |
4439 && MATRIX_ROW (desired_matrix, i)->enabled_p | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4440 && MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (desired_matrix, i)) <= yb) |
25012 | 4441 ++i; |
4442 | |
4443 if (!MATRIX_ROW (desired_matrix, i)->enabled_p) | |
4444 return 0; | |
4445 | |
4446 last_new = i; | |
4447 | |
4448 /* Set last_old to the index + 1 of the last enabled row in the | |
4449 current matrix. We don't look at the enabled flag here because | |
4450 we plan to reuse part of the display even if other parts are | |
4451 disabled. */ | |
4452 i = first_old + 1; | |
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4453 while (i < current_matrix->nrows - 1) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4454 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4455 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
|
4456 if (bottom <= yb) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4457 ++i; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4458 if (bottom >= yb) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4459 break; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4460 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4461 |
25012 | 4462 last_old = i; |
4463 | |
4464 /* Skip over rows equal at the bottom. */ | |
4465 i = last_new; | |
4466 j = last_old; | |
4467 while (i - 1 > first_new | |
4468 && j - 1 > first_old | |
4469 && MATRIX_ROW (current_matrix, i - 1)->enabled_p | |
4470 && (MATRIX_ROW (current_matrix, i - 1)->y | |
4471 == 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
|
4472 && !MATRIX_ROW (desired_matrix, j - 1)->redraw_fringe_bitmaps_p |
25012 | 4473 && row_equal_p (w, |
4474 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
|
4475 MATRIX_ROW (current_matrix, j - 1), 1)) |
25012 | 4476 --i, --j; |
4477 last_new = i; | |
4478 last_old = j; | |
4479 | |
4480 /* Nothing to do if all rows are equal. */ | |
4481 if (last_new == first_new) | |
4482 return 0; | |
4483 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4484 /* Reallocate vectors, tables etc. if necessary. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4485 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4486 if (current_matrix->nrows > old_lines_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4487 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4488 old_lines_size = current_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4489 nbytes = old_lines_size * sizeof *old_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4490 old_lines = (struct row_entry **) xrealloc (old_lines, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4491 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4492 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4493 if (desired_matrix->nrows > new_lines_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4494 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4495 new_lines_size = desired_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4496 nbytes = new_lines_size * sizeof *new_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4497 new_lines = (struct row_entry **) xrealloc (new_lines, nbytes); |
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 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4500 n = desired_matrix->nrows + current_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4501 if (3 * n > row_table_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4502 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4503 row_table_size = next_almost_prime (3 * n); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4504 nbytes = row_table_size * sizeof *row_table; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4505 row_table = (struct row_entry **) xrealloc (row_table, nbytes); |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109126
diff
changeset
|
4506 memset (row_table, 0, nbytes); |
29980
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 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4509 if (n > row_entry_pool_size) |
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 row_entry_pool_size = n; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4512 nbytes = row_entry_pool_size * sizeof *row_entry_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4513 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
|
4514 } |
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 if (desired_matrix->nrows > runs_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4517 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4518 runs_size = desired_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4519 nbytes = runs_size * sizeof *runs; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4520 runs = (struct run **) xrealloc (runs, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4521 nbytes = runs_size * sizeof *run_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4522 run_pool = (struct run *) xrealloc (run_pool, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4523 } |
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 nruns = run_idx = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4526 row_entry_idx = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4527 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4528 /* 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
|
4529 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
|
4530 |
25012 | 4531 for (i = first_old; i < last_old; ++i) |
4532 { | |
4533 if (MATRIX_ROW (current_matrix, i)->enabled_p) | |
4534 { | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4535 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
|
4536 old_lines[i] = entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4537 ++entry->old_uses; |
25012 | 4538 } |
4539 else | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4540 old_lines[i] = NULL; |
25012 | 4541 } |
4542 | |
4543 for (i = first_new; i < last_new; ++i) | |
4544 { | |
4545 xassert (MATRIX_ROW_ENABLED_P (desired_matrix, i)); | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4546 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
|
4547 ++entry->new_uses; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4548 entry->new_line_number = i; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4549 new_lines[i] = entry; |
25012 | 4550 } |
4551 | |
4552 /* Identify moves based on lines that are unique and equal | |
4553 in both matrices. */ | |
4554 for (i = first_old; i < last_old;) | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4555 if (old_lines[i] |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4556 && old_lines[i]->old_uses == 1 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4557 && old_lines[i]->new_uses == 1) |
25012 | 4558 { |
4559 int j, k; | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4560 int new_line = old_lines[i]->new_line_number; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4561 struct run *run = run_pool + run_idx++; |
25012 | 4562 |
4563 /* Record move. */ | |
4564 run->current_vpos = i; | |
4565 run->current_y = MATRIX_ROW (current_matrix, i)->y; | |
4566 run->desired_vpos = new_line; | |
4567 run->desired_y = MATRIX_ROW (desired_matrix, new_line)->y; | |
4568 run->nrows = 1; | |
4569 run->height = MATRIX_ROW (current_matrix, i)->height; | |
4570 | |
4571 /* Extend backward. */ | |
4572 j = i - 1; | |
4573 k = new_line - 1; | |
4574 while (j > first_old | |
4575 && k > first_new | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4576 && old_lines[j] == new_lines[k]) |
25012 | 4577 { |
4578 int h = MATRIX_ROW (current_matrix, j)->height; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4579 --run->current_vpos; |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4580 --run->desired_vpos; |
25012 | 4581 ++run->nrows; |
4582 run->height += h; | |
4583 run->desired_y -= h; | |
4584 run->current_y -= h; | |
4585 --j, --k; | |
4586 } | |
4587 | |
4588 /* Extend forward. */ | |
4589 j = i + 1; | |
4590 k = new_line + 1; | |
4591 while (j < last_old | |
4592 && k < last_new | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4593 && old_lines[j] == new_lines[k]) |
25012 | 4594 { |
4595 int h = MATRIX_ROW (current_matrix, j)->height; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4596 ++run->nrows; |
25012 | 4597 run->height += h; |
4598 ++j, ++k; | |
4599 } | |
4600 | |
4601 /* Insert run into list of all runs. Order runs by copied | |
4602 pixel lines. Note that we record runs that don't have to | |
4603 be copied because they are already in place. This is done | |
4604 because we can avoid calling update_window_line in this | |
4605 case. */ | |
4606 for (j = 0; j < nruns && runs[j]->height > run->height; ++j) | |
4607 ; | |
34203
e55480843a8e
(scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents:
33763
diff
changeset
|
4608 for (k = nruns; k > j; --k) |
25012 | 4609 runs[k] = runs[k - 1]; |
4610 runs[j] = run; | |
4611 ++nruns; | |
4612 | |
4613 i += run->nrows; | |
4614 } | |
4615 else | |
4616 ++i; | |
4617 | |
4618 /* Do the moves. Do it in a way that we don't overwrite something | |
4619 we want to copy later on. This is not solvable in general | |
4620 because there is only one display and we don't have a way to | |
4621 exchange areas on this display. Example: | |
4622 | |
4623 +-----------+ +-----------+ | |
4624 | A | | B | | |
4625 +-----------+ --> +-----------+ | |
4626 | B | | A | | |
4627 +-----------+ +-----------+ | |
4628 | |
4629 Instead, prefer bigger moves, and invalidate moves that would | |
4630 copy from where we copied to. */ | |
4631 | |
4632 for (i = 0; i < nruns; ++i) | |
4633 if (runs[i]->nrows > 0) | |
4634 { | |
4635 struct run *r = runs[i]; | |
4636 | |
4637 /* Copy on the display. */ | |
4638 if (r->current_y != r->desired_y) | |
4639 { | |
4640 rif->scroll_run_hook (w, r); | |
4641 | |
4642 /* Invalidate runs that copy from where we copied to. */ | |
4643 for (j = i + 1; j < nruns; ++j) | |
4644 { | |
4645 struct run *p = runs[j]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4646 |
25012 | 4647 if ((p->current_y >= r->desired_y |
4648 && p->current_y < r->desired_y + r->height) | |
4649 || (p->current_y + p->height >= r->desired_y | |
4650 && (p->current_y + p->height | |
4651 < r->desired_y + r->height))) | |
4652 p->nrows = 0; | |
4653 } | |
4654 } | |
4655 | |
4656 /* Assign matrix rows. */ | |
4657 for (j = 0; j < r->nrows; ++j) | |
4658 { | |
4659 struct glyph_row *from, *to; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4660 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
|
4661 |
25012 | 4662 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
|
4663 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
|
4664 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
|
4665 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
|
4666 && (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
|
4667 || 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
|
4668 || 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
|
4669 || 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
|
4670 || 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
|
4671 from->redraw_fringe_bitmaps_p = 1; |
25012 | 4672 assign_row (to, from); |
4673 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
|
4674 to->overlapped_p = to_overlapped_p; |
25012 | 4675 } |
4676 } | |
4677 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4678 /* Clear the hash table, for the next time. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4679 for (i = 0; i < row_entry_idx; ++i) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4680 row_table[row_entry_pool[i].bucket] = NULL; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4681 |
54847
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4682 /* 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
|
4683 return nruns; |
25012 | 4684 } |
4685 | |
4686 | |
4687 | |
4688 /************************************************************************ | |
4689 Frame-Based Updates | |
4690 ************************************************************************/ | |
4691 | |
4692 /* Update the desired frame matrix of frame F. | |
4693 | |
4694 FORCE_P non-zero means that the update should not be stopped by | |
4695 pending input. INHIBIT_HAIRY_ID_P non-zero means that scrolling | |
4696 should not be tried. | |
4697 | |
4698 Value is non-zero if update was stopped due to pending input. */ | |
4699 | |
4700 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4701 update_frame_1 (struct frame *f, int force_p, int inhibit_id_p) |
25012 | 4702 { |
4703 /* Frame matrices to work on. */ | |
4704 struct glyph_matrix *current_matrix = f->current_matrix; | |
4705 struct glyph_matrix *desired_matrix = f->desired_matrix; | |
4706 int i; | |
314 | 4707 int pause; |
4708 int preempt_count = baud_rate / 2400 + 1; | |
25012 | 4709 |
4710 xassert (current_matrix && desired_matrix); | |
314 | 4711 |
10122
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
4712 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
|
4713 calculate_costs (f); |
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
4714 |
3357
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
4715 if (preempt_count <= 0) |
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
4716 preempt_count = 1; |
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
4717 |
76065
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
4718 #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
|
4719 if (!force_p && detect_input_pending_ignore_squeezables ()) |
314 | 4720 { |
4721 pause = 1; | |
4722 goto do_pause; | |
4723 } | |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4724 #endif |
314 | 4725 |
25012 | 4726 /* 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
|
4727 if (!FRAME_LINE_INS_DEL_OK (f)) |
25012 | 4728 inhibit_id_p = 1; |
7188
7da4ad9a2a8f
(update_frame): Move those assignments even farther down.
Richard M. Stallman <rms@gnu.org>
parents:
7179
diff
changeset
|
4729 |
493 | 4730 /* See if any of the desired lines are enabled; don't compute for |
25012 | 4731 i/d line if just want cursor motion. */ |
4732 for (i = 0; i < desired_matrix->nrows; i++) | |
4733 if (MATRIX_ROW_ENABLED_P (desired_matrix, i)) | |
314 | 4734 break; |
4735 | |
4736 /* Try doing i/d line, if not yet inhibited. */ | |
25012 | 4737 if (!inhibit_id_p && i < desired_matrix->nrows) |
4738 force_p |= scrolling (f); | |
314 | 4739 |
4740 /* Update the individual lines as needed. Do bottom line first. */ | |
25012 | 4741 if (MATRIX_ROW_ENABLED_P (desired_matrix, desired_matrix->nrows - 1)) |
4742 update_frame_line (f, desired_matrix->nrows - 1); | |
4743 | |
4744 /* Now update the rest of the lines. */ | |
4745 for (i = 0; i < desired_matrix->nrows - 1 && (force_p || !input_pending); i++) | |
314 | 4746 { |
25012 | 4747 if (MATRIX_ROW_ENABLED_P (desired_matrix, i)) |
314 | 4748 { |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
4749 if (FRAME_TERMCAP_P (f)) |
314 | 4750 { |
4751 /* Flush out every so many lines. | |
4752 Also flush out if likely to have more than 1k buffered | |
4753 otherwise. I'm told that some telnet connections get | |
4754 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
|
4755 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
|
4756 if (display_output) |
314 | 4757 { |
94909
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
4758 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
|
4759 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
|
4760 || (outq > 20 && ((i - 1) % preempt_count == 0))) |
314 | 4761 { |
94909
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
4762 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
|
4763 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
|
4764 { |
554 | 4765 #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
|
4766 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
|
4767 /* 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
|
4768 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
|
4769 outq = PENDING_OUTPUT_COUNT (FRAME_TTY (f->output)); |
314 | 4770 #endif |
94909
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
4771 outq *= 10; |
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
4772 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
|
4773 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
|
4774 } |
314 | 4775 } |
4776 } | |
4777 } | |
4778 | |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4779 #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
|
4780 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
|
4781 { |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4782 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
|
4783 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
|
4784 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
|
4785 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
|
4786 { |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4787 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
|
4788 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
|
4789 break; |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4790 } |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4791 } |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4792 #else |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4793 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
|
4794 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
|
4795 #endif |
16822
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
4796 |
25012 | 4797 update_frame_line (f, i); |
314 | 4798 } |
4799 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4800 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4801 pause = (i < FRAME_LINES (f) - 1) ? i : 0; |
314 | 4802 |
4803 /* Now just clean up termcap drivers and set cursor, etc. */ | |
4804 if (!pause) | |
4805 { | |
12409
6e374b28ecc3
(update_frame): Pretend cursor is in echo area
Richard M. Stallman <rms@gnu.org>
parents:
12193
diff
changeset
|
4806 if ((cursor_in_echo_area |
25012 | 4807 /* 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
|
4808 show the cursor for the message instead of for the |
25012 | 4809 (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
|
4810 || (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
|
4811 && EQ (minibuf_window, echo_area_window) |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4812 && !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
|
4813 /* These cases apply only to the frame that contains |
25012 | 4814 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
|
4815 && FRAME_HAS_MINIBUF_P (f) |
14459
c1d25453a95f
(update_frame): Compare FRAME_MINIBUF_WINDOW(f)
Richard M. Stallman <rms@gnu.org>
parents:
14286
diff
changeset
|
4816 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) |
708 | 4817 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4818 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
|
4819 int row, col; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
4820 |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
4821 if (cursor_in_echo_area < 0) |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
4822 { |
25012 | 4823 /* Negative value of cursor_in_echo_area means put |
4824 cursor at beginning of line. */ | |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
4825 row = top; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
4826 col = 0; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
4827 } |
708 | 4828 else |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
4829 { |
25012 | 4830 /* Positive value of cursor_in_echo_area means put |
4831 cursor at the end of the prompt. If the mini-buffer | |
4832 is several lines high, find the last line that has | |
4833 any text on it. */ | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4834 row = FRAME_LINES (f); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4835 do |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
4836 { |
25012 | 4837 --row; |
4838 col = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4839 |
25012 | 4840 if (MATRIX_ROW_ENABLED_P (current_matrix, row)) |
4841 { | |
4842 /* Frame rows are filled up with spaces that | |
4843 must be ignored here. */ | |
4844 struct glyph_row *r = MATRIX_ROW (current_matrix, | |
4845 row); | |
4846 struct glyph *start = r->glyphs[TEXT_AREA]; | |
4847 struct glyph *last = start + r->used[TEXT_AREA]; | |
4848 | |
4849 while (last > start | |
4850 && (last - 1)->charpos < 0) | |
4851 --last; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4852 |
25012 | 4853 col = last - start; |
4854 } | |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
4855 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
4856 while (row > top && col == 0); |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
4857 |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
4858 /* 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
|
4859 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
|
4860 { |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
4861 /* 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
|
4862 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
|
4863 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4864 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
|
4865 row++; |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
4866 } |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
4867 /* 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
|
4868 else |
21763
b685f9451792
(change_frame_size_1): Use FRAME_CURSOR_X_LIMIT.
Richard M. Stallman <rms@gnu.org>
parents:
21757
diff
changeset
|
4869 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
|
4870 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
4871 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
4872 |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
4873 cursor_to (f, row, col); |
708 | 4874 } |
314 | 4875 else |
25012 | 4876 { |
4877 /* We have only one cursor on terminal frames. Use it to | |
4878 display the cursor of the selected window. */ | |
4879 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
|
4880 if (w->cursor.vpos >= 0 |
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
4881 /* 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
|
4882 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
|
4883 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
|
4884 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
|
4885 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
|
4886 && w->cursor.vpos < WINDOW_TOTAL_LINES (w)) |
25012 | 4887 { |
4888 int x = WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos); | |
4889 int y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
4890 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4891 if (INTEGERP (w->left_margin_cols)) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4892 x += XFASTINT (w->left_margin_cols); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4893 |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4894 /* x = max (min (x, FRAME_TOTAL_COLS (f) - 1), 0); */ |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
4895 cursor_to (f, y, x); |
25012 | 4896 } |
4897 } | |
314 | 4898 } |
4899 | |
4900 do_pause: | |
4901 | |
25012 | 4902 clear_desired_matrices (f); |
314 | 4903 return pause; |
4904 } | |
4905 | |
25012 | 4906 |
4907 /* Do line insertions/deletions on frame F for frame-based redisplay. */ | |
314 | 4908 |
21514 | 4909 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4910 scrolling (struct frame *frame) |
314 | 4911 { |
4912 int unchanged_at_top, unchanged_at_bottom; | |
4913 int window_size; | |
4914 int changed_lines; | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4915 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
|
4916 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
|
4917 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
|
4918 int *old_draw_cost = (int *) alloca (FRAME_LINES (frame) * sizeof (int)); |
314 | 4919 register int i; |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4920 int free_at_end_vpos = FRAME_LINES (frame); |
25012 | 4921 struct glyph_matrix *current_matrix = frame->current_matrix; |
4922 struct glyph_matrix *desired_matrix = frame->desired_matrix; | |
4923 | |
4924 if (!current_matrix) | |
4925 abort (); | |
4926 | |
4927 /* Compute hash codes of all the lines. Also calculate number of | |
4928 changed lines, number of unchanged lines at the beginning, and | |
4929 number of unchanged lines at the end. */ | |
314 | 4930 changed_lines = 0; |
4931 unchanged_at_top = 0; | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4932 unchanged_at_bottom = FRAME_LINES (frame); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4933 for (i = 0; i < FRAME_LINES (frame); i++) |
314 | 4934 { |
4935 /* Give up on this scrolling if some old lines are not enabled. */ | |
25012 | 4936 if (!MATRIX_ROW_ENABLED_P (current_matrix, i)) |
314 | 4937 return 0; |
25012 | 4938 old_hash[i] = line_hash_code (MATRIX_ROW (current_matrix, i)); |
4939 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
|
4940 { |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
4941 /* 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
|
4942 new_hash[i] = old_hash[i]; |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
4943 #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
|
4944 draw_cost[i] = INFINITY; |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
4945 } |
314 | 4946 else |
18015
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
4947 { |
25012 | 4948 new_hash[i] = line_hash_code (MATRIX_ROW (desired_matrix, i)); |
4949 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
|
4950 } |
314 | 4951 |
4952 if (old_hash[i] != new_hash[i]) | |
4953 { | |
4954 changed_lines++; | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4955 unchanged_at_bottom = FRAME_LINES (frame) - i - 1; |
314 | 4956 } |
4957 else if (i == unchanged_at_top) | |
4958 unchanged_at_top++; | |
25012 | 4959 old_draw_cost[i] = line_draw_cost (current_matrix, i); |
314 | 4960 } |
4961 | |
4962 /* 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
|
4963 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
|
4964 && changed_lines < baud_rate / 2400) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4965 || unchanged_at_bottom == FRAME_LINES (frame)) |
314 | 4966 return 1; |
4967 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4968 window_size = (FRAME_LINES (frame) - unchanged_at_top |
314 | 4969 - unchanged_at_bottom); |
4970 | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
4971 if (FRAME_SCROLL_REGION_OK (frame)) |
314 | 4972 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
|
4973 else if (FRAME_MEMORY_BELOW_FRAME (frame)) |
314 | 4974 free_at_end_vpos = -1; |
4975 | |
4976 /* If large window, fast terminal and few lines in common between | |
25012 | 4977 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
|
4978 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
|
4979 && window_size >= 18 && baud_rate > 2400 |
314 | 4980 && (window_size >= |
4981 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
|
4982 FRAME_LINES (frame) - unchanged_at_bottom, |
314 | 4983 old_hash, new_hash, draw_cost))) |
4984 return 0; | |
4985 | |
25012 | 4986 if (window_size < 2) |
4987 return 0; | |
4988 | |
764 | 4989 scrolling_1 (frame, window_size, unchanged_at_top, unchanged_at_bottom, |
314 | 4990 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
|
4991 old_draw_cost + unchanged_at_top - 1, |
314 | 4992 old_hash + unchanged_at_top - 1, |
4993 new_hash + unchanged_at_top - 1, | |
4994 free_at_end_vpos - unchanged_at_top); | |
4995 | |
4996 return 0; | |
4997 } | |
25012 | 4998 |
4999 | |
5000 /* Count the number of blanks at the start of the vector of glyphs R | |
5001 which is LEN glyphs long. */ | |
5002 | |
5003 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
5004 count_blanks (struct glyph *r, int len) |
314 | 5005 { |
25012 | 5006 int i; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5007 |
25012 | 5008 for (i = 0; i < len; ++i) |
5009 if (!CHAR_GLYPH_SPACE_P (r[i])) | |
5010 break; | |
5011 | |
5012 return i; | |
314 | 5013 } |
25012 | 5014 |
5015 | |
5016 /* Count the number of glyphs in common at the start of the glyph | |
5017 vectors STR1 and STR2. END1 is the end of STR1 and END2 is the end | |
5018 of STR2. Value is the number of equal glyphs equal at the start. */ | |
314 | 5019 |
5020 static int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
5021 count_match (struct glyph *str1, struct glyph *end1, struct glyph *str2, struct glyph *end2) |
314 | 5022 { |
25012 | 5023 struct glyph *p1 = str1; |
5024 struct glyph *p2 = str2; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5025 |
25012 | 5026 while (p1 < end1 |
5027 && p2 < end2 | |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
5028 && GLYPH_CHAR_AND_FACE_EQUAL_P (p1, p2)) |
25012 | 5029 ++p1, ++p2; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5030 |
25012 | 5031 return p1 - str1; |
314 | 5032 } |
5033 | |
25012 | 5034 |
314 | 5035 /* Char insertion/deletion cost vector, from term.c */ |
25012 | 5036 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5037 #define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_TOTAL_COLS((f))]) |
314 | 5038 |
25012 | 5039 |
5040 /* Perform a frame-based update on line VPOS in frame FRAME. */ | |
5041 | |
314 | 5042 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
5043 update_frame_line (struct frame *f, int vpos) |
314 | 5044 { |
25012 | 5045 struct glyph *obody, *nbody, *op1, *op2, *np1, *nend; |
314 | 5046 int tem; |
5047 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
|
5048 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
|
5049 struct glyph_matrix *desired_matrix = f->desired_matrix; |
25012 | 5050 struct glyph_row *current_row = MATRIX_ROW (current_matrix, vpos); |
5051 struct glyph_row *desired_row = MATRIX_ROW (desired_matrix, vpos); | |
5052 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
|
5053 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
|
5054 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
|
5055 != FACE_TTY_DEFAULT_BG_COLOR); |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5056 |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5057 if (colored_spaces_p) |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5058 write_spaces_p = 1; |
25012 | 5059 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5060 /* 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
|
5061 write the whole desired line in that case. */ |
25012 | 5062 must_write_whole_line_p = !current_row->enabled_p; |
5063 if (must_write_whole_line_p) | |
314 | 5064 { |
25012 | 5065 obody = 0; |
314 | 5066 olen = 0; |
5067 } | |
5068 else | |
5069 { | |
25012 | 5070 obody = MATRIX_ROW_GLYPH_START (current_matrix, vpos); |
5071 olen = current_row->used[TEXT_AREA]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5072 |
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5073 /* 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
|
5074 if (!write_spaces_p) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5075 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
|
5076 olen--; |
314 | 5077 } |
5078 | |
25012 | 5079 current_row->enabled_p = 1; |
5080 current_row->used[TEXT_AREA] = desired_row->used[TEXT_AREA]; | |
5081 | |
5082 /* If desired line is empty, just clear the line. */ | |
5083 if (!desired_row->enabled_p) | |
314 | 5084 { |
5085 nlen = 0; | |
5086 goto just_erase; | |
5087 } | |
5088 | |
25012 | 5089 nbody = desired_row->glyphs[TEXT_AREA]; |
5090 nlen = desired_row->used[TEXT_AREA]; | |
5091 nend = nbody + nlen; | |
5092 | |
5093 /* If display line has unknown contents, write the whole line. */ | |
5094 if (must_write_whole_line_p) | |
5095 { | |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5096 /* 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
|
5097 if (!write_spaces_p) |
25313
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5098 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
|
5099 --nlen; |
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5100 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5101 /* 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
|
5102 if (nlen) |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5103 { |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5104 cursor_to (f, vpos, 0); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5105 write_glyphs (f, nbody, nlen); |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5106 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5107 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5108 /* 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
|
5109 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
|
5110 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
|
5111 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
|
5112 { |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5113 cursor_to (f, vpos, nlen); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5114 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
|
5115 } |
28682
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5116 else |
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5117 /* 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
|
5118 with cmgoto might use `ch' in the wrong row. */ |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5119 cursor_to (f, vpos, 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5120 |
25012 | 5121 make_current (desired_matrix, current_matrix, vpos); |
5122 return; | |
5123 } | |
314 | 5124 |
5125 /* Pretend trailing spaces are not there at all, | |
5126 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
|
5127 if (!write_spaces_p) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5128 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
|
5129 nlen--; |
314 | 5130 |
5131 /* 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
|
5132 if (!FRAME_CHAR_INS_DEL_OK (f)) |
314 | 5133 { |
25012 | 5134 int i, j; |
5135 | |
5136 /* Find the first glyph in desired row that doesn't agree with | |
5137 a glyph in the current row, and write the rest from there on. */ | |
314 | 5138 for (i = 0; i < nlen; i++) |
5139 { | |
25012 | 5140 if (i >= olen || !GLYPH_EQUAL_P (nbody + i, obody + i)) |
314 | 5141 { |
25012 | 5142 /* Find the end of the run of different glyphs. */ |
5143 j = i + 1; | |
5144 while (j < nlen | |
5145 && (j >= olen | |
5146 || !GLYPH_EQUAL_P (nbody + j, obody + j) | |
5147 || CHAR_GLYPH_PADDING_P (nbody[j]))) | |
5148 ++j; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5149 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5150 /* Output this run of non-matching chars. */ |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5151 cursor_to (f, vpos, i); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5152 write_glyphs (f, nbody + i, j - i); |
25012 | 5153 i = j - 1; |
314 | 5154 |
5155 /* Now find the next non-match. */ | |
5156 } | |
5157 } | |
5158 | |
5159 /* Clear the rest of the line, or the non-clear part of it. */ | |
5160 if (olen > nlen) | |
5161 { | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5162 cursor_to (f, vpos, nlen); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5163 clear_end_of_line (f, olen); |
314 | 5164 } |
5165 | |
25012 | 5166 /* Make current row = desired row. */ |
5167 make_current (desired_matrix, current_matrix, vpos); | |
314 | 5168 return; |
5169 } | |
5170 | |
25012 | 5171 /* Here when CHAR_INS_DEL_OK != 0, i.e. we can insert or delete |
5172 characters in a row. */ | |
5173 | |
314 | 5174 if (!olen) |
5175 { | |
25012 | 5176 /* If current line is blank, skip over initial spaces, if |
5177 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
|
5178 if (write_spaces_p) |
25012 | 5179 nsp = 0; |
5180 else | |
5181 nsp = count_blanks (nbody, nlen); | |
5182 | |
314 | 5183 if (nlen > nsp) |
5184 { | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5185 cursor_to (f, vpos, nsp); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5186 write_glyphs (f, nbody + nsp, nlen - nsp); |
314 | 5187 } |
5188 | |
764 | 5189 /* Exchange contents between current_frame and new_frame. */ |
25012 | 5190 make_current (desired_matrix, current_matrix, vpos); |
314 | 5191 return; |
5192 } | |
5193 | |
5194 /* Compute number of leading blanks in old and new contents. */ | |
25012 | 5195 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
|
5196 nsp = (colored_spaces_p ? 0 : count_blanks (nbody, nlen)); |
25012 | 5197 |
5198 /* Compute number of matching chars starting with first non-blank. */ | |
5199 begmatch = count_match (obody + osp, obody + olen, | |
5200 nbody + nsp, nbody + nlen); | |
314 | 5201 |
5202 /* Spaces in new match implicit space past the end of old. */ | |
5203 /* 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
|
5204 if (!write_spaces_p && osp + begmatch == olen) |
314 | 5205 { |
5206 np1 = nbody + nsp; | |
25012 | 5207 while (np1 + begmatch < nend && CHAR_GLYPH_SPACE_P (np1[begmatch])) |
5208 ++begmatch; | |
314 | 5209 } |
5210 | |
5211 /* Avoid doing insert/delete char | |
5212 just cause number of leading spaces differs | |
25012 | 5213 when the following text does not match. */ |
314 | 5214 if (begmatch == 0 && osp != nsp) |
5215 osp = nsp = min (osp, nsp); | |
5216 | |
5217 /* Find matching characters at end of line */ | |
5218 op1 = obody + olen; | |
5219 np1 = nbody + nlen; | |
5220 op2 = op1 + begmatch - min (olen - osp, nlen - nsp); | |
25012 | 5221 while (op1 > op2 |
5222 && GLYPH_EQUAL_P (op1 - 1, np1 - 1)) | |
314 | 5223 { |
5224 op1--; | |
5225 np1--; | |
5226 } | |
5227 endmatch = obody + olen - op1; | |
5228 | |
5229 /* tem gets the distance to insert or delete. | |
5230 endmatch is how many characters we save by doing so. | |
5231 Is it worth it? */ | |
5232 | |
5233 tem = (nlen - nsp) - (olen - osp); | |
5234 if (endmatch && tem | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5235 && (!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
|
5236 || endmatch <= char_ins_del_cost (f)[tem])) |
314 | 5237 endmatch = 0; |
5238 | |
5239 /* nsp - osp is the distance to insert or delete. | |
5240 If that is nonzero, begmatch is known to be nonzero also. | |
5241 begmatch + endmatch is how much we save by doing the ins/del. | |
5242 Is it worth it? */ | |
5243 | |
5244 if (nsp != osp | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5245 && (!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
|
5246 || begmatch + endmatch <= char_ins_del_cost (f)[nsp - osp])) |
314 | 5247 { |
5248 begmatch = 0; | |
5249 endmatch = 0; | |
5250 osp = nsp = min (osp, nsp); | |
5251 } | |
5252 | |
5253 /* Now go through the line, inserting, writing and | |
5254 deleting as appropriate. */ | |
5255 | |
5256 if (osp > nsp) | |
5257 { | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5258 cursor_to (f, vpos, nsp); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5259 delete_glyphs (f, osp - nsp); |
314 | 5260 } |
5261 else if (nsp > osp) | |
5262 { | |
5263 /* If going to delete chars later in line | |
5264 and insert earlier in the line, | |
5265 must delete first to avoid losing data in the insert */ | |
5266 if (endmatch && nlen < olen + nsp - osp) | |
5267 { | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5268 cursor_to (f, vpos, nlen - endmatch + osp - nsp); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5269 delete_glyphs (f, olen + nsp - osp - nlen); |
314 | 5270 olen = nlen - (nsp - osp); |
5271 } | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5272 cursor_to (f, vpos, osp); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5273 insert_glyphs (f, 0, nsp - osp); |
314 | 5274 } |
5275 olen += nsp - osp; | |
5276 | |
5277 tem = nsp + begmatch + endmatch; | |
5278 if (nlen != tem || olen != tem) | |
5279 { | |
5280 if (!endmatch || nlen == olen) | |
5281 { | |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5282 /* 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
|
5283 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
|
5284 (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
|
5285 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
|
5286 if (nlen == FRAME_TOTAL_COLS (f)) |
314 | 5287 olen = 0; |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5288 |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5289 /* 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
|
5290 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
|
5291 unnecessary cursor movement. */ |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5292 if (nlen - tem > 0) |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5293 { |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5294 cursor_to (f, vpos, nsp + begmatch); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5295 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
|
5296 } |
314 | 5297 } |
5298 else if (nlen > olen) | |
5299 { | |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5300 /* 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
|
5301 ---------------------------------------- |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5302 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
|
5303 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
|
5304 ---------------------------------------- |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5305 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
|
5306 is a padding glyph. */ |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5307 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
|
5308 int del; |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5309 |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5310 cursor_to (f, vpos, nsp + begmatch); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5311 |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5312 /* 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
|
5313 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
|
5314 out--; |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5315 write_glyphs (f, nbody + nsp + begmatch, out); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5316 |
25012 | 5317 /* 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
|
5318 del = olen - tem - out; |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5319 if (del > 0) |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5320 delete_glyphs (f, del); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5321 |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5322 /* At last, we insert columns not yet written out. */ |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5323 insert_glyphs (f, nbody + nsp + begmatch + out, nlen - olen + del); |
314 | 5324 olen = nlen; |
5325 } | |
5326 else if (olen > nlen) | |
5327 { | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5328 cursor_to (f, vpos, nsp + begmatch); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5329 write_glyphs (f, nbody + nsp + begmatch, nlen - tem); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5330 delete_glyphs (f, olen - nlen); |
314 | 5331 olen = nlen; |
5332 } | |
5333 } | |
5334 | |
5335 just_erase: | |
5336 /* If any unerased characters remain after the new line, erase them. */ | |
5337 if (olen > nlen) | |
5338 { | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5339 cursor_to (f, vpos, nlen); |
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5340 clear_end_of_line (f, olen); |
314 | 5341 } |
5342 | |
764 | 5343 /* Exchange contents between current_frame and new_frame. */ |
25012 | 5344 make_current (desired_matrix, current_matrix, vpos); |
314 | 5345 } |
25012 | 5346 |
5347 | |
314 | 5348 |
25012 | 5349 /*********************************************************************** |
5350 X/Y Position -> Buffer Position | |
5351 ***********************************************************************/ | |
5352 | |
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5353 /* Determine what's under window-relative pixel position (*X, *Y). |
109886
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5354 Return the OBJECT (string or buffer) that's there. |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5355 Return in *POS the position in that object. |
109886
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5356 Adjust *X and *Y to character positions. |
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5357 Return in *DX and *DY the pixel coordinates of the click, |
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5358 relative to the top left corner of OBJECT, or relative to |
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5359 the top left corner of the character glyph at (*X, *Y) |
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5360 if OBJECT is nil. |
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5361 Return WIDTH and HEIGHT of the object at (*X, *Y), or zero |
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5362 if the coordinates point to an empty area of the display. */ |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5363 |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5364 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
5365 buffer_posn_from_coords (struct window *w, int *x, int *y, struct display_pos *pos, Lisp_Object *object, int *dx, int *dy, int *width, int *height) |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5366 { |
25012 | 5367 struct it it; |
101464
f34b82b3a6e0
(buffer_posn_from_coords): Use Fset_buffer instead of setting
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
5368 Lisp_Object old_current_buffer = Fcurrent_buffer (); |
25012 | 5369 struct text_pos startp; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5370 Lisp_Object string; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5371 struct glyph_row *row; |
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5372 #ifdef HAVE_WINDOW_SYSTEM |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5373 struct image *img = 0; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5374 #endif |
109886
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5375 int x0, x1, to_x; |
25012 | 5376 |
101464
f34b82b3a6e0
(buffer_posn_from_coords): Use Fset_buffer instead of setting
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
5377 /* 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
|
5378 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
|
5379 Fset_buffer (w->buffer); |
25012 | 5380 SET_TEXT_POS_FROM_MARKER (startp, w->start); |
5381 CHARPOS (startp) = min (ZV, max (BEGV, CHARPOS (startp))); | |
5382 BYTEPOS (startp) = min (ZV_BYTE, max (BEGV_BYTE, BYTEPOS (startp))); | |
5383 start_display (&it, w, startp); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5384 |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5385 x0 = *x - WINDOW_LEFT_MARGIN_WIDTH (w); |
109886
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5386 |
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5387 /* First, move to the beginning of the row corresponding to *Y. We |
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5388 need to be in that row to get the correct value of base paragraph |
109905
c2d849aa4021
Fix mirroring pixel positions on GUI terminals.
Eli Zaretskii <eliz@gnu.org>
parents:
109896
diff
changeset
|
5389 direction for the text at (*X, *Y). */ |
109886
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5390 move_it_to (&it, -1, 0, *y, -1, MOVE_TO_X | MOVE_TO_Y); |
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5391 |
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5392 /* TO_X is the pixel position that the iterator will compute for the |
109905
c2d849aa4021
Fix mirroring pixel positions on GUI terminals.
Eli Zaretskii <eliz@gnu.org>
parents:
109896
diff
changeset
|
5393 glyph at *X. We add it.first_visible_x because iterator |
c2d849aa4021
Fix mirroring pixel positions on GUI terminals.
Eli Zaretskii <eliz@gnu.org>
parents:
109896
diff
changeset
|
5394 positions include the hscroll. */ |
109886
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5395 to_x = x0 + it.first_visible_x; |
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5396 if (it.bidi_it.paragraph_dir == R2L) |
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5397 /* For lines in an R2L paragraph, we need to mirror TO_X wrt the |
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5398 text area. This is because the iterator, even in R2L |
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5399 paragraphs, delivers glyphs as if they started at the left |
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5400 margin of the window. (When we actually produce glyphs for |
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5401 display, we reverse their order in PRODUCE_GLYPHS, but the |
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5402 iterator doesn't know about that.) The following line adjusts |
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5403 the pixel position to the iterator geometry, which is what |
109905
c2d849aa4021
Fix mirroring pixel positions on GUI terminals.
Eli Zaretskii <eliz@gnu.org>
parents:
109896
diff
changeset
|
5404 move_it_* routines use. (The -1 is because in a window whose |
c2d849aa4021
Fix mirroring pixel positions on GUI terminals.
Eli Zaretskii <eliz@gnu.org>
parents:
109896
diff
changeset
|
5405 text-area width is W, the rightmost pixel position is W-1, and |
c2d849aa4021
Fix mirroring pixel positions on GUI terminals.
Eli Zaretskii <eliz@gnu.org>
parents:
109896
diff
changeset
|
5406 it should be mirrored into zero pixel position.) */ |
c2d849aa4021
Fix mirroring pixel positions on GUI terminals.
Eli Zaretskii <eliz@gnu.org>
parents:
109896
diff
changeset
|
5407 to_x = window_box_width (w, TEXT_AREA) - to_x - 1; |
c2d849aa4021
Fix mirroring pixel positions on GUI terminals.
Eli Zaretskii <eliz@gnu.org>
parents:
109896
diff
changeset
|
5408 |
c2d849aa4021
Fix mirroring pixel positions on GUI terminals.
Eli Zaretskii <eliz@gnu.org>
parents:
109896
diff
changeset
|
5409 /* Now move horizontally in the row to the glyph under *X. Second |
c2d849aa4021
Fix mirroring pixel positions on GUI terminals.
Eli Zaretskii <eliz@gnu.org>
parents:
109896
diff
changeset
|
5410 argument is ZV to prevent move_it_in_display_line from matching |
c2d849aa4021
Fix mirroring pixel positions on GUI terminals.
Eli Zaretskii <eliz@gnu.org>
parents:
109896
diff
changeset
|
5411 based on buffer positions. */ |
109886
43a4dcd16d73
Fix mouse clicks, drag, and highlight in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
109660
diff
changeset
|
5412 move_it_in_display_line (&it, ZV, to_x, MOVE_TO_X); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5413 |
101464
f34b82b3a6e0
(buffer_posn_from_coords): Use Fset_buffer instead of setting
Chong Yidong <cyd@stupidchicken.com>
parents:
100951
diff
changeset
|
5414 Fset_buffer (old_current_buffer); |
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5415 |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5416 *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
|
5417 *dy = *y - it.current_y; |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5418 |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5419 string = w->buffer; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5420 if (STRINGP (it.string)) |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5421 string = it.string; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5422 *pos = it.current; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5423 |
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
|
5424 #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
|
5425 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
|
5426 { |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5427 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
|
5428 && !NILP (img->spec)) |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5429 *object = img->spec; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5430 } |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5431 #endif |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5432 |
65016
2b179104bc17
(buffer_posn_from_coords): Check that target row is
Kim F. Storm <storm@cua.dk>
parents:
65003
diff
changeset
|
5433 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
|
5434 && (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
|
5435 row->enabled_p)) |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5436 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5437 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
|
5438 { |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5439 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
|
5440 #ifdef HAVE_WINDOW_SYSTEM |
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5441 if (img) |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5442 { |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5443 *dy -= row->ascent - glyph->ascent; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5444 *dx += glyph->slice.x; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5445 *dy += glyph->slice.y; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5446 /* 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
|
5447 *width = img->width; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5448 *height = img->height; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5449 } |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5450 else |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5451 #endif |
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5452 { |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5453 *width = glyph->pixel_width; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5454 *height = glyph->ascent + glyph->descent; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5455 } |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5456 } |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5457 else |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5458 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5459 *width = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5460 *height = row->height; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5461 } |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5462 } |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5463 else |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5464 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5465 *width = *height = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5466 } |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5467 |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5468 /* 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
|
5469 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
|
5470 if (x0 > x1) |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5471 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
|
5472 |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5473 *x = it.hpos; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5474 *y = it.vpos; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5475 |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5476 return string; |
25012 | 5477 } |
5478 | |
5479 | |
5480 /* 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
|
5481 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
|
5482 *CHARPOS is set to the position in the string returned. */ |
25012 | 5483 |
5484 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
5485 mode_line_string (struct window *w, enum window_part part, int *x, int *y, int *charpos, Lisp_Object *object, int *dx, int *dy, int *width, int *height) |
25012 | 5486 { |
5487 struct glyph_row *row; | |
5488 struct glyph *glyph, *end; | |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5489 int x0, y0; |
25012 | 5490 Lisp_Object string = Qnil; |
5491 | |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
5492 if (part == ON_MODE_LINE) |
25012 | 5493 row = MATRIX_MODE_LINE_ROW (w->current_matrix); |
5494 else | |
25546 | 5495 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
|
5496 y0 = *y - row->y; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5497 *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
|
5498 |
25012 | 5499 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
|
5500 { |
25012 | 5501 /* Find the glyph under X. If we find one with a string object, |
5502 it's the one we were looking for. */ | |
5503 glyph = row->glyphs[TEXT_AREA]; | |
5504 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
|
5505 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
|
5506 x0 -= glyph->pixel_width; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5507 *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
|
5508 if (glyph < end) |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5509 { |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5510 string = glyph->object; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5511 *charpos = glyph->charpos; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5512 *width = glyph->pixel_width; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5513 *height = glyph->ascent + glyph->descent; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5514 #ifdef HAVE_WINDOW_SYSTEM |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5515 if (glyph->type == IMAGE_GLYPH) |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5516 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5517 struct image *img; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5518 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
|
5519 if (img != NULL) |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5520 *object = img->spec; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5521 y0 -= row->ascent - glyph->ascent; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5522 } |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5523 #endif |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5524 } |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5525 else |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5526 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5527 /* 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
|
5528 *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
|
5529 *width = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5530 *height = row->height; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5531 } |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5532 } |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5533 else |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5534 { |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5535 *x = 0; |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5536 x0 = 0; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5537 *width = *height = 0; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5538 } |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5539 |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5540 *dx = x0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5541 *dy = y0; |
25012 | 5542 |
5543 return string; | |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5544 } |
25012 | 5545 |
5546 | |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5547 /* 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
|
5548 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
|
5549 the string returned. */ |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5550 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5551 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
5552 marginal_area_string (struct window *w, enum window_part part, int *x, int *y, int *charpos, Lisp_Object *object, int *dx, int *dy, int *width, int *height) |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5553 { |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5554 struct glyph_row *row = w->current_matrix->rows; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5555 struct glyph *glyph, *end; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5556 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
|
5557 int area; |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5558 Lisp_Object string = Qnil; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5559 |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
5560 if (part == ON_LEFT_MARGIN) |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5561 area = LEFT_MARGIN_AREA; |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
5562 else if (part == ON_RIGHT_MARGIN) |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5563 area = RIGHT_MARGIN_AREA; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5564 else |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5565 abort (); |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5566 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5567 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
|
5568 if (wy >= row->y && wy < MATRIX_ROW_BOTTOM_Y (row)) |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5569 break; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5570 y0 = *y - row->y; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5571 *y = row - MATRIX_FIRST_TEXT_ROW (w->current_matrix); |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5572 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5573 if (row->enabled_p) |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5574 { |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5575 /* 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
|
5576 it's the one we were looking for. */ |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5577 if (area == RIGHT_MARGIN_AREA) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5578 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
|
5579 ? WINDOW_LEFT_FRINGE_WIDTH (w) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5580 : WINDOW_TOTAL_FRINGE_WIDTH (w)) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5581 + 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
|
5582 + window_box_width (w, TEXT_AREA)); |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5583 else |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5584 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
|
5585 ? WINDOW_LEFT_FRINGE_WIDTH (w) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5586 : 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5587 |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5588 glyph = row->glyphs[area]; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5589 end = glyph + row->used[area]; |
59592
c0533d2d03af
(mode_line_string, marginal_area_string): Fix
Kim F. Storm <storm@cua.dk>
parents:
59580
diff
changeset
|
5590 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
|
5591 x0 -= glyph->pixel_width; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5592 *x = glyph - row->glyphs[area]; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5593 if (glyph < end) |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5594 { |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5595 string = glyph->object; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5596 *charpos = glyph->charpos; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5597 *width = glyph->pixel_width; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5598 *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
|
5599 #ifdef HAVE_WINDOW_SYSTEM |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5600 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
|
5601 { |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5602 struct image *img; |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5603 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
|
5604 if (img != NULL) |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5605 *object = img->spec; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5606 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
|
5607 x0 += glyph->slice.x; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5608 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
|
5609 } |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5610 #endif |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5611 } |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5612 else |
53514
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 /* 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
|
5615 *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
|
5616 *width = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5617 *height = row->height; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5618 } |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5619 } |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5620 else |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5621 { |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5622 x0 = 0; |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5623 *x = 0; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5624 *width = *height = 0; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5625 } |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5626 |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5627 *dx = x0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5628 *dy = y0; |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5629 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5630 return string; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5631 } |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5632 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5633 |
25012 | 5634 /*********************************************************************** |
5635 Changing Frame Sizes | |
5636 ***********************************************************************/ | |
314 | 5637 |
5638 #ifdef SIGWINCH | |
25012 | 5639 |
493 | 5640 SIGTYPE |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
5641 window_change_signal (int signalnum) /* If we don't have an argument, */ |
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
5642 /* some compilers complain in signal calls. */ |
314 | 5643 { |
5644 int width, height; | |
5645 int old_errno = errno; | |
5646 | |
82989
f3845715a5f6
Separate frame-local, tty-dependent parameters from tty-local parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
82987
diff
changeset
|
5647 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
|
5648 |
58986
59945307b86b
* syssignal.h: Declare main_thread.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57808
diff
changeset
|
5649 signal (SIGWINCH, window_change_signal); |
59945307b86b
* syssignal.h: Declare main_thread.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57808
diff
changeset
|
5650 SIGNAL_THREAD_CHECK (signalnum); |
59945307b86b
* syssignal.h: Declare main_thread.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57808
diff
changeset
|
5651 |
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
|
5652 /* 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
|
5653 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
|
5654 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
|
5655 */ |
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
|
5656 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
|
5657 |
53341 | 5658 if (! tty->term_initted) |
5659 continue; | |
82995
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
5660 |
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
|
5661 /* 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
|
5662 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
|
5663 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
|
5664 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
|
5665 |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
5666 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
|
5667 |
83412
573105015a96
Work around Emacs crash on Konsole detach. (Tom Schutzer-Weissmann)
Karoly Lorentey <lorentey@elte.hu>
parents:
83384
diff
changeset
|
5668 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
|
5669 Lisp_Object tail, frame; |
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
5670 |
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
|
5671 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
|
5672 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
|
5673 /* 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
|
5674 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
|
5675 signal handler. */ |
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
5676 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
|
5677 } |
314 | 5678 } |
5679 | |
5680 errno = old_errno; | |
5681 } | |
5682 #endif /* SIGWINCH */ | |
5683 | |
5684 | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5685 /* 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
|
5686 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
|
5687 safe to change frame sizes while a redisplay is in progress. */ |
314 | 5688 |
21514 | 5689 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
5690 do_pending_window_change (int safe) |
314 | 5691 { |
5692 /* 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
|
5693 if (redisplaying_p && !safe) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5694 return; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5695 |
314 | 5696 while (delayed_size_change) |
5697 { | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
5698 Lisp_Object tail, frame; |
314 | 5699 |
5700 delayed_size_change = 0; | |
5701 | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
5702 FOR_EACH_FRAME (tail, frame) |
314 | 5703 { |
25012 | 5704 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
|
5705 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5706 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
|
5707 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
|
5708 0, 0, safe); |
314 | 5709 } |
5710 } | |
5711 } | |
5712 | |
5713 | |
764 | 5714 /* 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
|
5715 indicate no change is to take place. |
314 | 5716 |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5717 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
|
5718 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
|
5719 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
|
5720 from a signal handler. |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5721 |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5722 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
|
5723 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
|
5724 |
21514 | 5725 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
5726 change_frame_size (register struct frame *f, int newheight, int newwidth, int pretend, int delay, int safe) |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5727 { |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5728 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
|
5729 |
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
|
5730 if (FRAME_MSDOS_P (f)) |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5731 { |
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
|
5732 /* 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
|
5733 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
|
5734 ttys. */ |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5735 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
|
5736 if (! FRAME_WINDOW_P (XFRAME (frame))) |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5737 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
|
5738 pretend, delay, safe); |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5739 } |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5740 else |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5741 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
|
5742 } |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5743 |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5744 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
5745 change_frame_size_1 (register struct frame *f, int newheight, int newwidth, int pretend, int delay, int safe) |
314 | 5746 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5747 int new_frame_total_cols; |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
44890
diff
changeset
|
5748 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
|
5749 |
314 | 5750 /* 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
|
5751 if (delay || (redisplaying_p && !safe)) |
314 | 5752 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5753 f->new_text_lines = newheight; |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5754 f->new_text_cols = newwidth; |
314 | 5755 delayed_size_change = 1; |
5756 return; | |
5757 } | |
5758 | |
764 | 5759 /* 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
|
5760 f->new_text_lines = 0; |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5761 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
|
5762 |
3449
ad455da9b789
(do_pending_window_change): No need to clear
Richard M. Stallman <rms@gnu.org>
parents:
3357
diff
changeset
|
5763 /* 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
|
5764 if (newheight == 0) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5765 newheight = FRAME_LINES (f); |
15896
3a3c30116313
(change_frame_size_1): Clean up conditional.
Erik Naggum <erik@naggum.no>
parents:
15687
diff
changeset
|
5766 if (newwidth == 0) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5767 newwidth = FRAME_COLS (f); |
25012 | 5768 |
5769 /* Compute width of windows in F. | |
5770 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
|
5771 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
|
5772 |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5773 /* Round up to the smallest acceptable size. */ |
25012 | 5774 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
|
5775 |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5776 /* 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
|
5777 /* 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
|
5778 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
|
5779 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
|
5780 && 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
|
5781 && new_frame_total_cols == FRAME_TOTAL_COLS (f)) // frame width unchanged |
314 | 5782 return; |
5783 | |
15078 | 5784 BLOCK_INPUT; |
5785 | |
14286
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
5786 #ifdef MSDOS |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
5787 /* 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
|
5788 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
|
5789 or equal to the requested dimensions. */ |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
5790 dos_set_window_size (&newheight, &newwidth); |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
5791 #endif |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
5792 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5793 if (newheight != FRAME_LINES (f)) |
314 | 5794 { |
25012 | 5795 if (FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f)) |
314 | 5796 { |
25012 | 5797 /* 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
|
5798 XSETFASTINT (XWINDOW (FRAME_ROOT_WINDOW (f))->top_line, |
25012 | 5799 FRAME_TOP_MARGIN (f)); |
5800 set_window_height (FRAME_ROOT_WINDOW (f), | |
5801 (newheight | |
5802 - 1 | |
5803 - FRAME_TOP_MARGIN (f)), | |
94513
5b9bb0c0273a
(change_frame_size_1): Preserve small windows when shrinking
Martin Rudalics <rudalics@gmx.at>
parents:
92692
diff
changeset
|
5804 2); |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5805 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
|
5806 newheight - 1); |
25012 | 5807 set_window_height (FRAME_MINIBUF_WINDOW (f), 1, 0); |
314 | 5808 } |
5809 else | |
764 | 5810 /* Frame has just one top-level window. */ |
25012 | 5811 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
|
5812 newheight - FRAME_TOP_MARGIN (f), 2); |
25012 | 5813 |
98497
6fa56eeb247c
(change_frame_size_1): Set FrameRows and FrameCols for MSDOS frames as well.
Eli Zaretskii <eliz@gnu.org>
parents:
98438
diff
changeset
|
5814 /* 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
|
5815 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
|
5816 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
|
5817 FrameRows (FRAME_TTY (f)) = newheight; |
314 | 5818 } |
5819 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5820 if (new_frame_total_cols != FRAME_TOTAL_COLS (f)) |
314 | 5821 { |
94513
5b9bb0c0273a
(change_frame_size_1): Preserve small windows when shrinking
Martin Rudalics <rudalics@gmx.at>
parents:
92692
diff
changeset
|
5822 set_window_width (FRAME_ROOT_WINDOW (f), new_frame_total_cols, 2); |
25012 | 5823 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
|
5824 set_window_width (FRAME_MINIBUF_WINDOW (f), new_frame_total_cols, 0); |
25012 | 5825 |
98497
6fa56eeb247c
(change_frame_size_1): Set FrameRows and FrameCols for MSDOS frames as well.
Eli Zaretskii <eliz@gnu.org>
parents:
98438
diff
changeset
|
5826 /* 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
|
5827 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
|
5828 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
|
5829 FrameCols (FRAME_TTY (f)) = newwidth; |
25012 | 5830 |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
5831 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
|
5832 XSETFASTINT (XWINDOW (f->tool_bar_window)->total_cols, newwidth); |
314 | 5833 } |
5834 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5835 FRAME_LINES (f) = newheight; |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5836 SET_FRAME_COLS (f, newwidth); |
25012 | 5837 |
5838 { | |
5839 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f)); | |
5840 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
|
5841 |
25012 | 5842 window_box (w, TEXT_AREA, &text_area_x, &text_area_y, &text_area_width, |
5843 &text_area_height); | |
5844 if (w->cursor.x >= text_area_x + text_area_width) | |
5845 w->cursor.hpos = w->cursor.x = 0; | |
5846 if (w->cursor.y >= text_area_y + text_area_height) | |
5847 w->cursor.vpos = w->cursor.y = 0; | |
5848 } | |
5849 | |
5850 adjust_glyphs (f); | |
40512
d256f6fc9c05
(change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents:
40334
diff
changeset
|
5851 calculate_costs (f); |
25012 | 5852 SET_FRAME_GARBAGED (f); |
40512
d256f6fc9c05
(change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents:
40334
diff
changeset
|
5853 f->resized_p = 1; |
15065 | 5854 |
5855 UNBLOCK_INPUT; | |
17282
5023bea28298
(change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents:
17015
diff
changeset
|
5856 |
19627
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
5857 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
|
5858 |
88050
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
5859 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
|
5860 |
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
5861 unbind_to (count, Qnil); |
314 | 5862 } |
25012 | 5863 |
5864 | |
314 | 5865 |
25012 | 5866 /*********************************************************************** |
5867 Terminal Related Lisp Functions | |
5868 ***********************************************************************/ | |
5869 | |
5870 DEFUN ("open-termscript", Fopen_termscript, Sopen_termscript, | |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5871 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
|
5872 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
|
5873 FILE = nil means just close any termscript file currently open. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
5874 (Lisp_Object file) |
25012 | 5875 { |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
5876 struct tty_display_info *tty; |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
5877 |
98508
c370f470d5ba
(update_frame): Flush termscript for MSDOS frames as well as for TTY.
Eli Zaretskii <eliz@gnu.org>
parents:
98497
diff
changeset
|
5878 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
|
5879 && ! FRAME_MSDOS_P (SELECTED_FRAME ())) |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
5880 error ("Current frame is not on a tty device"); |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
5881 |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
5882 tty = CURTTY (); |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
5883 |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
5884 if (tty->termscript != 0) |
83560 | 5885 { |
5886 BLOCK_INPUT; | |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
5887 fclose (tty->termscript); |
83560 | 5888 UNBLOCK_INPUT; |
5889 } | |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
5890 tty->termscript = 0; |
25012 | 5891 |
5892 if (! NILP (file)) | |
5893 { | |
5894 file = Fexpand_file_name (file, Qnil); | |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
5895 tty->termscript = fopen (SDATA (file), "w"); |
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
5896 if (tty->termscript == 0) |
25012 | 5897 report_file_error ("Opening termscript", Fcons (file, Qnil)); |
5898 } | |
5899 return Qnil; | |
5900 } | |
5901 | |
5902 | |
314 | 5903 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
|
5904 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
|
5905 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
|
5906 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
|
5907 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
5908 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
|
5909 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
|
5910 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
|
5911 when TERMINAL is nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
5912 (Lisp_Object string, Lisp_Object terminal) |
314 | 5913 { |
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
|
5914 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
|
5915 FILE *out; |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
5916 |
20618
d5acac3af6e3
(Fsend_string_to_terminal): Use size_byte.
Richard M. Stallman <rms@gnu.org>
parents:
19627
diff
changeset
|
5917 /* ??? 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
|
5918 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
|
5919 BLOCK_INPUT; |
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
5920 |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
5921 if (!t) |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
5922 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
|
5923 |
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
|
5924 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
|
5925 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
|
5926 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
|
5927 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
|
5928 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
|
5929 { |
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
|
5930 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
|
5931 |
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
|
5932 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
|
5933 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
|
5934 |
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
|
5935 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
|
5936 { |
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
|
5937 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
|
5938 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
|
5939 } |
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
|
5940 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
|
5941 } |
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
|
5942 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
|
5943 fflush (out); |
76621
685fa6c9ae44
(Fopen_termscript): Add BLOCK_INPUT around fclose.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
76069
diff
changeset
|
5944 UNBLOCK_INPUT; |
314 | 5945 return Qnil; |
5946 } | |
5947 | |
25012 | 5948 |
314 | 5949 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
|
5950 doc: /* Beep, or flash the screen. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5951 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
|
5952 terminate any keyboard macro currently executing. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
5953 (Lisp_Object arg) |
314 | 5954 { |
493 | 5955 if (!NILP (arg)) |
314 | 5956 { |
649
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
5957 if (noninteractive) |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
5958 putchar (07); |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
5959 else |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5960 ring_bell (XFRAME (selected_frame)); |
314 | 5961 } |
5962 else | |
5963 bitch_at_user (); | |
5964 | |
5965 return Qnil; | |
5966 } | |
5967 | |
21514 | 5968 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
5969 bitch_at_user (void) |
314 | 5970 { |
5971 if (noninteractive) | |
5972 putchar (07); | |
25012 | 5973 else if (!INTERACTIVE) /* Stop executing a keyboard macro. */ |
314 | 5974 error ("Keyboard macro terminated by a command ringing the bell"); |
5975 else | |
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5976 ring_bell (XFRAME (selected_frame)); |
314 | 5977 } |
5978 | |
25012 | 5979 |
5980 | |
5981 /*********************************************************************** | |
5982 Sleeping, Waiting | |
5983 ***********************************************************************/ | |
5984 | |
314 | 5985 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
|
5986 doc: /* Pause, without updating display, for SECONDS seconds. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
5987 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
|
5988 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
|
5989 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
|
5990 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
|
5991 \(Not all operating systems support waiting for a fraction of a second.) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
5992 (Lisp_Object seconds, Lisp_Object milliseconds) |
314 | 5993 { |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
5994 int sec, usec; |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
5995 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
5996 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
|
5997 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
|
5998 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
5999 CHECK_NUMBER (milliseconds); |
2648 | 6000 usec = XINT (milliseconds) * 1000; |
6001 | |
6002 { | |
6003 double duration = extract_float (seconds); | |
6004 sec = (int) duration; | |
6005 usec += (duration - sec) * 1000000; | |
6006 } | |
314 | 6007 |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6008 #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
|
6009 if (sec == 0 && usec != 0) |
63695
98563021d2e3
(Fsleep_for, Fsit_for): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
63649
diff
changeset
|
6010 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
|
6011 #endif |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6012 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6013 /* 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
|
6014 if (usec < 0) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6015 { |
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
|
6016 /* 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
|
6017 if (-1000000 < usec) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6018 sec--, usec += 1000000; |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6019 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6020 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
|
6021 } |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6022 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6023 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
|
6024 |
14646
68fe10d1abd0
(Fsleep_for): Accept sub-second intervals.
Erik Naggum <erik@naggum.no>
parents:
14459
diff
changeset
|
6025 if (sec < 0 || (sec == 0 && usec == 0)) |
314 | 6026 return Qnil; |
6027 | |
56727
6b028bf60b4e
(Fsleep_for): Remove obsolete code.
Kim F. Storm <storm@cua.dk>
parents:
56717
diff
changeset
|
6028 wait_reading_process_output (sec, usec, 0, 0, Qnil, NULL, 0); |
314 | 6029 |
6030 return Qnil; | |
6031 } | |
6032 | |
25012 | 6033 |
56727
6b028bf60b4e
(Fsleep_for): Remove obsolete code.
Kim F. Storm <storm@cua.dk>
parents:
56717
diff
changeset
|
6034 /* 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
|
6035 it does redisplay. |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6036 |
73318
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6037 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
|
6038 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
|
6039 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
|
6040 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
|
6041 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
|
6042 */ |
650 | 6043 |
6044 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
6045 sit_for (Lisp_Object timeout, int reading, int do_display) |
314 | 6046 { |
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6047 int sec, usec; |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6048 |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6049 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
|
6050 |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6051 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
|
6052 || !NILP (Vexecuting_kbd_macro)) |
314 | 6053 return Qnil; |
650 | 6054 |
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6055 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
|
6056 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
|
6057 |
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
|
6058 if (INTEGERP (timeout)) |
71333
a8cbcce39bd0
(sit_for): Undo 2006-06-01 change. Instead, a
Kim F. Storm <storm@cua.dk>
parents:
71323
diff
changeset
|
6059 { |
71810 | 6060 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
|
6061 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
|
6062 } |
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
|
6063 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
|
6064 { |
71831
347f809d2edb
(sit_for): Tiny simplification.
Kim F. Storm <storm@cua.dk>
parents:
71810
diff
changeset
|
6065 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
|
6066 sec = (int) seconds; |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6067 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
|
6068 } |
73318
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6069 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
|
6070 { |
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6071 sec = 0; |
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6072 usec = 0; |
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6073 } |
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6074 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
|
6075 wrong_type_argument (Qnumberp, timeout); |
314 | 6076 |
73318
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6077 if (sec == 0 && usec == 0 && !EQ (timeout, Qt)) |
673 | 6078 return Qt; |
6079 | |
314 | 6080 #ifdef SIGIO |
1915
98ecf99d7b1a
* dispnew.c (sit_for): Pass the correct number of arguments to
Jim Blandy <jimb@redhat.com>
parents:
1872
diff
changeset
|
6081 gobble_input (0); |
650 | 6082 #endif |
6083 | |
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6084 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
|
6085 Qnil, NULL, 0); |
650 | 6086 |
314 | 6087 return detect_input_pending () ? Qnil : Qt; |
6088 } | |
6089 | |
25012 | 6090 |
71771
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6091 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
|
6092 doc: /* Perform redisplay if no input is available. |
71773 | 6093 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
|
6094 perform a full redisplay even if input is available. |
102f29870373
(Fredisplay): Document return value.
Kim F. Storm <storm@cua.dk>
parents:
71946
diff
changeset
|
6095 Return t if redisplay was performed, nil otherwise. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
6096 (Lisp_Object force) |
650 | 6097 { |
71771
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6098 int count; |
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6099 |
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6100 swallow_events (1); |
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6101 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
|
6102 && NILP (force) && !redisplay_dont_pause) |
71761
1055c0769159
* puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents:
71573
diff
changeset
|
6103 || !NILP (Vexecuting_kbd_macro)) |
1055c0769159
* puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents:
71573
diff
changeset
|
6104 return Qnil; |
1055c0769159
* puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents:
71573
diff
changeset
|
6105 |
71771
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6106 count = SPECPDL_INDEX (); |
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6107 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
|
6108 specbind (Qredisplay_dont_pause, Qt); |
71761
1055c0769159
* puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents:
71573
diff
changeset
|
6109 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
|
6110 unbind_to (count, Qnil); |
71761
1055c0769159
* puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents:
71573
diff
changeset
|
6111 return Qt; |
650 | 6112 } |
25012 | 6113 |
6114 | |
314 | 6115 |
25012 | 6116 /*********************************************************************** |
6117 Other Lisp Functions | |
6118 ***********************************************************************/ | |
6119 | |
6120 /* A vector of size >= 2 * NFRAMES + 3 * NBUFFERS + 1, containing the | |
6121 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
|
6122 buffer-modified-flags. */ |
25012 | 6123 |
6124 static Lisp_Object frame_and_buffer_state; | |
6125 | |
6126 | |
6127 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
|
6128 Sframe_or_buffer_changed_p, 0, 1, 0, |
40979 | 6129 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
|
6130 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
|
6131 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
|
6132 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
|
6133 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
|
6134 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
|
6135 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
|
6136 the current state. |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6137 |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6138 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
|
6139 pass nil for VARIABLE. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
6140 (Lisp_Object variable) |
25012 | 6141 { |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6142 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
|
6143 Lisp_Object *vecp, *end; |
25012 | 6144 int n; |
6145 | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6146 if (! NILP (variable)) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6147 { |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6148 CHECK_SYMBOL (variable); |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6149 state = Fsymbol_value (variable); |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6150 if (! VECTORP (state)) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6151 goto changed; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6152 } |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6153 else |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6154 state = frame_and_buffer_state; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6155 |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6156 vecp = XVECTOR (state)->contents; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6157 end = vecp + XVECTOR (state)->size; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6158 |
25012 | 6159 FOR_EACH_FRAME (tail, frame) |
6160 { | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6161 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6162 goto changed; |
25012 | 6163 if (!EQ (*vecp++, frame)) |
6164 goto changed; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6165 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6166 goto changed; |
25012 | 6167 if (!EQ (*vecp++, XFRAME (frame)->name)) |
6168 goto changed; | |
6169 } | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6170 /* 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
|
6171 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6172 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6173 buf = XCDR (XCAR (tail)); |
25012 | 6174 /* 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
|
6175 if (SREF (XBUFFER (buf)->name, 0) == ' ') |
25012 | 6176 continue; |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6177 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6178 goto changed; |
25012 | 6179 if (!EQ (*vecp++, buf)) |
6180 goto changed; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6181 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6182 goto changed; |
25012 | 6183 if (!EQ (*vecp++, XBUFFER (buf)->read_only)) |
6184 goto changed; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6185 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6186 goto changed; |
25012 | 6187 if (!EQ (*vecp++, Fbuffer_modified_p (buf))) |
6188 goto changed; | |
6189 } | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6190 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6191 goto changed; |
25012 | 6192 /* Detect deletion of a buffer at the end of the list. */ |
6193 if (EQ (*vecp, Qlambda)) | |
6194 return Qnil; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6195 |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6196 /* Come here if we decide the data has changed. */ |
25012 | 6197 changed: |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6198 /* 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
|
6199 Start with 1 so there is room for at least one lambda at the end. */ |
25012 | 6200 n = 1; |
6201 FOR_EACH_FRAME (tail, frame) | |
6202 n += 2; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6203 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6204 n += 3; |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6205 /* 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
|
6206 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
|
6207 if (! VECTORP (state) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6208 || n > XVECTOR (state)->size |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6209 || n + 20 < XVECTOR (state)->size / 2) |
25012 | 6210 /* 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
|
6211 { |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6212 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
|
6213 if (! NILP (variable)) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6214 Fset (variable, state); |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6215 else |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6216 frame_and_buffer_state = state; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6217 } |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6218 |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6219 /* 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
|
6220 vecp = XVECTOR (state)->contents; |
25012 | 6221 FOR_EACH_FRAME (tail, frame) |
6222 { | |
6223 *vecp++ = frame; | |
6224 *vecp++ = XFRAME (frame)->name; | |
6225 } | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6226 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6227 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6228 buf = XCDR (XCAR (tail)); |
25012 | 6229 /* 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
|
6230 if (SREF (XBUFFER (buf)->name, 0) == ' ') |
25012 | 6231 continue; |
6232 *vecp++ = buf; | |
6233 *vecp++ = XBUFFER (buf)->read_only; | |
6234 *vecp++ = Fbuffer_modified_p (buf); | |
6235 } | |
6236 /* Fill up the vector with lambdas (always at least one). */ | |
6237 *vecp++ = Qlambda; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6238 while (vecp - XVECTOR (state)->contents |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6239 < XVECTOR (state)->size) |
25012 | 6240 *vecp++ = Qlambda; |
6241 /* 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
|
6242 if (vecp - XVECTOR (state)->contents |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6243 > XVECTOR (state)->size) |
25012 | 6244 abort (); |
6245 return Qt; | |
6246 } | |
6247 | |
6248 | |
6249 | |
6250 /*********************************************************************** | |
6251 Initialization | |
6252 ***********************************************************************/ | |
6253 | |
6254 /* Initialization done when Emacs fork is started, before doing stty. | |
6255 Determine terminal type and set terminal_driver. Then invoke its | |
6256 decoding routine to set up variables in the terminal package. */ | |
314 | 6257 |
21514 | 6258 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
6259 init_display (void) |
314 | 6260 { |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6261 char *terminal_type; |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6262 |
25012 | 6263 /* Construct the space glyph. */ |
6264 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
|
6265 SET_CHAR_GLYPH (space_glyph, ' ', DEFAULT_FACE_ID, 0); |
25012 | 6266 space_glyph.charpos = -1; |
6267 | |
314 | 6268 inverse_video = 0; |
6269 cursor_in_echo_area = 0; | |
6270 terminal_type = (char *) 0; | |
6271 | |
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6272 /* 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
|
6273 during startup. */ |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6274 Vinitial_window_system = Qnil; |
314 | 6275 |
83146
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6276 /* 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
|
6277 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
|
6278 automatically. */ |
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6279 #ifdef SIGWINCH |
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6280 #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
|
6281 if (initialized) |
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6282 #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
|
6283 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
|
6284 #endif /* SIGWINCH */ |
314 | 6285 |
98379
7424f5df0da7
(init_display): Return earlier when running as a
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98327
diff
changeset
|
6286 /* 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
|
6287 if (IS_DAEMON) |
c1511154e8c2
* emacs.c (daemon_pipe): Make non-static.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98589
diff
changeset
|
6288 return; |
98379
7424f5df0da7
(init_display): Return earlier when running as a
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98327
diff
changeset
|
6289 |
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6290 /* 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
|
6291 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
|
6292 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
|
6293 using the window system. |
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6294 |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6295 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
|
6296 try to use X, and die with an error message if that doesn't work. */ |
314 | 6297 |
6298 #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
|
6299 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
|
6300 { |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6301 char *display; |
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6302 display = getenv ("DISPLAY"); |
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6303 display_arg = (display != 0 && *display != 0); |
69607
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6304 |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6305 if (display_arg && !x_display_ok (display)) |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6306 { |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6307 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
|
6308 display); |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6309 inhibit_window_system = 1; |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6310 } |
2364 | 6311 } |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6312 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6313 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
|
6314 #ifndef CANNOT_DUMP |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6315 && initialized |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6316 #endif |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6317 ) |
314 | 6318 { |
104077
3abca9a8122f
* dispnew.c (init_display): Use Qx, Qw32, and Qns.
Chong Yidong <cyd@stupidchicken.com>
parents:
103052
diff
changeset
|
6319 Vinitial_window_system = Qx; |
314 | 6320 #ifdef HAVE_X11 |
6321 Vwindow_system_version = make_number (11); | |
6322 #endif | |
41969
e669966d496e
Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents:
41120
diff
changeset
|
6323 #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
|
6324 /* In some versions of ncurses, |
15282 | 6325 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
|
6326 So call tgetent. */ |
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6327 { char b[2044]; tgetent (b, "xterm");} |
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6328 #endif |
25012 | 6329 adjust_frame_glyphs_initially (); |
314 | 6330 return; |
6331 } | |
6332 #endif /* HAVE_X_WINDOWS */ | |
6333 | |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6334 #ifdef HAVE_NTGUI |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6335 if (!inhibit_window_system) |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6336 { |
104077
3abca9a8122f
* dispnew.c (init_display): Use Qx, Qw32, and Qns.
Chong Yidong <cyd@stupidchicken.com>
parents:
103052
diff
changeset
|
6337 Vinitial_window_system = Qw32; |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6338 Vwindow_system_version = make_number (1); |
25012 | 6339 adjust_frame_glyphs_initially (); |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6340 return; |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6341 } |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6342 #endif /* HAVE_NTGUI */ |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6343 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6344 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6345 if (!inhibit_window_system |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6346 #ifndef CANNOT_DUMP |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6347 && initialized |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6348 #endif |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6349 ) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6350 { |
104077
3abca9a8122f
* dispnew.c (init_display): Use Qx, Qw32, and Qns.
Chong Yidong <cyd@stupidchicken.com>
parents:
103052
diff
changeset
|
6351 Vinitial_window_system = Qns; |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6352 Vwindow_system_version = make_number(10); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6353 adjust_frame_glyphs_initially (); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6354 return; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6355 } |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6356 #endif |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96236
diff
changeset
|
6357 |
314 | 6358 /* If no window system has been specified, try to use the terminal. */ |
6359 if (! isatty (0)) | |
6360 { | |
16896
b2c51d6de440
(init_display): Use `fatal'.
Richard M. Stallman <rms@gnu.org>
parents:
16891
diff
changeset
|
6361 fatal ("standard input is not a tty"); |
314 | 6362 exit (1); |
6363 } | |
6364 | |
86273
77b991c8303d
(init_display) [WINDOWSNT]: Hardcode terminal_type.
Jason Rumney <jasonr@gnu.org>
parents:
85826
diff
changeset
|
6365 #ifdef WINDOWSNT |
77b991c8303d
(init_display) [WINDOWSNT]: Hardcode terminal_type.
Jason Rumney <jasonr@gnu.org>
parents:
85826
diff
changeset
|
6366 terminal_type = "w32console"; |
77b991c8303d
(init_display) [WINDOWSNT]: Hardcode terminal_type.
Jason Rumney <jasonr@gnu.org>
parents:
85826
diff
changeset
|
6367 #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
|
6368 /* Look at the TERM variable. */ |
314 | 6369 terminal_type = (char *) getenv ("TERM"); |
86273
77b991c8303d
(init_display) [WINDOWSNT]: Hardcode terminal_type.
Jason Rumney <jasonr@gnu.org>
parents:
85826
diff
changeset
|
6370 #endif |
314 | 6371 if (!terminal_type) |
6372 { | |
71946 | 6373 #ifdef HAVE_WINDOW_SYSTEM |
71945 | 6374 if (! inhibit_window_system) |
6375 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
|
6376 else |
270a672fc28c
(init_display): Mention DISPLAY as well as TERM in err msg.
Richard M. Stallman <rms@gnu.org>
parents:
71831
diff
changeset
|
6377 #endif /* HAVE_WINDOW_SYSTEM */ |
71945 | 6378 fprintf (stderr, "Please set the environment variable TERM; see `tset'.\n"); |
314 | 6379 exit (1); |
6380 } | |
6381 | |
53341 | 6382 { |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6383 struct terminal *t; |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6384 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
|
6385 |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6386 /* 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
|
6387 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
|
6388 |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6389 /* 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
|
6390 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
|
6391 abort (); |
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6392 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
|
6393 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
|
6394 |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6395 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
|
6396 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
|
6397 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
|
6398 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
|
6399 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
|
6400 |
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6401 /* 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
|
6402 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
|
6403 && 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
|
6404 (*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
|
6405 |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
6406 /* 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
|
6407 Fmodify_frame_parameters |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
6408 (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
|
6409 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
|
6410 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
|
6411 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
|
6412 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
|
6413 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
|
6414 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
|
6415 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
|
6416 Qnil)); |
53341 | 6417 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6418 |
16891
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6419 { |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6420 struct frame *sf = SELECTED_FRAME (); |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6421 int width = FRAME_TOTAL_COLS (sf); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6422 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
|
6423 |
25012 | 6424 unsigned int total_glyphs = height * (width + 2) * sizeof (struct glyph); |
6425 | |
6426 /* If these sizes are so big they cause overflow, just ignore the | |
6427 change. It's not clear what better we could do. */ | |
6428 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
|
6429 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
|
6430 } |
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6431 |
25012 | 6432 adjust_frame_glyphs_initially (); |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6433 calculate_costs (XFRAME (selected_frame)); |
314 | 6434 |
25012 | 6435 /* Set up faces of the initial terminal frame of a dumped Emacs. */ |
6436 if (initialized | |
6437 && !noninteractive | |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6438 && 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
|
6439 { |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
6440 /* 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
|
6441 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
|
6442 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
|
6443 |
26902
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26851
diff
changeset
|
6444 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
|
6445 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
|
6446 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
|
6447 } |
314 | 6448 } |
25012 | 6449 |
6450 | |
314 | 6451 |
25012 | 6452 /*********************************************************************** |
6453 Blinking cursor | |
6454 ***********************************************************************/ | |
6455 | |
26280
083835afced5
(Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
6456 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
|
6457 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
|
6458 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
|
6459 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
|
6460 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
|
6461 don't show a cursor. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
6462 (Lisp_Object window, Lisp_Object show) |
25012 | 6463 { |
6464 /* Don't change cursor state while redisplaying. This could confuse | |
6465 output routines. */ | |
6466 if (!redisplaying_p) | |
6467 { | |
6468 if (NILP (window)) | |
6469 window = selected_window; | |
6470 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6471 CHECK_WINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6472 |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6473 XWINDOW (window)->cursor_off_p = NILP (show); |
25012 | 6474 } |
6475 | |
6476 return Qnil; | |
6477 } | |
6478 | |
6479 | |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6480 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
|
6481 Sinternal_show_cursor_p, 0, 1, 0, |
40979 | 6482 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
|
6483 WINDOW nil or omitted means report on the selected window. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
6484 (Lisp_Object window) |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6485 { |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6486 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6487 |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6488 if (NILP (window)) |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6489 window = selected_window; |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6490 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6491 CHECK_WINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6492 |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6493 w = XWINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6494 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
|
6495 } |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6496 |
95590
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
6497 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
|
6498 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
|
6499 doc: /* Value is last nonminibuffer frame. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
6500 (void) |
95590
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
6501 { |
95639
2c12b44a3dfc
(Flast_nonminibuf_frame): Handle the NULL case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
6502 Lisp_Object frame = Qnil; |
2c12b44a3dfc
(Flast_nonminibuf_frame): Handle the NULL case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
6503 |
2c12b44a3dfc
(Flast_nonminibuf_frame): Handle the NULL case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
6504 if (last_nonminibuf_frame) |
2c12b44a3dfc
(Flast_nonminibuf_frame): Handle the NULL case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
6505 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
|
6506 |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
6507 return frame; |
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
6508 } |
25012 | 6509 |
6510 /*********************************************************************** | |
6511 Initialization | |
6512 ***********************************************************************/ | |
6513 | |
21514 | 6514 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
6515 syms_of_display (void) |
314 | 6516 { |
764 | 6517 defsubr (&Sredraw_frame); |
314 | 6518 defsubr (&Sredraw_display); |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6519 defsubr (&Sframe_or_buffer_changed_p); |
314 | 6520 defsubr (&Sopen_termscript); |
6521 defsubr (&Sding); | |
71761
1055c0769159
* puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents:
71573
diff
changeset
|
6522 defsubr (&Sredisplay); |
314 | 6523 defsubr (&Ssleep_for); |
6524 defsubr (&Ssend_string_to_terminal); | |
26280
083835afced5
(Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
6525 defsubr (&Sinternal_show_cursor); |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6526 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
|
6527 defsubr (&Slast_nonminibuf_frame); |
314 | 6528 |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
6529 #if GLYPH_DEBUG |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6530 defsubr (&Sdump_redisplay_history); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6531 #endif |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6532 |
12186
6811992e871c
(Fframe_or_buffer_changed_p): Calculate vector size right.
Karl Heuer <kwzh@gnu.org>
parents:
11919
diff
changeset
|
6533 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
|
6534 staticpro (&frame_and_buffer_state); |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6535 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6536 Qdisplay_table = intern_c_string ("display-table"); |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6537 staticpro (&Qdisplay_table); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
6538 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
|
6539 staticpro (&Qredisplay_dont_pause); |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6540 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6541 DEFVAR_INT ("baud-rate", &baud_rate, |
40979 | 6542 doc: /* *The output baud rate of the terminal. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6543 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
|
6544 and the other strategic decisions made during redisplay. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6545 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6546 DEFVAR_BOOL ("inverse-video", &inverse_video, |
40979 | 6547 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
|
6548 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
|
6549 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6550 DEFVAR_BOOL ("visible-bell", &visible_bell, |
40979 | 6551 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
|
6552 |
bee6cc2e8a90
(syms_of_display) <visible-bell>: Add a reference to
Eli Zaretskii <eliz@gnu.org>
parents:
40271
diff
changeset
|
6553 See also `ring-bell-function'. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6554 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6555 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter, |
40979 | 6556 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
|
6557 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
|
6558 Emacs's frame display when you reenter Emacs. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6559 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
|
6560 |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6561 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
|
6562 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
|
6563 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
|
6564 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
|
6565 |
85614
9f3a25157e4f
Make `window-system' into a keyboard-local variable (rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85252
diff
changeset
|
6566 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
|
6567 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
|
6568 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
|
6569 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
|
6570 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6571 DEFVAR_LISP ("window-system-version", &Vwindow_system_version, |
40979 | 6572 doc: /* The version number of the window system in use. |
85826 | 6573 For X windows, this is 11. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6574 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6575 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area, |
40979 | 6576 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
|
6577 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6578 DEFVAR_LISP ("glyph-table", &Vglyph_table, |
40979 | 6579 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
|
6580 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
|
6581 Each element can be: |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6582 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
|
6583 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
|
6584 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
|
6585 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
|
6586 while outputting it. */); |
314 | 6587 Vglyph_table = Qnil; |
6588 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6589 DEFVAR_LISP ("standard-display-table", &Vstandard_display_table, |
40979 | 6590 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
|
6591 See `buffer-display-table' for more information. */); |
314 | 6592 Vstandard_display_table = Qnil; |
6593 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6594 DEFVAR_BOOL ("redisplay-dont-pause", &redisplay_dont_pause, |
40979 | 6595 doc: /* *Non-nil means update isn't paused when input is detected. */); |
25012 | 6596 redisplay_dont_pause = 0; |
6597 | |
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
6598 #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
|
6599 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
|
6600 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
|
6601 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
|
6602 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
|
6603 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
|
6604 #endif |
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
6605 |
314 | 6606 #ifdef CANNOT_DUMP |
6607 if (noninteractive) | |
6608 #endif | |
6609 { | |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6610 Vinitial_window_system = Qnil; |
314 | 6611 Vwindow_system_version = Qnil; |
6612 } | |
6613 } | |
52401 | 6614 |
6615 /* arch-tag: 8d812b1f-04a2-4195-a9c4-381f8457a413 | |
6616 (do not change this comment) */ |