Mercurial > emacs
annotate src/dispnew.c @ 95948:d55ec23f052d
*** empty log message ***
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sun, 15 Jun 2008 02:53:17 +0000 |
| parents | 2c12b44a3dfc |
| children | 8a7483c32b73 |
| 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, |
| 79759 | 4 2004, 2005, 2006, 2007, 2008 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> |
| 25 | |
| 21514 | 26 #ifdef HAVE_UNISTD_H |
| 27 #include <unistd.h> | |
| 28 #endif | |
| 29 | |
|
3525
58e789baa27a
Include lisp.h earlier (before termhooks.h).
Richard M. Stallman <rms@gnu.org>
parents:
3517
diff
changeset
|
30 #include "lisp.h" |
| 314 | 31 #include "termchar.h" |
| 32 #include "termopts.h" | |
|
13526
34382f4e23cb
Always include dispextern.h before cm.h.
Richard M. Stallman <rms@gnu.org>
parents:
13448
diff
changeset
|
33 /* 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
|
34 #include "dispextern.h" |
|
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
35 #include "cm.h" |
| 314 | 36 #include "buffer.h" |
|
88351
aac41b50c875
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
42835
diff
changeset
|
37 #include "character.h" |
|
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
38 #include "keyboard.h" |
| 764 | 39 #include "frame.h" |
|
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
82995
diff
changeset
|
40 #include "termhooks.h" |
| 314 | 41 #include "window.h" |
| 42 #include "commands.h" | |
| 43 #include "disptab.h" | |
| 44 #include "indent.h" | |
|
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
45 #include "intervals.h" |
| 15065 | 46 #include "blockinput.h" |
| 21514 | 47 #include "process.h" |
| 314 | 48 |
|
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
49 /* I don't know why DEC Alpha OSF1 fail to compile this file if we |
|
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
50 include the following file. */ |
|
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
51 /* #include "systty.h" */ |
| 12917 | 52 #include "syssignal.h" |
| 554 | 53 |
| 314 | 54 #ifdef HAVE_X_WINDOWS |
| 55 #include "xterm.h" | |
| 25012 | 56 #endif /* HAVE_X_WINDOWS */ |
| 314 | 57 |
|
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
58 #ifdef HAVE_NTGUI |
|
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
59 #include "w32term.h" |
|
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
60 #endif /* HAVE_NTGUI */ |
|
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
61 |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
62 #ifdef MAC_OS |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
63 #include "macterm.h" |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
64 #endif /* MAC_OS */ |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
65 |
| 25012 | 66 /* Include systime.h after xterm.h to avoid double inclusion of time.h. */ |
| 67 | |
|
7808
52e2eb6245d4
Include systime.h after xterm.h.
Richard M. Stallman <rms@gnu.org>
parents:
7648
diff
changeset
|
68 #include "systime.h" |
|
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
69 #include <errno.h> |
|
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
70 |
| 25012 | 71 /* To get the prototype for `sleep'. */ |
| 72 | |
| 73 #ifdef HAVE_UNISTD_H | |
| 74 #include <unistd.h> | |
| 75 #endif | |
| 76 | |
| 314 | 77 /* Get number of chars of output now in the buffer of a stdio stream. |
| 25012 | 78 This ought to be built in in stdio, but it isn't. Some s- files |
| 79 override this because their stdio internals differ. */ | |
| 80 | |
|
5214
c4bf07b226be
(PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents:
5083
diff
changeset
|
81 #ifdef __GNU_LIBRARY__ |
| 25012 | 82 |
| 83 /* The s- file might have overridden the definition with one that | |
| 84 works for the system's C library. But we are using the GNU C | |
| 85 library, so this is the right definition for every system. */ | |
| 86 | |
|
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
87 #ifdef GNU_LIBRARY_PENDING_OUTPUT_COUNT |
|
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
88 #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
|
89 #else |
|
7443
a9cb818e5316
[__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents:
7247
diff
changeset
|
90 #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
|
91 #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
|
92 #endif |
|
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
93 #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
|
94 #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
|
95 #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
|
96 #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
|
97 #endif |
|
7443
a9cb818e5316
[__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents:
7247
diff
changeset
|
98 #ifndef PENDING_OUTPUT_COUNT |
| 314 | 99 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base) |
| 100 #endif | |
| 25012 | 101 #endif /* not __GNU_LIBRARY__ */ |
| 102 | |
|
41969
e669966d496e
Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents:
41120
diff
changeset
|
103 #if defined(HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES) |
| 29437 | 104 #include <term.h> /* for tgetent */ |
| 105 #endif | |
| 25012 | 106 |
| 107 /* Structure to pass dimensions around. Used for character bounding | |
| 108 boxes, glyph matrix dimensions and alike. */ | |
| 109 | |
| 110 struct dim | |
| 111 { | |
| 112 int width; | |
| 113 int height; | |
| 114 }; | |
| 115 | |
| 116 | |
| 117 /* Function prototypes. */ | |
| 118 | |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
119 static struct glyph_matrix *save_current_matrix P_ ((struct frame *)); |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
120 static void restore_current_matrix P_ ((struct frame *, struct glyph_matrix *)); |
|
77267
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
121 static int showing_window_margins_p P_ ((struct window *)); |
|
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
122 static void fake_current_matrices P_ ((Lisp_Object)); |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
123 static void redraw_overlapping_rows P_ ((struct window *, int)); |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
124 static void redraw_overlapped_rows P_ ((struct window *, int)); |
| 25012 | 125 static int count_blanks P_ ((struct glyph *, int)); |
| 126 static int count_match P_ ((struct glyph *, struct glyph *, | |
| 127 struct glyph *, struct glyph *)); | |
| 128 static unsigned line_draw_cost P_ ((struct glyph_matrix *, int)); | |
| 129 static void update_frame_line P_ ((struct frame *, int)); | |
| 130 static struct dim allocate_matrices_for_frame_redisplay | |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
131 P_ ((Lisp_Object, int, int, int, int *)); |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
132 static void allocate_matrices_for_window_redisplay P_ ((struct window *)); |
| 25012 | 133 static int realloc_glyph_pool P_ ((struct glyph_pool *, struct dim)); |
| 134 static void adjust_frame_glyphs P_ ((struct frame *)); | |
| 135 struct glyph_matrix *new_glyph_matrix P_ ((struct glyph_pool *)); | |
| 136 static void free_glyph_matrix P_ ((struct glyph_matrix *)); | |
| 137 static void adjust_glyph_matrix P_ ((struct window *, struct glyph_matrix *, | |
| 138 int, int, struct dim)); | |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
139 static void change_frame_size_1 P_ ((struct frame *, int, int, int, int, int)); |
| 25012 | 140 static void swap_glyph_pointers P_ ((struct glyph_row *, struct glyph_row *)); |
|
34895
53e52b3525bf
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34893
diff
changeset
|
141 #if GLYPH_DEBUG |
| 25012 | 142 static int glyph_row_slice_p P_ ((struct glyph_row *, struct glyph_row *)); |
|
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
143 #endif |
| 25012 | 144 static void fill_up_frame_row_with_spaces P_ ((struct glyph_row *, int)); |
| 145 static void build_frame_matrix_from_window_tree P_ ((struct glyph_matrix *, | |
| 146 struct window *)); | |
| 147 static void build_frame_matrix_from_leaf_window P_ ((struct glyph_matrix *, | |
| 148 struct window *)); | |
| 149 static struct glyph_pool *new_glyph_pool P_ ((void)); | |
| 150 static void free_glyph_pool P_ ((struct glyph_pool *)); | |
| 151 static void adjust_frame_glyphs_initially P_ ((void)); | |
| 152 static void adjust_frame_message_buffer P_ ((struct frame *)); | |
| 153 static void adjust_decode_mode_spec_buffer P_ ((struct frame *)); | |
| 154 static void fill_up_glyph_row_with_spaces P_ ((struct glyph_row *)); | |
| 155 static void build_frame_matrix P_ ((struct frame *)); | |
| 156 void clear_current_matrices P_ ((struct frame *)); | |
| 157 void scroll_glyph_matrix_range P_ ((struct glyph_matrix *, int, int, | |
| 158 int, int)); | |
| 159 static void clear_window_matrices P_ ((struct window *, int)); | |
| 160 static void fill_up_glyph_row_area_with_spaces P_ ((struct glyph_row *, int)); | |
| 161 static int scrolling_window P_ ((struct window *, int)); | |
|
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
162 static int update_window_line P_ ((struct window *, int, int *)); |
| 25012 | 163 static void update_marginal_area P_ ((struct window *, int, int)); |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
164 static int update_text_area P_ ((struct window *, int)); |
| 25012 | 165 static void make_current P_ ((struct glyph_matrix *, struct glyph_matrix *, |
| 166 int)); | |
| 167 static void mirror_make_current P_ ((struct window *, int)); | |
| 168 void check_window_matrix_pointers P_ ((struct window *)); | |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
169 #if GLYPH_DEBUG |
| 25012 | 170 static void check_matrix_pointers P_ ((struct glyph_matrix *, |
| 171 struct glyph_matrix *)); | |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
172 #endif |
| 25012 | 173 static void mirror_line_dance P_ ((struct window *, int, int, int *, char *)); |
| 174 static int update_window_tree P_ ((struct window *, int)); | |
| 175 static int update_window P_ ((struct window *, int)); | |
| 176 static int update_frame_1 P_ ((struct frame *, int, int)); | |
| 177 static void set_window_cursor_after_update P_ ((struct window *)); | |
| 178 static int row_equal_p P_ ((struct window *, struct glyph_row *, | |
|
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
179 struct glyph_row *, int)); |
| 25012 | 180 static void adjust_frame_glyphs_for_window_redisplay P_ ((struct frame *)); |
| 181 static void adjust_frame_glyphs_for_frame_redisplay P_ ((struct frame *)); | |
| 182 static void reverse_rows P_ ((struct glyph_matrix *, int, int)); | |
| 183 static int margin_glyphs_to_reserve P_ ((struct window *, int, Lisp_Object)); | |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
184 static void sync_window_with_frame_matrix_rows P_ ((struct window *)); |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
185 struct window *frame_row_to_window P_ ((struct window *, int)); |
| 25012 | 186 |
| 187 | |
| 188 /* Non-zero means don't pause redisplay for pending input. (This is | |
| 189 for debugging and for a future implementation of EDT-like | |
| 190 scrolling. */ | |
| 191 | |
| 192 int redisplay_dont_pause; | |
|
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
193 |
|
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
194 /* 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
|
195 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
|
196 regular intervals. */ |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
197 #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
|
198 #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
|
199 #else |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
200 #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
|
201 #endif |
|
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 #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
|
204 |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
205 /* 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
|
206 |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
207 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
|
208 |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
209 /* 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
|
210 |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
211 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
|
212 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
|
213 |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
214 #endif |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
215 |
| 554 | 216 /* Nonzero upon entry to redisplay means do not assume anything about |
| 764 | 217 current contents of actual terminal frame; clear and redraw it. */ |
| 314 | 218 |
| 764 | 219 int frame_garbaged; |
| 314 | 220 |
| 25012 | 221 /* Nonzero means last display completed. Zero means it was preempted. */ |
| 314 | 222 |
| 223 int display_completed; | |
| 224 | |
| 25012 | 225 /* Lisp variable visible-bell; enables use of screen-flash instead of |
| 226 audible bell. */ | |
| 314 | 227 |
| 228 int visible_bell; | |
| 229 | |
| 764 | 230 /* Invert the color of the whole frame, at a low level. */ |
| 314 | 231 |
| 232 int inverse_video; | |
| 233 | |
| 234 /* Line speed of the terminal. */ | |
| 235 | |
|
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
|
236 EMACS_INT baud_rate; |
| 314 | 237 |
| 25012 | 238 /* 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
|
239 creates the first frame. */ |
|
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
240 |
|
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
241 Lisp_Object Vinitial_window_system; |
| 314 | 242 |
| 243 /* Version number of X windows: 10, 11 or nil. */ | |
| 25012 | 244 |
| 314 | 245 Lisp_Object Vwindow_system_version; |
| 246 | |
| 25012 | 247 /* Vector of glyph definitions. Indexed by glyph number, the contents |
| 248 are a string which is how to output the glyph. | |
| 314 | 249 |
| 250 If Vglyph_table is nil, a glyph is output by using its low 8 bits | |
| 25012 | 251 as a character code. |
| 252 | |
| 253 This is an obsolete feature that is no longer used. The variable | |
| 254 is retained for compatibility. */ | |
| 314 | 255 |
| 256 Lisp_Object Vglyph_table; | |
| 257 | |
| 258 /* Display table to use for vectors that don't specify their own. */ | |
| 259 | |
| 260 Lisp_Object Vstandard_display_table; | |
| 261 | |
| 25012 | 262 /* 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
|
263 cursor on mini-buffer after the prompt. Positive means at end of |
| 25012 | 264 text in echo area; negative means at beginning of line. */ |
| 265 | |
| 314 | 266 int cursor_in_echo_area; |
|
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
267 |
|
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
268 Lisp_Object Qdisplay_table, Qredisplay_dont_pause; |
| 25012 | 269 |
| 314 | 270 |
| 25012 | 271 /* 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
|
272 variable always equals the_only_frame. */ |
|
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
273 |
|
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
274 Lisp_Object selected_frame; |
| 25012 | 275 |
| 276 /* A frame which is not just a mini-buffer, or 0 if there are no such | |
| 764 | 277 frames. This is usually the most recent such frame that was |
| 9572 | 278 selected. In a single-frame version, this variable always holds |
| 279 the address of the_only_frame. */ | |
| 25012 | 280 |
| 281 struct frame *last_nonminibuf_frame; | |
| 282 | |
| 283 /* 1 means SIGWINCH happened when not safe. */ | |
| 284 | |
| 285 int delayed_size_change; | |
| 286 | |
| 287 /* 1 means glyph initialization has been completed at startup. */ | |
| 288 | |
| 289 static int glyphs_initialized_initially_p; | |
| 290 | |
| 291 /* Updated window if != 0. Set by update_window. */ | |
| 292 | |
| 293 struct window *updated_window; | |
| 294 | |
| 295 /* Glyph row updated in update_window_line, and area that is updated. */ | |
| 296 | |
| 297 struct glyph_row *updated_row; | |
| 298 int updated_area; | |
| 299 | |
| 300 /* A glyph for a space. */ | |
| 301 | |
| 302 struct glyph space_glyph; | |
| 303 | |
| 304 /* Non-zero means update has been performed directly, so that there's | |
| 305 no need for redisplay_internal to do much work. Set by | |
| 306 direct_output_for_insert. */ | |
| 307 | |
| 308 int redisplay_performed_directly_p; | |
| 309 | |
| 310 /* Counts of allocated structures. These counts serve to diagnose | |
| 311 memory leaks and double frees. */ | |
| 312 | |
| 313 int glyph_matrix_count; | |
| 314 int glyph_pool_count; | |
| 315 | |
| 316 /* If non-null, the frame whose frame matrices are manipulated. If | |
| 317 null, window matrices are worked on. */ | |
| 318 | |
| 319 static struct frame *frame_matrix_frame; | |
| 320 | |
| 321 /* Non-zero means that fonts have been loaded since the last glyph | |
| 322 matrix adjustments. Redisplay must stop, and glyph matrices must | |
| 323 be adjusted when this flag becomes non-zero during display. The | |
| 324 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
|
325 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
|
326 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
|
327 variable-width fonts. */ |
| 25012 | 328 |
| 329 int fonts_changed_p; | |
| 330 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
331 /* Convert vpos and hpos from frame to window and vice versa. |
| 25012 | 332 This may only be used for terminal frames. */ |
| 333 | |
| 334 #if GLYPH_DEBUG | |
| 335 | |
| 336 static int window_to_frame_vpos P_ ((struct window *, int)); | |
| 337 static int window_to_frame_hpos P_ ((struct window *, int)); | |
| 338 #define WINDOW_TO_FRAME_VPOS(W, VPOS) window_to_frame_vpos ((W), (VPOS)) | |
| 339 #define WINDOW_TO_FRAME_HPOS(W, HPOS) window_to_frame_hpos ((W), (HPOS)) | |
| 340 | |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
341 /* 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
|
342 information. */ |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
343 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
344 struct redisplay_history |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
345 { |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
346 char trace[512 + 100]; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
347 }; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
348 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
349 /* The size of the history buffer. */ |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
350 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
351 #define REDISPLAY_HISTORY_SIZE 30 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
352 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
353 /* The redisplay history buffer. */ |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
354 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
355 static struct redisplay_history redisplay_history[REDISPLAY_HISTORY_SIZE]; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
356 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
357 /* Next free entry in redisplay_history. */ |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
358 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
359 static int history_idx; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
360 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
361 /* 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
|
362 history. */ |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
363 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
364 static unsigned history_tick; |
|
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 static void add_frame_display_history P_ ((struct frame *, int)); |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
367 static void add_window_display_history P_ ((struct window *, char *, int)); |
| 71141 | 368 |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
369 /* 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
|
370 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
|
371 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
|
372 has been interrupted for pending input. */ |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
373 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
374 static void |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
375 add_window_display_history (w, msg, paused_p) |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
376 struct window *w; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
377 char *msg; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
378 int paused_p; |
|
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 char *buf; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
381 |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
382 if (history_idx >= REDISPLAY_HISTORY_SIZE) |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
383 history_idx = 0; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
384 buf = redisplay_history[history_idx].trace; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
385 ++history_idx; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
386 |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
387 sprintf (buf, "%d: window %p (`%s')%s\n", |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
388 history_tick++, |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
389 w, |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
390 ((BUFFERP (w->buffer) |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
391 && 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
|
392 ? (char *) SDATA (XBUFFER (w->buffer)->name) |
|
34866
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 paused_p ? " ***paused***" : ""); |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
395 strcat (buf, msg); |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
396 } |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
397 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
398 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
399 /* 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
|
400 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
|
401 pending input. */ |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
402 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
403 static void |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
404 add_frame_display_history (f, paused_p) |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
405 struct frame *f; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
406 int paused_p; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
407 { |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
408 char *buf; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
409 |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
410 if (history_idx >= REDISPLAY_HISTORY_SIZE) |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
411 history_idx = 0; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
412 buf = redisplay_history[history_idx].trace; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
413 ++history_idx; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
414 |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
415 sprintf (buf, "%d: update frame %p%s", |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
416 history_tick++, |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
417 f, paused_p ? " ***paused***" : ""); |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
418 } |
|
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 DEFUN ("dump-redisplay-history", Fdump_redisplay_history, |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
422 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
|
423 doc: /* Dump redisplay history to stderr. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
424 () |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
425 { |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
426 int i; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
427 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
428 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
|
429 { |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
430 if (i < 0) |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
431 i = REDISPLAY_HISTORY_SIZE - 1; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
432 fprintf (stderr, "%s\n", redisplay_history[i].trace); |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
433 } |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
434 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
435 return Qnil; |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
436 } |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
437 |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
438 |
| 25012 | 439 #else /* GLYPH_DEBUG == 0 */ |
| 440 | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
441 #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
|
442 #define WINDOW_TO_FRAME_HPOS(W, HPOS) ((HPOS) + WINDOW_LEFT_EDGE_COL (W)) |
| 25012 | 443 |
| 444 #endif /* GLYPH_DEBUG == 0 */ | |
| 445 | |
| 446 | |
| 447 /* Like bcopy except never gets confused by overlap. Let this be the | |
| 448 first function defined in this file, or change emacs.c where the | |
| 449 address of this function is used. */ | |
| 314 | 450 |
| 451 void | |
| 452 safe_bcopy (from, to, size) | |
|
46551
227785e3e29f
(safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
453 const char *from; |
|
227785e3e29f
(safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
454 char *to; |
| 314 | 455 int size; |
| 456 { | |
|
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
457 if (size <= 0 || from == to) |
| 314 | 458 return; |
| 459 | |
|
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
460 /* If the source and destination don't overlap, then bcopy can |
|
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
461 handle it. If they do overlap, but the destination is lower in |
|
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
462 memory than the source, we'll assume bcopy can handle that. */ |
|
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
463 if (to < from || from + size <= to) |
|
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
464 bcopy (from, to, size); |
|
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
465 |
|
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
466 /* Otherwise, we'll copy from the end. */ |
|
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
467 else |
| 314 | 468 { |
|
46551
227785e3e29f
(safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
469 register const char *endf = from + size; |
|
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
470 register char *endt = to + size; |
| 314 | 471 |
| 472 /* If TO - FROM is large, then we should break the copy into | |
| 473 nonoverlapping chunks of TO - FROM bytes each. However, if | |
| 474 TO - FROM is small, then the bcopy function call overhead | |
| 475 makes this not worth it. The crossover point could be about | |
|
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
476 anywhere. Since I don't think the obvious copy loop is too |
|
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
477 bad, I'm trying to err in its favor. */ |
| 314 | 478 if (to - from < 64) |
| 479 { | |
| 480 do | |
| 481 *--endt = *--endf; | |
| 482 while (endf != from); | |
| 483 } | |
| 484 else | |
| 485 { | |
|
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
486 for (;;) |
| 314 | 487 { |
| 488 endt -= (to - from); | |
| 489 endf -= (to - from); | |
| 490 | |
|
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
491 if (endt < to) |
|
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
492 break; |
|
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
493 |
| 314 | 494 bcopy (endf, endt, to - from); |
| 495 } | |
|
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
496 |
|
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
497 /* If SIZE wasn't a multiple of TO - FROM, there will be a |
| 25012 | 498 little left over. The amount left over is (endt + (to - |
| 499 from)) - to, which is endt - from. */ | |
| 314 | 500 bcopy (from, to, endt - from); |
| 501 } | |
| 502 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
503 } |
| 314 | 504 |
| 25012 | 505 |
| 506 | |
| 507 /*********************************************************************** | |
| 508 Glyph Matrices | |
| 509 ***********************************************************************/ | |
| 510 | |
| 511 /* Allocate and return a glyph_matrix structure. POOL is the glyph | |
| 512 pool from which memory for the matrix should be allocated, or null | |
| 513 for window-based redisplay where no glyph pools are used. The | |
| 514 member `pool' of the glyph matrix structure returned is set to | |
| 515 POOL, the structure is otherwise zeroed. */ | |
| 516 | |
| 517 struct glyph_matrix * | |
| 518 new_glyph_matrix (pool) | |
| 519 struct glyph_pool *pool; | |
| 520 { | |
| 521 struct glyph_matrix *result; | |
| 522 | |
| 523 /* Allocate and clear. */ | |
| 524 result = (struct glyph_matrix *) xmalloc (sizeof *result); | |
| 525 bzero (result, sizeof *result); | |
| 526 | |
| 527 /* Increment number of allocated matrices. This count is used | |
| 528 to detect memory leaks. */ | |
| 529 ++glyph_matrix_count; | |
| 530 | |
| 531 /* Set pool and return. */ | |
| 532 result->pool = pool; | |
| 533 return result; | |
| 534 } | |
| 535 | |
| 536 | |
| 537 /* Free glyph matrix MATRIX. Passing in a null MATRIX is allowed. | |
| 538 | |
| 539 The global counter glyph_matrix_count is decremented when a matrix | |
| 540 is freed. If the count gets negative, more structures were freed | |
| 541 than allocated, i.e. one matrix was freed more than once or a bogus | |
| 542 pointer was passed to this function. | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
543 |
| 25012 | 544 If MATRIX->pool is null, this means that the matrix manages its own |
| 545 glyph memory---this is done for matrices on X frames. Freeing the | |
| 546 matrix also frees the glyph memory in this case. */ | |
| 547 | |
| 548 static void | |
| 549 free_glyph_matrix (matrix) | |
| 550 struct glyph_matrix *matrix; | |
| 551 { | |
| 552 if (matrix) | |
| 553 { | |
| 554 int i; | |
| 555 | |
| 556 /* Detect the case that more matrices are freed than were | |
| 557 allocated. */ | |
| 558 if (--glyph_matrix_count < 0) | |
| 559 abort (); | |
| 560 | |
| 561 /* Free glyph memory if MATRIX owns it. */ | |
| 562 if (matrix->pool == NULL) | |
| 563 for (i = 0; i < matrix->rows_allocated; ++i) | |
| 564 xfree (matrix->rows[i].glyphs[LEFT_MARGIN_AREA]); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
565 |
| 25012 | 566 /* Free row structures and the matrix itself. */ |
| 567 xfree (matrix->rows); | |
| 568 xfree (matrix); | |
| 569 } | |
| 570 } | |
| 571 | |
| 572 | |
| 573 /* Return the number of glyphs to reserve for a marginal area of | |
| 574 window W. TOTAL_GLYPHS is the number of glyphs in a complete | |
| 575 display line of window W. MARGIN gives the width of the marginal | |
| 576 area in canonical character units. MARGIN should be an integer | |
| 577 or a float. */ | |
| 578 | |
| 579 static int | |
| 580 margin_glyphs_to_reserve (w, total_glyphs, margin) | |
| 581 struct window *w; | |
| 582 int total_glyphs; | |
| 583 Lisp_Object margin; | |
| 584 { | |
| 585 int n; | |
| 586 | |
| 587 if (NUMBERP (margin)) | |
| 588 { | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
589 int width = XFASTINT (w->total_cols); |
| 25012 | 590 double d = max (0, XFLOATINT (margin)); |
| 591 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
|
592 n = (int) ((double) total_glyphs / width * d); |
| 25012 | 593 } |
| 594 else | |
| 595 n = 0; | |
| 596 | |
| 597 return n; | |
| 598 } | |
| 599 | |
| 600 | |
| 601 /* Adjust glyph matrix MATRIX on window W or on a frame to changed | |
| 602 window sizes. | |
| 603 | |
| 604 W is null if the function is called for a frame glyph matrix. | |
| 605 Otherwise it is the window MATRIX is a member of. X and Y are the | |
| 606 indices of the first column and row of MATRIX within the frame | |
| 607 matrix, if such a matrix exists. They are zero for purely | |
| 608 window-based redisplay. DIM is the needed size of the matrix. | |
| 609 | |
| 610 In window-based redisplay, where no frame matrices exist, glyph | |
| 611 matrices manage their own glyph storage. Otherwise, they allocate | |
| 612 storage from a common frame glyph pool which can be found in | |
| 613 MATRIX->pool. | |
| 614 | |
| 615 The reason for this memory management strategy is to avoid complete | |
| 616 frame redraws if possible. When we allocate from a common pool, a | |
| 617 change of the location or size of a sub-matrix within the pool | |
| 618 requires a complete redisplay of the frame because we cannot easily | |
| 619 make sure that the current matrices of all windows still agree with | |
| 620 what is displayed on the screen. While this is usually fast, it | |
| 621 leads to screen flickering. */ | |
| 622 | |
| 623 static void | |
| 624 adjust_glyph_matrix (w, matrix, x, y, dim) | |
| 625 struct window *w; | |
| 626 struct glyph_matrix *matrix; | |
| 627 int x, y; | |
| 628 struct dim dim; | |
| 629 { | |
| 630 int i; | |
| 631 int new_rows; | |
| 632 int marginal_areas_changed_p = 0; | |
| 25546 | 633 int header_line_changed_p = 0; |
| 634 int header_line_p = 0; | |
| 25012 | 635 int left = -1, right = -1; |
|
80274
b818bce5757f
(adjust_glyph_matrix): Initialize window_height.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
636 int window_width = -1, window_height = -1; |
| 25012 | 637 |
|
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
638 /* 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
|
639 Get W's size. */ |
| 25012 | 640 if (w) |
| 641 { | |
|
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
642 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
|
643 |
| 25546 | 644 header_line_p = WINDOW_WANTS_HEADER_LINE_P (w); |
| 645 header_line_changed_p = header_line_p != matrix->header_line_p; | |
| 25012 | 646 } |
| 25546 | 647 matrix->header_line_p = header_line_p; |
| 25012 | 648 |
|
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
649 /* 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
|
650 Do nothing if MATRIX' size, position, vscroll, and marginal areas |
| 25012 | 651 haven't changed. This optimization is important because preserving |
| 652 the matrix means preventing redisplay. */ | |
| 653 if (matrix->pool == NULL) | |
| 654 { | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
655 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
|
656 right = margin_glyphs_to_reserve (w, dim.width, w->right_margin_cols); |
| 25012 | 657 xassert (left >= 0 && right >= 0); |
| 658 marginal_areas_changed_p = (left != matrix->left_margin_glyphs | |
| 659 || right != matrix->right_margin_glyphs); | |
| 660 | |
| 661 if (!marginal_areas_changed_p | |
| 662 && !fonts_changed_p | |
| 25546 | 663 && !header_line_changed_p |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
664 && 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
|
665 && matrix->window_top_line == WINDOW_TOP_EDGE_LINE (w) |
| 25012 | 666 && matrix->window_height == window_height |
| 667 && matrix->window_vscroll == w->vscroll | |
| 668 && matrix->window_width == window_width) | |
| 669 return; | |
| 670 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
671 |
| 25012 | 672 /* Enlarge MATRIX->rows if necessary. New rows are cleared. */ |
| 673 if (matrix->rows_allocated < dim.height) | |
| 674 { | |
| 675 int size = dim.height * sizeof (struct glyph_row); | |
| 676 new_rows = dim.height - matrix->rows_allocated; | |
| 677 matrix->rows = (struct glyph_row *) xrealloc (matrix->rows, size); | |
| 678 bzero (matrix->rows + matrix->rows_allocated, | |
| 679 new_rows * sizeof *matrix->rows); | |
| 680 matrix->rows_allocated = dim.height; | |
| 681 } | |
| 682 else | |
| 683 new_rows = 0; | |
| 684 | |
| 685 /* If POOL is not null, MATRIX is a frame matrix or a window matrix | |
| 686 on a frame not using window-based redisplay. Set up pointers for | |
| 687 each row into the glyph pool. */ | |
| 688 if (matrix->pool) | |
| 689 { | |
| 690 xassert (matrix->pool->glyphs); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
691 |
| 25012 | 692 if (w) |
| 693 { | |
| 694 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
|
695 w->left_margin_cols); |
| 25012 | 696 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
|
697 w->right_margin_cols); |
| 25012 | 698 } |
| 699 else | |
| 700 left = right = 0; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
701 |
| 25012 | 702 for (i = 0; i < dim.height; ++i) |
| 703 { | |
| 704 struct glyph_row *row = &matrix->rows[i]; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
705 |
|
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
706 row->glyphs[LEFT_MARGIN_AREA] |
| 25012 | 707 = (matrix->pool->glyphs |
| 708 + (y + i) * matrix->pool->ncolumns | |
| 709 + x); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
710 |
| 25012 | 711 if (w == NULL |
| 712 || row == matrix->rows + dim.height - 1 | |
| 25546 | 713 || (row == matrix->rows && matrix->header_line_p)) |
| 25012 | 714 { |
| 715 row->glyphs[TEXT_AREA] | |
| 716 = row->glyphs[LEFT_MARGIN_AREA]; | |
| 717 row->glyphs[RIGHT_MARGIN_AREA] | |
| 718 = row->glyphs[TEXT_AREA] + dim.width; | |
| 719 row->glyphs[LAST_AREA] | |
| 720 = row->glyphs[RIGHT_MARGIN_AREA]; | |
| 721 } | |
| 722 else | |
| 723 { | |
| 724 row->glyphs[TEXT_AREA] | |
| 725 = row->glyphs[LEFT_MARGIN_AREA] + left; | |
| 726 row->glyphs[RIGHT_MARGIN_AREA] | |
| 727 = row->glyphs[TEXT_AREA] + dim.width - left - right; | |
| 728 row->glyphs[LAST_AREA] | |
| 729 = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | |
| 730 } | |
| 731 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
732 |
| 25012 | 733 matrix->left_margin_glyphs = left; |
| 734 matrix->right_margin_glyphs = right; | |
| 735 } | |
| 736 else | |
| 737 { | |
| 738 /* 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
|
739 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
|
740 Allocate glyph memory from the heap. */ |
| 25012 | 741 if (dim.width > matrix->matrix_w |
| 742 || new_rows | |
| 25546 | 743 || header_line_changed_p |
| 25012 | 744 || marginal_areas_changed_p) |
| 745 { | |
| 746 struct glyph_row *row = matrix->rows; | |
| 747 struct glyph_row *end = row + matrix->rows_allocated; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
748 |
| 25012 | 749 while (row < end) |
| 750 { | |
| 751 row->glyphs[LEFT_MARGIN_AREA] | |
| 752 = (struct glyph *) xrealloc (row->glyphs[LEFT_MARGIN_AREA], | |
| 753 (dim.width | |
| 754 * sizeof (struct glyph))); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
755 |
| 25012 | 756 /* The mode line never has marginal areas. */ |
| 757 if (row == matrix->rows + dim.height - 1 | |
| 25546 | 758 || (row == matrix->rows && matrix->header_line_p)) |
| 25012 | 759 { |
| 760 row->glyphs[TEXT_AREA] | |
| 761 = row->glyphs[LEFT_MARGIN_AREA]; | |
| 762 row->glyphs[RIGHT_MARGIN_AREA] | |
| 763 = row->glyphs[TEXT_AREA] + dim.width; | |
| 764 row->glyphs[LAST_AREA] | |
| 765 = row->glyphs[RIGHT_MARGIN_AREA]; | |
| 766 } | |
| 767 else | |
| 768 { | |
| 769 row->glyphs[TEXT_AREA] | |
| 770 = row->glyphs[LEFT_MARGIN_AREA] + left; | |
| 771 row->glyphs[RIGHT_MARGIN_AREA] | |
| 772 = row->glyphs[TEXT_AREA] + dim.width - left - right; | |
| 773 row->glyphs[LAST_AREA] | |
| 774 = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | |
| 775 } | |
| 776 ++row; | |
| 777 } | |
| 778 } | |
| 779 | |
| 780 xassert (left >= 0 && right >= 0); | |
| 781 matrix->left_margin_glyphs = left; | |
| 782 matrix->right_margin_glyphs = right; | |
| 783 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
784 |
| 25012 | 785 /* Number of rows to be used by MATRIX. */ |
| 786 matrix->nrows = dim.height; | |
|
31932
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
787 xassert (matrix->nrows >= 0); |
| 25012 | 788 |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
789 if (w) |
| 25012 | 790 { |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
791 if (matrix == w->current_matrix) |
| 25012 | 792 { |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
793 /* 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
|
794 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
|
795 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
|
796 building desired matrices when this function runs. */ |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
797 if (window_width < 0) |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
798 window_width = window_box_width (w, -1); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
799 |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
800 /* 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
|
801 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
|
802 of the window. */ |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
803 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
|
804 && !header_line_changed_p |
|
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
805 && new_rows == 0 |
|
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
806 && dim.width == matrix->matrix_w |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
807 && 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
|
808 && 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
|
809 && matrix->window_width == window_width) |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
810 { |
|
38528
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
811 /* Find the last row in the window. */ |
|
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
812 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
|
813 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
|
814 { |
|
38748
bb32ae33769e
(adjust_glyph_matrix): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
38734
diff
changeset
|
815 ++i; |
|
38528
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
816 break; |
|
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
817 } |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
818 |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
819 /* 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
|
820 are invalidated below. */ |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
821 if (INTEGERP (w->window_end_vpos) |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
822 && XFASTINT (w->window_end_vpos) >= i) |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
823 w->window_end_valid = Qnil; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
824 |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
825 while (i < matrix->nrows) |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
826 matrix->rows[i++].enabled_p = 0; |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
827 } |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
828 else |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
829 { |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
830 for (i = 0; i < matrix->nrows; ++i) |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
831 matrix->rows[i].enabled_p = 0; |
|
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
832 } |
| 25012 | 833 } |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
834 else if (matrix == w->desired_matrix) |
| 25012 | 835 { |
|
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
836 /* 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
|
837 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
|
838 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
|
839 redisplays. */ |
| 25012 | 840 for (i = 0; i < matrix->nrows; ++i) |
| 841 matrix->rows[i].enabled_p = 0; | |
| 842 } | |
| 843 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
844 |
|
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
845 |
| 25012 | 846 /* Remember last values to be able to optimize frame redraws. */ |
| 847 matrix->matrix_x = x; | |
| 848 matrix->matrix_y = y; | |
| 849 matrix->matrix_w = dim.width; | |
| 850 matrix->matrix_h = dim.height; | |
| 851 | |
| 852 /* Record the top y location and height of W at the time the matrix | |
| 853 was last adjusted. This is used to optimize redisplay above. */ | |
| 854 if (w) | |
| 855 { | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
856 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
|
857 matrix->window_top_line = WINDOW_TOP_EDGE_LINE (w); |
| 25012 | 858 matrix->window_height = window_height; |
| 859 matrix->window_width = window_width; | |
| 860 matrix->window_vscroll = w->vscroll; | |
| 861 } | |
| 862 } | |
| 863 | |
| 864 | |
| 865 /* Reverse the contents of rows in MATRIX between START and END. The | |
| 866 contents of the row at END - 1 end up at START, END - 2 at START + | |
| 867 1 etc. This is part of the implementation of rotate_matrix (see | |
| 868 below). */ | |
| 314 | 869 |
| 870 static void | |
| 25012 | 871 reverse_rows (matrix, start, end) |
| 872 struct glyph_matrix *matrix; | |
| 873 int start, end; | |
| 314 | 874 { |
| 25012 | 875 int i, j; |
| 876 | |
| 877 for (i = start, j = end - 1; i < j; ++i, --j) | |
| 878 { | |
| 879 /* Non-ISO HP/UX compiler doesn't like auto struct | |
| 880 initialization. */ | |
| 881 struct glyph_row temp; | |
| 882 temp = matrix->rows[i]; | |
| 883 matrix->rows[i] = matrix->rows[j]; | |
| 884 matrix->rows[j] = temp; | |
| 885 } | |
| 314 | 886 } |
| 887 | |
| 25012 | 888 |
| 889 /* Rotate the contents of rows in MATRIX in the range FIRST .. LAST - | |
| 890 1 by BY positions. BY < 0 means rotate left, i.e. towards lower | |
| 891 indices. (Note: this does not copy glyphs, only glyph pointers in | |
| 892 row structures are moved around). | |
| 893 | |
| 894 The algorithm used for rotating the vector was, I believe, first | |
| 895 described by Kernighan. See the vector R as consisting of two | |
| 896 sub-vectors AB, where A has length BY for BY >= 0. The result | |
| 897 after rotating is then BA. Reverse both sub-vectors to get ArBr | |
| 898 and reverse the result to get (ArBr)r which is BA. Similar for | |
| 899 rotating right. */ | |
| 900 | |
| 901 void | |
| 902 rotate_matrix (matrix, first, last, by) | |
| 903 struct glyph_matrix *matrix; | |
| 904 int first, last, by; | |
| 314 | 905 { |
| 25012 | 906 if (by < 0) |
| 907 { | |
| 908 /* Up (rotate left, i.e. towards lower indices). */ | |
| 909 by = -by; | |
| 910 reverse_rows (matrix, first, first + by); | |
| 911 reverse_rows (matrix, first + by, last); | |
| 912 reverse_rows (matrix, first, last); | |
| 913 } | |
| 914 else if (by > 0) | |
| 314 | 915 { |
| 25012 | 916 /* Down (rotate right, i.e. towards higher indices). */ |
| 917 reverse_rows (matrix, last - by, last); | |
| 918 reverse_rows (matrix, first, last - by); | |
| 919 reverse_rows (matrix, first, last); | |
| 314 | 920 } |
| 25012 | 921 } |
| 922 | |
| 923 | |
| 924 /* Increment buffer positions in glyph rows of MATRIX. Do it for rows | |
| 925 with indices START <= index < END. Increment positions by DELTA/ | |
| 926 DELTA_BYTES. */ | |
| 927 | |
| 928 void | |
|
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
929 increment_matrix_positions (matrix, start, end, delta, delta_bytes) |
| 25012 | 930 struct glyph_matrix *matrix; |
| 931 int start, end, delta, delta_bytes; | |
| 932 { | |
| 933 /* Check that START and END are reasonable values. */ | |
| 934 xassert (start >= 0 && start <= matrix->nrows); | |
| 935 xassert (end >= 0 && end <= matrix->nrows); | |
| 936 xassert (start <= end); | |
| 937 | |
| 938 for (; start < end; ++start) | |
|
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
939 increment_row_positions (matrix->rows + start, delta, delta_bytes); |
| 25012 | 940 } |
| 941 | |
| 942 | |
| 943 /* Enable a range of rows in glyph matrix MATRIX. START and END are | |
| 944 the row indices of the first and last + 1 row to enable. If | |
| 945 ENABLED_P is non-zero, enabled_p flags in rows will be set to 1. */ | |
| 946 | |
| 947 void | |
| 948 enable_glyph_matrix_rows (matrix, start, end, enabled_p) | |
| 949 struct glyph_matrix *matrix; | |
| 950 int start, end; | |
| 951 int enabled_p; | |
| 952 { | |
|
31932
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
953 xassert (start <= end); |
|
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
954 xassert (start >= 0 && start < matrix->nrows); |
|
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
955 xassert (end >= 0 && end <= matrix->nrows); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
956 |
| 25012 | 957 for (; start < end; ++start) |
| 958 matrix->rows[start].enabled_p = enabled_p != 0; | |
| 959 } | |
| 960 | |
| 961 | |
| 962 /* Clear MATRIX. | |
| 963 | |
| 964 This empties all rows in MATRIX by setting the enabled_p flag for | |
| 965 all rows of the matrix to zero. The function prepare_desired_row | |
| 966 will eventually really clear a row when it sees one with a zero | |
| 967 enabled_p flag. | |
| 968 | |
| 969 Resets update hints to defaults value. The only update hint | |
| 970 currently present is the flag MATRIX->no_scrolling_p. */ | |
| 971 | |
| 972 void | |
| 973 clear_glyph_matrix (matrix) | |
| 974 struct glyph_matrix *matrix; | |
| 975 { | |
| 976 if (matrix) | |
| 314 | 977 { |
| 25012 | 978 enable_glyph_matrix_rows (matrix, 0, matrix->nrows, 0); |
| 979 matrix->no_scrolling_p = 0; | |
| 314 | 980 } |
| 981 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
982 |
| 25012 | 983 |
| 984 /* Shift part of the glyph matrix MATRIX of window W up or down. | |
| 985 Increment y-positions in glyph rows between START and END by DY, | |
| 986 and recompute their visible height. */ | |
| 987 | |
| 988 void | |
| 989 shift_glyph_matrix (w, matrix, start, end, dy) | |
| 990 struct window *w; | |
| 991 struct glyph_matrix *matrix; | |
| 992 int start, end, dy; | |
| 993 { | |
| 994 int min_y, max_y; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
995 |
| 25012 | 996 xassert (start <= end); |
| 997 xassert (start >= 0 && start < matrix->nrows); | |
| 998 xassert (end >= 0 && end <= matrix->nrows); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
999 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1000 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
|
1001 max_y = WINDOW_BOX_HEIGHT_NO_MODE_LINE (w); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1002 |
| 25012 | 1003 for (; start < end; ++start) |
| 1004 { | |
| 1005 struct glyph_row *row = &matrix->rows[start]; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1006 |
| 25012 | 1007 row->y += dy; |
|
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1008 row->visible_height = row->height; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1009 |
| 25012 | 1010 if (row->y < min_y) |
|
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1011 row->visible_height -= min_y - row->y; |
|
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1012 if (row->y + row->height > max_y) |
|
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1013 row->visible_height -= row->y + row->height - max_y; |
| 25012 | 1014 } |
| 1015 } | |
| 1016 | |
| 1017 | |
| 1018 /* Mark all rows in current matrices of frame F as invalid. Marking | |
| 1019 invalid is done by setting enabled_p to zero for all rows in a | |
| 1020 current matrix. */ | |
| 1021 | |
| 1022 void | |
| 1023 clear_current_matrices (f) | |
| 1024 register struct frame *f; | |
| 1025 { | |
| 1026 /* Clear frame current matrix, if we have one. */ | |
| 1027 if (f->current_matrix) | |
| 1028 clear_glyph_matrix (f->current_matrix); | |
| 1029 | |
| 1030 /* Clear the matrix of the menu bar window, if such a window exists. | |
| 1031 The menu bar window is currently used to display menus on X when | |
| 1032 no toolkit support is compiled in. */ | |
| 1033 if (WINDOWP (f->menu_bar_window)) | |
| 1034 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->current_matrix); | |
| 1035 | |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1036 /* 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
|
1037 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
|
1038 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix); |
| 25012 | 1039 |
| 1040 /* Clear current window matrices. */ | |
| 1041 xassert (WINDOWP (FRAME_ROOT_WINDOW (f))); | |
| 1042 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 0); | |
| 1043 } | |
| 1044 | |
| 1045 | |
| 1046 /* Clear out all display lines of F for a coming redisplay. */ | |
| 314 | 1047 |
| 21514 | 1048 void |
| 25012 | 1049 clear_desired_matrices (f) |
| 1050 register struct frame *f; | |
| 314 | 1051 { |
| 25012 | 1052 if (f->desired_matrix) |
| 1053 clear_glyph_matrix (f->desired_matrix); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1054 |
| 25012 | 1055 if (WINDOWP (f->menu_bar_window)) |
| 1056 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->desired_matrix); | |
| 1057 | |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1058 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
|
1059 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->desired_matrix); |
| 25012 | 1060 |
| 1061 /* Do it for window matrices. */ | |
| 1062 xassert (WINDOWP (FRAME_ROOT_WINDOW (f))); | |
| 1063 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 1); | |
| 1064 } | |
| 1065 | |
| 1066 | |
| 1067 /* Clear matrices in window tree rooted in W. If DESIRED_P is | |
| 1068 non-zero clear desired matrices, otherwise clear current matrices. */ | |
| 1069 | |
| 1070 static void | |
| 1071 clear_window_matrices (w, desired_p) | |
| 1072 struct window *w; | |
| 1073 int desired_p; | |
| 1074 { | |
| 1075 while (w) | |
| 314 | 1076 { |
| 25012 | 1077 if (!NILP (w->hchild)) |
| 1078 { | |
| 1079 xassert (WINDOWP (w->hchild)); | |
| 1080 clear_window_matrices (XWINDOW (w->hchild), desired_p); | |
| 1081 } | |
| 1082 else if (!NILP (w->vchild)) | |
| 314 | 1083 { |
| 25012 | 1084 xassert (WINDOWP (w->vchild)); |
| 1085 clear_window_matrices (XWINDOW (w->vchild), desired_p); | |
| 1086 } | |
| 1087 else | |
| 1088 { | |
| 1089 if (desired_p) | |
| 1090 clear_glyph_matrix (w->desired_matrix); | |
| 1091 else | |
| 314 | 1092 { |
| 25012 | 1093 clear_glyph_matrix (w->current_matrix); |
| 1094 w->window_end_valid = Qnil; | |
| 314 | 1095 } |
| 25012 | 1096 } |
| 1097 | |
| 1098 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
| 1099 } | |
| 1100 } | |
| 1101 | |
| 1102 | |
| 1103 | |
| 1104 /*********************************************************************** | |
| 1105 Glyph Rows | |
| 1106 | |
| 1107 See dispextern.h for an overall explanation of glyph rows. | |
| 1108 ***********************************************************************/ | |
| 1109 | |
| 1110 /* Clear glyph row ROW. Do it in a way that makes it robust against | |
| 1111 changes in the glyph_row structure, i.e. addition or removal of | |
| 1112 structure members. */ | |
| 1113 | |
|
33527
c4c7abc48752
(null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents:
33101
diff
changeset
|
1114 static struct glyph_row null_row; |
|
c4c7abc48752
(null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents:
33101
diff
changeset
|
1115 |
| 25012 | 1116 void |
| 1117 clear_glyph_row (row) | |
| 1118 struct glyph_row *row; | |
| 1119 { | |
| 1120 struct glyph *p[1 + LAST_AREA]; | |
| 1121 | |
| 1122 /* Save pointers. */ | |
| 1123 p[LEFT_MARGIN_AREA] = row->glyphs[LEFT_MARGIN_AREA]; | |
| 1124 p[TEXT_AREA] = row->glyphs[TEXT_AREA]; | |
| 1125 p[RIGHT_MARGIN_AREA] = row->glyphs[RIGHT_MARGIN_AREA]; | |
| 1126 p[LAST_AREA] = row->glyphs[LAST_AREA]; | |
| 1127 | |
| 1128 /* Clear. */ | |
| 1129 *row = null_row; | |
| 1130 | |
| 1131 /* Restore pointers. */ | |
| 1132 row->glyphs[LEFT_MARGIN_AREA] = p[LEFT_MARGIN_AREA]; | |
| 1133 row->glyphs[TEXT_AREA] = p[TEXT_AREA]; | |
| 1134 row->glyphs[RIGHT_MARGIN_AREA] = p[RIGHT_MARGIN_AREA]; | |
| 1135 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
|
1136 |
|
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1137 #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
|
1138 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
|
1139 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
|
1140 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
|
1141 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
|
1142 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
|
1143 are that the flickering has the same reason as here. */ |
|
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1144 bzero (p[0], (char *) p[LAST_AREA] - (char *) p[0]); |
|
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1145 #endif |
| 25012 | 1146 } |
| 1147 | |
| 1148 | |
| 1149 /* Make ROW an empty, enabled row of canonical character height, | |
| 1150 in window W starting at y-position Y. */ | |
| 1151 | |
| 1152 void | |
| 1153 blank_row (w, row, y) | |
| 1154 struct window *w; | |
| 1155 struct glyph_row *row; | |
| 1156 int y; | |
| 1157 { | |
| 1158 int min_y, max_y; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1159 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1160 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
|
1161 max_y = WINDOW_BOX_HEIGHT_NO_MODE_LINE (w); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1162 |
| 25012 | 1163 clear_glyph_row (row); |
| 1164 row->y = y; | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1165 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
|
1166 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
|
1167 row->visible_height = row->height; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1168 |
| 25012 | 1169 if (row->y < min_y) |
|
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1170 row->visible_height -= min_y - row->y; |
|
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1171 if (row->y + row->height > max_y) |
|
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1172 row->visible_height -= row->y + row->height - max_y; |
| 25012 | 1173 |
| 1174 row->enabled_p = 1; | |
| 1175 } | |
| 1176 | |
| 1177 | |
| 1178 /* Increment buffer positions in glyph row ROW. DELTA and DELTA_BYTES | |
| 1179 are the amounts by which to change positions. Note that the first | |
| 1180 glyph of the text area of a row can have a buffer position even if | |
| 1181 the used count of the text area is zero. Such rows display line | |
| 1182 ends. */ | |
| 1183 | |
| 1184 void | |
|
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
1185 increment_row_positions (row, delta, delta_bytes) |
| 25012 | 1186 struct glyph_row *row; |
| 1187 int delta, delta_bytes; | |
| 1188 { | |
| 1189 int area, i; | |
| 1190 | |
| 1191 /* Increment start and end positions. */ | |
| 1192 MATRIX_ROW_START_CHARPOS (row) += delta; | |
| 1193 MATRIX_ROW_START_BYTEPOS (row) += delta_bytes; | |
| 1194 MATRIX_ROW_END_CHARPOS (row) += delta; | |
| 1195 MATRIX_ROW_END_BYTEPOS (row) += delta_bytes; | |
| 1196 | |
|
65003
74ab28cf1192
(increment_row_positions): Skip non-enabled rows.
Kim F. Storm <storm@cua.dk>
parents:
64776
diff
changeset
|
1197 if (!row->enabled_p) |
|
74ab28cf1192
(increment_row_positions): Skip non-enabled rows.
Kim F. Storm <storm@cua.dk>
parents:
64776
diff
changeset
|
1198 return; |
|
74ab28cf1192
(increment_row_positions): Skip non-enabled rows.
Kim F. Storm <storm@cua.dk>
parents:
64776
diff
changeset
|
1199 |
| 25012 | 1200 /* Increment positions in glyphs. */ |
| 1201 for (area = 0; area < LAST_AREA; ++area) | |
| 1202 for (i = 0; i < row->used[area]; ++i) | |
| 1203 if (BUFFERP (row->glyphs[area][i].object) | |
| 1204 && row->glyphs[area][i].charpos > 0) | |
| 1205 row->glyphs[area][i].charpos += delta; | |
| 1206 | |
| 1207 /* Capture the case of rows displaying a line end. */ | |
| 1208 if (row->used[TEXT_AREA] == 0 | |
| 1209 && MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
| 1210 row->glyphs[TEXT_AREA]->charpos += delta; | |
| 1211 } | |
| 1212 | |
| 1213 | |
|
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1214 #if 0 |
| 25012 | 1215 /* Swap glyphs between two glyph rows A and B. This exchanges glyph |
| 1216 contents, i.e. glyph structure contents are exchanged between A and | |
| 1217 B without changing glyph pointers in A and B. */ | |
| 1218 | |
| 1219 static void | |
| 1220 swap_glyphs_in_rows (a, b) | |
| 1221 struct glyph_row *a, *b; | |
| 1222 { | |
| 1223 int area; | |
| 1224 | |
| 1225 for (area = 0; area < LAST_AREA; ++area) | |
| 1226 { | |
| 1227 /* Number of glyphs to swap. */ | |
| 1228 int max_used = max (a->used[area], b->used[area]); | |
| 1229 | |
| 1230 /* Start of glyphs in area of row A. */ | |
| 1231 struct glyph *glyph_a = a->glyphs[area]; | |
| 1232 | |
| 1233 /* End + 1 of glyphs in area of row A. */ | |
| 1234 struct glyph *glyph_a_end = a->glyphs[max_used]; | |
| 1235 | |
| 1236 /* Start of glyphs in area of row B. */ | |
| 1237 struct glyph *glyph_b = b->glyphs[area]; | |
| 1238 | |
| 1239 while (glyph_a < glyph_a_end) | |
| 1240 { | |
| 1241 /* Non-ISO HP/UX compiler doesn't like auto struct | |
| 1242 initialization. */ | |
| 1243 struct glyph temp; | |
| 1244 temp = *glyph_a; | |
| 1245 *glyph_a = *glyph_b; | |
| 1246 *glyph_b = temp; | |
| 1247 ++glyph_a; | |
| 1248 ++glyph_b; | |
| 314 | 1249 } |
| 1250 } | |
| 1251 } | |
| 25012 | 1252 |
|
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1253 #endif /* 0 */ |
| 25012 | 1254 |
| 1255 /* Exchange pointers to glyph memory between glyph rows A and B. */ | |
| 1256 | |
| 1257 static INLINE void | |
| 1258 swap_glyph_pointers (a, b) | |
| 1259 struct glyph_row *a, *b; | |
| 1260 { | |
| 1261 int i; | |
| 1262 for (i = 0; i < LAST_AREA + 1; ++i) | |
| 1263 { | |
| 1264 struct glyph *temp = a->glyphs[i]; | |
| 1265 a->glyphs[i] = b->glyphs[i]; | |
| 1266 b->glyphs[i] = temp; | |
| 1267 } | |
| 1268 } | |
| 1269 | |
| 1270 | |
| 1271 /* Copy glyph row structure FROM to glyph row structure TO, except | |
| 1272 that glyph pointers in the structures are left unchanged. */ | |
| 1273 | |
| 1274 INLINE void | |
| 1275 copy_row_except_pointers (to, from) | |
| 1276 struct glyph_row *to, *from; | |
| 1277 { | |
| 1278 struct glyph *pointers[1 + LAST_AREA]; | |
| 1279 | |
| 1280 /* Save glyph pointers of TO. */ | |
| 1281 bcopy (to->glyphs, pointers, sizeof to->glyphs); | |
| 1282 | |
| 1283 /* Do a structure assignment. */ | |
| 1284 *to = *from; | |
| 1285 | |
| 1286 /* Restore original pointers of TO. */ | |
| 1287 bcopy (pointers, to->glyphs, sizeof to->glyphs); | |
| 1288 } | |
| 1289 | |
| 1290 | |
| 1291 /* Copy contents of glyph row FROM to glyph row TO. Glyph pointers in | |
| 1292 TO and FROM are left unchanged. Glyph contents are copied from the | |
| 1293 glyph memory of FROM to the glyph memory of TO. Increment buffer | |
| 1294 positions in row TO by DELTA/ DELTA_BYTES. */ | |
| 1295 | |
| 1296 void | |
| 1297 copy_glyph_row_contents (to, from, delta, delta_bytes) | |
| 1298 struct glyph_row *to, *from; | |
| 1299 int delta, delta_bytes; | |
| 1300 { | |
| 1301 int area; | |
| 1302 | |
| 1303 /* This is like a structure assignment TO = FROM, except that | |
| 1304 glyph pointers in the rows are left unchanged. */ | |
| 1305 copy_row_except_pointers (to, from); | |
| 1306 | |
| 1307 /* Copy glyphs from FROM to TO. */ | |
| 1308 for (area = 0; area < LAST_AREA; ++area) | |
| 1309 if (from->used[area]) | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1310 bcopy (from->glyphs[area], to->glyphs[area], |
| 25012 | 1311 from->used[area] * sizeof (struct glyph)); |
| 1312 | |
| 1313 /* Increment buffer positions in TO by DELTA. */ | |
|
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
1314 increment_row_positions (to, delta, delta_bytes); |
| 25012 | 1315 } |
| 1316 | |
| 1317 | |
| 1318 /* Assign glyph row FROM to glyph row TO. This works like a structure | |
| 1319 assignment TO = FROM, except that glyph pointers are not copied but | |
| 1320 exchanged between TO and FROM. Pointers must be exchanged to avoid | |
| 1321 a memory leak. */ | |
| 1322 | |
| 1323 static INLINE void | |
| 1324 assign_row (to, from) | |
| 1325 struct glyph_row *to, *from; | |
| 1326 { | |
| 1327 swap_glyph_pointers (to, from); | |
| 1328 copy_row_except_pointers (to, from); | |
| 1329 } | |
| 1330 | |
| 1331 | |
| 1332 /* Test whether the glyph memory of the glyph row WINDOW_ROW, which is | |
| 1333 a row in a window matrix, is a slice of the glyph memory of the | |
| 1334 glyph row FRAME_ROW which is a row in a frame glyph matrix. Value | |
| 1335 is non-zero if the glyph memory of WINDOW_ROW is part of the glyph | |
| 1336 memory of FRAME_ROW. */ | |
| 1337 | |
|
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
1338 #if GLYPH_DEBUG |
|
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
1339 |
| 25012 | 1340 static int |
| 1341 glyph_row_slice_p (window_row, frame_row) | |
| 1342 struct glyph_row *window_row, *frame_row; | |
| 1343 { | |
| 1344 struct glyph *window_glyph_start = window_row->glyphs[0]; | |
| 1345 struct glyph *frame_glyph_start = frame_row->glyphs[0]; | |
| 1346 struct glyph *frame_glyph_end = frame_row->glyphs[LAST_AREA]; | |
| 1347 | |
| 1348 return (frame_glyph_start <= window_glyph_start | |
| 1349 && window_glyph_start < frame_glyph_end); | |
| 1350 } | |
| 1351 | |
|
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
1352 #endif /* GLYPH_DEBUG */ |
| 25012 | 1353 |
|
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1354 #if 0 |
|
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1355 |
| 25012 | 1356 /* Find the row in the window glyph matrix WINDOW_MATRIX being a slice |
| 1357 of ROW in the frame matrix FRAME_MATRIX. Value is null if no row | |
| 1358 in WINDOW_MATRIX is found satisfying the condition. */ | |
| 1359 | |
| 1360 static struct glyph_row * | |
| 1361 find_glyph_row_slice (window_matrix, frame_matrix, row) | |
| 1362 struct glyph_matrix *window_matrix, *frame_matrix; | |
| 1363 int row; | |
| 1364 { | |
| 1365 int i; | |
| 1366 | |
| 1367 xassert (row >= 0 && row < frame_matrix->nrows); | |
| 1368 | |
| 1369 for (i = 0; i < window_matrix->nrows; ++i) | |
| 1370 if (glyph_row_slice_p (window_matrix->rows + i, | |
| 1371 frame_matrix->rows + row)) | |
| 1372 break; | |
| 1373 | |
| 1374 return i < window_matrix->nrows ? window_matrix->rows + i : 0; | |
| 1375 } | |
| 1376 | |
|
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1377 #endif /* 0 */ |
| 25012 | 1378 |
| 1379 /* Prepare ROW for display. Desired rows are cleared lazily, | |
| 1380 i.e. they are only marked as to be cleared by setting their | |
| 1381 enabled_p flag to zero. When a row is to be displayed, a prior | |
| 1382 call to this function really clears it. */ | |
| 1383 | |
| 1384 void | |
| 1385 prepare_desired_row (row) | |
| 1386 struct glyph_row *row; | |
| 1387 { | |
| 1388 if (!row->enabled_p) | |
| 1389 { | |
| 1390 clear_glyph_row (row); | |
| 1391 row->enabled_p = 1; | |
| 1392 } | |
| 1393 } | |
| 1394 | |
| 1395 | |
| 1396 /* Return a hash code for glyph row ROW. */ | |
| 1397 | |
| 1398 int | |
| 1399 line_hash_code (row) | |
| 1400 struct glyph_row *row; | |
| 1401 { | |
| 1402 int hash = 0; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1403 |
| 25012 | 1404 if (row->enabled_p) |
| 1405 { | |
|
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1406 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
|
1407 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
|
1408 |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1409 while (glyph < end) |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1410 { |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1411 int c = glyph->u.ch; |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1412 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
|
1413 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
|
1414 c -= SPACEGLYPH; |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1415 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
|
1416 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
|
1417 ++glyph; |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1418 } |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1419 |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1420 if (hash == 0) |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1421 hash = 1; |
| 25012 | 1422 } |
| 1423 | |
| 1424 return hash; | |
| 1425 } | |
| 1426 | |
| 1427 | |
|
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
|
1428 /* Return the cost of drawing line VPOS in MATRIX. The cost equals |
| 25012 | 1429 the number of characters in the line. If must_write_spaces is |
| 1430 zero, leading and trailing spaces are ignored. */ | |
| 1431 | |
| 1432 static unsigned int | |
| 1433 line_draw_cost (matrix, vpos) | |
| 1434 struct glyph_matrix *matrix; | |
| 1435 int vpos; | |
| 1436 { | |
| 1437 struct glyph_row *row = matrix->rows + vpos; | |
| 1438 struct glyph *beg = row->glyphs[TEXT_AREA]; | |
| 1439 struct glyph *end = beg + row->used[TEXT_AREA]; | |
| 1440 int len; | |
| 1441 Lisp_Object *glyph_table_base = GLYPH_TABLE_BASE; | |
| 1442 int glyph_table_len = GLYPH_TABLE_LENGTH; | |
| 1443 | |
| 1444 /* 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
|
1445 if (!FRAME_MUST_WRITE_SPACES (SELECTED_FRAME ())) /* XXX Is SELECTED_FRAME OK here? */ |
| 25012 | 1446 { |
| 1447 /* 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
|
1448 while (end > beg && CHAR_GLYPH_SPACE_P (*(end - 1))) |
| 25012 | 1449 --end; |
| 1450 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1451 /* All blank line. */ |
| 25012 | 1452 if (end == beg) |
| 1453 return 0; | |
| 1454 | |
| 1455 /* Skip over leading spaces. */ | |
| 1456 while (CHAR_GLYPH_SPACE_P (*beg)) | |
| 1457 ++beg; | |
| 1458 } | |
| 1459 | |
| 1460 /* If we don't have a glyph-table, each glyph is one character, | |
| 1461 so return the number of glyphs. */ | |
| 1462 if (glyph_table_base == 0) | |
| 1463 len = end - beg; | |
| 1464 else | |
| 1465 { | |
| 1466 /* Otherwise, scan the glyphs and accumulate their total length | |
| 1467 in LEN. */ | |
| 1468 len = 0; | |
| 1469 while (beg < end) | |
| 1470 { | |
|
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
1471 GLYPH g; |
|
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
1472 |
|
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
1473 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
|
1474 |
|
92387
41d029d73eac
(line_draw_cost): Fix invalid glyph check.
Kim F. Storm <storm@cua.dk>
parents:
92276
diff
changeset
|
1475 if (GLYPH_INVALID_P (g) |
|
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1476 || GLYPH_SIMPLE_P (glyph_table_base, glyph_table_len, g)) |
| 25012 | 1477 len += 1; |
| 1478 else | |
| 1479 len += GLYPH_LENGTH (glyph_table_base, g); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1480 |
| 25012 | 1481 ++beg; |
| 1482 } | |
| 1483 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1484 |
| 25012 | 1485 return len; |
| 1486 } | |
| 1487 | |
| 1488 | |
| 1489 /* Test two glyph rows A and B for equality. Value is non-zero if A | |
| 1490 and B have equal contents. W is the window to which the glyphs | |
| 1491 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
|
1492 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
|
1493 flags of A and B, too. */ |
| 25012 | 1494 |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1495 static INLINE int |
|
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1496 row_equal_p (w, a, b, mouse_face_p) |
| 25012 | 1497 struct window *w; |
| 1498 struct glyph_row *a, *b; | |
|
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1499 int mouse_face_p; |
| 25012 | 1500 { |
| 1501 if (a == b) | |
| 1502 return 1; | |
| 1503 else if (a->hash != b->hash) | |
| 1504 return 0; | |
| 1505 else | |
| 1506 { | |
| 1507 struct glyph *a_glyph, *b_glyph, *a_end; | |
| 1508 int area; | |
| 1509 | |
|
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1510 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
|
1511 return 0; |
|
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1512 |
| 25012 | 1513 /* Compare glyphs. */ |
| 1514 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) | |
| 1515 { | |
| 1516 if (a->used[area] != b->used[area]) | |
| 1517 return 0; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1518 |
| 25012 | 1519 a_glyph = a->glyphs[area]; |
| 1520 a_end = a_glyph + a->used[area]; | |
| 1521 b_glyph = b->glyphs[area]; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1522 |
| 25012 | 1523 while (a_glyph < a_end |
| 1524 && GLYPH_EQUAL_P (a_glyph, b_glyph)) | |
| 1525 ++a_glyph, ++b_glyph; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1526 |
| 25012 | 1527 if (a_glyph != a_end) |
| 1528 return 0; | |
| 1529 } | |
| 1530 | |
|
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
1531 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
|
1532 || 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
|
1533 || 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
|
1534 || 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
|
1535 || 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
|
1536 || 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
|
1537 || 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
|
1538 || 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
|
1539 || a->overlapped_p != b->overlapped_p |
| 25012 | 1540 || (MATRIX_ROW_CONTINUATION_LINE_P (a) |
| 1541 != MATRIX_ROW_CONTINUATION_LINE_P (b)) | |
| 1542 /* Different partially visible characters on left margin. */ | |
| 1543 || a->x != b->x | |
| 1544 /* Different height. */ | |
| 1545 || a->ascent != b->ascent | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1546 || a->phys_ascent != b->phys_ascent |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1547 || a->phys_height != b->phys_height |
| 25012 | 1548 || a->visible_height != b->visible_height) |
| 1549 return 0; | |
| 1550 } | |
| 1551 | |
| 1552 return 1; | |
| 1553 } | |
| 1554 | |
| 1555 | |
| 314 | 1556 |
| 25012 | 1557 /*********************************************************************** |
| 1558 Glyph Pool | |
| 1559 | |
| 1560 See dispextern.h for an overall explanation of glyph pools. | |
| 1561 ***********************************************************************/ | |
| 1562 | |
| 1563 /* Allocate a glyph_pool structure. The structure returned is | |
| 1564 initialized with zeros. The global variable glyph_pool_count is | |
| 1565 incremented for each pool allocated. */ | |
| 1566 | |
| 1567 static struct glyph_pool * | |
| 1568 new_glyph_pool () | |
| 1569 { | |
| 1570 struct glyph_pool *result; | |
| 1571 | |
| 1572 /* Allocate a new glyph_pool and clear it. */ | |
| 1573 result = (struct glyph_pool *) xmalloc (sizeof *result); | |
| 1574 bzero (result, sizeof *result); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1575 |
| 25012 | 1576 /* For memory leak and double deletion checking. */ |
| 1577 ++glyph_pool_count; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1578 |
| 25012 | 1579 return result; |
| 1580 } | |
| 1581 | |
| 1582 | |
| 1583 /* Free a glyph_pool structure POOL. The function may be called with | |
| 1584 a null POOL pointer. The global variable glyph_pool_count is | |
| 1585 decremented with every pool structure freed. If this count gets | |
| 1586 negative, more structures were freed than allocated, i.e. one | |
| 1587 structure must have been freed more than once or a bogus pointer | |
| 1588 was passed to free_glyph_pool. */ | |
| 1589 | |
| 1590 static void | |
| 1591 free_glyph_pool (pool) | |
| 1592 struct glyph_pool *pool; | |
| 1593 { | |
| 1594 if (pool) | |
| 1595 { | |
|
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
|
1596 /* More freed than allocated? */ |
| 25012 | 1597 --glyph_pool_count; |
| 1598 xassert (glyph_pool_count >= 0); | |
| 1599 | |
| 1600 xfree (pool->glyphs); | |
| 1601 xfree (pool); | |
| 1602 } | |
| 1603 } | |
| 1604 | |
| 1605 | |
| 1606 /* Enlarge a glyph pool POOL. MATRIX_DIM gives the number of rows and | |
| 1607 columns we need. This function never shrinks a pool. The only | |
| 1608 case in which this would make sense, would be when a frame's size | |
| 1609 is changed from a large value to a smaller one. But, if someone | |
| 1610 does it once, we can expect that he will do it again. | |
| 1611 | |
| 1612 Value is non-zero if the pool changed in a way which makes | |
| 1613 re-adjusting window glyph matrices necessary. */ | |
| 1614 | |
| 1615 static int | |
| 1616 realloc_glyph_pool (pool, matrix_dim) | |
| 1617 struct glyph_pool *pool; | |
| 1618 struct dim matrix_dim; | |
| 1619 { | |
| 1620 int needed; | |
| 1621 int changed_p; | |
| 1622 | |
| 1623 changed_p = (pool->glyphs == 0 | |
| 1624 || matrix_dim.height != pool->nrows | |
| 1625 || matrix_dim.width != pool->ncolumns); | |
| 1626 | |
| 1627 /* Enlarge the glyph pool. */ | |
| 1628 needed = matrix_dim.width * matrix_dim.height; | |
| 1629 if (needed > pool->nglyphs) | |
| 1630 { | |
| 1631 int size = needed * sizeof (struct glyph); | |
| 1632 | |
| 1633 if (pool->glyphs) | |
| 1634 pool->glyphs = (struct glyph *) xrealloc (pool->glyphs, size); | |
| 1635 else | |
| 1636 { | |
| 1637 pool->glyphs = (struct glyph *) xmalloc (size); | |
| 1638 bzero (pool->glyphs, size); | |
| 1639 } | |
| 1640 | |
| 1641 pool->nglyphs = needed; | |
| 1642 } | |
| 1643 | |
|
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
|
1644 /* Remember the number of rows and columns because (a) we use them |
| 25012 | 1645 to do sanity checks, and (b) the number of columns determines |
| 1646 where rows in the frame matrix start---this must be available to | |
| 1647 determine pointers to rows of window sub-matrices. */ | |
| 1648 pool->nrows = matrix_dim.height; | |
| 1649 pool->ncolumns = matrix_dim.width; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1650 |
| 25012 | 1651 return changed_p; |
| 1652 } | |
| 1653 | |
| 1654 | |
| 1655 | |
| 1656 /*********************************************************************** | |
| 1657 Debug Code | |
| 1658 ***********************************************************************/ | |
| 1659 | |
| 1660 #if GLYPH_DEBUG | |
| 1661 | |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1662 |
|
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
1663 /* 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
|
1664 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
|
1665 stdout. |
|
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
1666 */ |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1667 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1668 void |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1669 flush_stdout () |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1670 { |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1671 fflush (stdout); |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1672 } |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1673 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1674 |
| 25012 | 1675 /* Check that no glyph pointers have been lost in MATRIX. If a |
| 1676 pointer has been lost, e.g. by using a structure assignment between | |
| 1677 rows, at least one pointer must occur more than once in the rows of | |
| 1678 MATRIX. */ | |
| 1679 | |
| 1680 void | |
| 1681 check_matrix_pointer_lossage (matrix) | |
| 1682 struct glyph_matrix *matrix; | |
| 1683 { | |
| 1684 int i, j; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1685 |
| 25012 | 1686 for (i = 0; i < matrix->nrows; ++i) |
| 1687 for (j = 0; j < matrix->nrows; ++j) | |
| 1688 xassert (i == j | |
| 1689 || (matrix->rows[i].glyphs[TEXT_AREA] | |
| 1690 != matrix->rows[j].glyphs[TEXT_AREA])); | |
| 1691 } | |
| 1692 | |
| 1693 | |
| 1694 /* Get a pointer to glyph row ROW in MATRIX, with bounds checks. */ | |
| 1695 | |
| 1696 struct glyph_row * | |
| 1697 matrix_row (matrix, row) | |
| 1698 struct glyph_matrix *matrix; | |
| 1699 int row; | |
| 1700 { | |
| 1701 xassert (matrix && matrix->rows); | |
| 1702 xassert (row >= 0 && row < matrix->nrows); | |
| 1703 | |
| 1704 /* That's really too slow for normal testing because this function | |
| 1705 is called almost everywhere. Although---it's still astonishingly | |
| 1706 fast, so it is valuable to have for debugging purposes. */ | |
| 314 | 1707 #if 0 |
| 25012 | 1708 check_matrix_pointer_lossage (matrix); |
| 1709 #endif | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1710 |
| 25012 | 1711 return matrix->rows + row; |
| 1712 } | |
| 1713 | |
| 1714 | |
| 1715 #if 0 /* This function makes invalid assumptions when text is | |
| 1716 partially invisible. But it might come handy for debugging | |
| 1717 nevertheless. */ | |
| 1718 | |
| 1719 /* Check invariants that must hold for an up to date current matrix of | |
| 1720 window W. */ | |
| 1721 | |
| 1722 static void | |
| 1723 check_matrix_invariants (w) | |
| 314 | 1724 struct window *w; |
| 1725 { | |
| 25012 | 1726 struct glyph_matrix *matrix = w->current_matrix; |
| 1727 int yb = window_text_bottom_y (w); | |
| 1728 struct glyph_row *row = matrix->rows; | |
| 1729 struct glyph_row *last_text_row = NULL; | |
| 1730 struct buffer *saved = current_buffer; | |
| 1731 struct buffer *buffer = XBUFFER (w->buffer); | |
| 1732 int c; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1733 |
| 25012 | 1734 /* This can sometimes happen for a fresh window. */ |
| 1735 if (matrix->nrows < 2) | |
| 1736 return; | |
| 1737 | |
| 1738 set_buffer_temp (buffer); | |
| 1739 | |
| 1740 /* Note: last row is always reserved for the mode line. */ | |
| 1741 while (MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
| 1742 && MATRIX_ROW_BOTTOM_Y (row) < yb) | |
| 1743 { | |
| 1744 struct glyph_row *next = row + 1; | |
| 1745 | |
| 1746 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
| 1747 last_text_row = row; | |
| 1748 | |
| 1749 /* Check that character and byte positions are in sync. */ | |
| 1750 xassert (MATRIX_ROW_START_BYTEPOS (row) | |
| 1751 == CHAR_TO_BYTE (MATRIX_ROW_START_CHARPOS (row))); | |
| 1752 | |
| 1753 /* CHAR_TO_BYTE aborts when invoked for a position > Z. We can | |
| 1754 have such a position temporarily in case of a minibuffer | |
| 1755 displaying something like `[Sole completion]' at its end. */ | |
| 1756 if (MATRIX_ROW_END_CHARPOS (row) < BUF_ZV (current_buffer)) | |
| 1757 xassert (MATRIX_ROW_END_BYTEPOS (row) | |
| 1758 == CHAR_TO_BYTE (MATRIX_ROW_END_CHARPOS (row))); | |
| 1759 | |
| 1760 /* Check that end position of `row' is equal to start position | |
| 1761 of next row. */ | |
| 1762 if (next->enabled_p && MATRIX_ROW_DISPLAYS_TEXT_P (next)) | |
| 1763 { | |
| 1764 xassert (MATRIX_ROW_END_CHARPOS (row) | |
| 1765 == MATRIX_ROW_START_CHARPOS (next)); | |
| 1766 xassert (MATRIX_ROW_END_BYTEPOS (row) | |
| 1767 == MATRIX_ROW_START_BYTEPOS (next)); | |
| 1768 } | |
| 1769 row = next; | |
| 1770 } | |
| 1771 | |
| 1772 xassert (w->current_matrix->nrows == w->desired_matrix->nrows); | |
| 1773 xassert (w->desired_matrix->rows != NULL); | |
| 1774 set_buffer_temp (saved); | |
| 1775 } | |
| 1776 | |
| 1777 #endif /* 0 */ | |
| 1778 | |
| 1779 #endif /* GLYPH_DEBUG != 0 */ | |
| 1780 | |
| 1781 | |
| 1782 | |
| 1783 /********************************************************************** | |
| 1784 Allocating/ Adjusting Glyph Matrices | |
| 1785 **********************************************************************/ | |
| 1786 | |
| 1787 /* Allocate glyph matrices over a window tree for a frame-based | |
| 1788 redisplay | |
| 1789 | |
| 1790 X and Y are column/row within the frame glyph matrix where | |
| 1791 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
|
1792 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
|
1793 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
|
1794 matrix adjustments should not be performed. |
| 25012 | 1795 |
| 1796 The function returns the total width/height of the sub-matrices of | |
| 1797 the window tree. If called on a frame root window, the computation | |
| 1798 will take the mini-buffer window into account. | |
| 1799 | |
| 1800 *WINDOW_CHANGE_FLAGS is set to a bit mask with bits | |
| 1801 | |
| 1802 NEW_LEAF_MATRIX set if any window in the tree did not have a | |
| 1803 glyph matrices yet, and | |
| 1804 | |
| 1805 CHANGED_LEAF_MATRIX set if the dimension or location of a matrix of | |
| 1806 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
|
1807 DIM_ONLY_P) |
| 25012 | 1808 |
| 1809 *WINDOW_CHANGE_FLAGS must be initialized by the caller of this | |
| 1810 function. | |
| 1811 | |
| 1812 Windows are arranged into chains of windows on the same level | |
| 1813 through the next fields of window structures. Such a level can be | |
| 1814 either a sequence of horizontally adjacent windows from left to | |
| 1815 right, or a sequence of vertically adjacent windows from top to | |
| 1816 bottom. Each window in a horizontal sequence can be either a leaf | |
| 1817 window or a vertical sequence; a window in a vertical sequence can | |
| 1818 be either a leaf or a horizontal sequence. All windows in a | |
| 1819 horizontal sequence have the same height, and all windows in a | |
| 1820 vertical sequence have the same width. | |
| 1821 | |
| 1822 This function uses, for historical reasons, a more general | |
| 1823 algorithm to determine glyph matrix dimensions that would be | |
| 1824 necessary. | |
| 1825 | |
| 1826 The matrix height of a horizontal sequence is determined by the | |
| 1827 maximum height of any matrix in the sequence. The matrix width of | |
| 1828 a horizontal sequence is computed by adding up matrix widths of | |
| 1829 windows in the sequence. | |
| 1830 | |
| 1831 |<------- result width ------->| | |
| 1832 +---------+----------+---------+ --- | |
| 1833 | | | | | | |
| 1834 | | | | | |
| 1835 +---------+ | | result height | |
| 1836 | +---------+ | |
| 1837 | | | | |
| 1838 +----------+ --- | |
| 1839 | |
| 1840 The matrix width of a vertical sequence is the maximum matrix width | |
| 1841 of any window in the sequence. Its height is computed by adding up | |
| 1842 matrix heights of windows in the sequence. | |
| 1843 | |
| 1844 |<---- result width -->| | |
| 1845 +---------+ --- | |
| 1846 | | | | |
| 1847 | | | | |
| 1848 +---------+--+ | | |
| 1849 | | | | |
| 1850 | | result height | |
| 1851 | | | |
| 1852 +------------+---------+ | | |
| 1853 | | | | |
| 1854 | | | | |
| 1855 +------------+---------+ --- */ | |
| 1856 | |
| 1857 /* Bit indicating that a new matrix will be allocated or has been | |
| 1858 allocated. */ | |
| 1859 | |
| 1860 #define NEW_LEAF_MATRIX (1 << 0) | |
| 1861 | |
| 1862 /* Bit indicating that a matrix will or has changed its location or | |
| 1863 size. */ | |
| 1864 | |
| 1865 #define CHANGED_LEAF_MATRIX (1 << 1) | |
| 1866 | |
| 1867 static struct dim | |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1868 allocate_matrices_for_frame_redisplay (window, x, y, dim_only_p, |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1869 window_change_flags) |
| 25012 | 1870 Lisp_Object window; |
| 1871 int x, y; | |
| 1872 int dim_only_p; | |
| 1873 int *window_change_flags; | |
| 1874 { | |
| 1875 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (window))); | |
| 1876 int x0 = x, y0 = y; | |
| 1877 int wmax = 0, hmax = 0; | |
| 1878 struct dim total; | |
| 1879 struct dim dim; | |
| 1880 struct window *w; | |
| 1881 int in_horz_combination_p; | |
| 1882 | |
| 1883 /* What combination is WINDOW part of? Compute this once since the | |
| 1884 result is the same for all windows in the `next' chain. The | |
| 1885 special case of a root window (parent equal to nil) is treated | |
| 1886 like a vertical combination because a root window's `next' | |
| 1887 points to the mini-buffer window, if any, which is arranged | |
| 1888 vertically below other windows. */ | |
| 1889 in_horz_combination_p | |
| 1890 = (!NILP (XWINDOW (window)->parent) | |
| 1891 && !NILP (XWINDOW (XWINDOW (window)->parent)->hchild)); | |
| 1892 | |
| 1893 /* For WINDOW and all windows on the same level. */ | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1894 do |
| 25012 | 1895 { |
| 1896 w = XWINDOW (window); | |
| 1897 | |
| 1898 /* 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
|
1899 on whether this is a combination or a leaf window. */ |
| 25012 | 1900 if (!NILP (w->hchild)) |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1901 dim = allocate_matrices_for_frame_redisplay (w->hchild, x, y, |
| 25012 | 1902 dim_only_p, |
| 1903 window_change_flags); | |
| 1904 else if (!NILP (w->vchild)) | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1905 dim = allocate_matrices_for_frame_redisplay (w->vchild, x, y, |
| 25012 | 1906 dim_only_p, |
| 1907 window_change_flags); | |
| 1908 else | |
| 1909 { | |
| 1910 /* If not already done, allocate sub-matrix structures. */ | |
| 1911 if (w->desired_matrix == NULL) | |
| 1912 { | |
| 1913 w->desired_matrix = new_glyph_matrix (f->desired_pool); | |
| 1914 w->current_matrix = new_glyph_matrix (f->current_pool); | |
| 1915 *window_change_flags |= NEW_LEAF_MATRIX; | |
| 1916 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1917 |
| 25012 | 1918 /* Width and height MUST be chosen so that there are no |
| 1919 holes in the frame matrix. */ | |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1920 dim.width = required_matrix_width (w); |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1921 dim.height = required_matrix_height (w); |
| 25012 | 1922 |
| 1923 /* Will matrix be re-allocated? */ | |
| 1924 if (x != w->desired_matrix->matrix_x | |
| 1925 || y != w->desired_matrix->matrix_y | |
| 1926 || dim.width != w->desired_matrix->matrix_w | |
| 1927 || dim.height != w->desired_matrix->matrix_h | |
| 1928 || (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
|
1929 w->left_margin_cols) |
| 25012 | 1930 != w->desired_matrix->left_margin_glyphs) |
| 1931 || (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
|
1932 w->right_margin_cols) |
| 25012 | 1933 != w->desired_matrix->right_margin_glyphs)) |
| 1934 *window_change_flags |= CHANGED_LEAF_MATRIX; | |
| 1935 | |
| 1936 /* Actually change matrices, if allowed. Do not consider | |
| 1937 CHANGED_LEAF_MATRIX computed above here because the pool | |
| 1938 may have been changed which we don't now here. We trust | |
| 1939 that we only will be called with DIM_ONLY_P != 0 when | |
| 1940 necessary. */ | |
| 1941 if (!dim_only_p) | |
| 1942 { | |
| 1943 adjust_glyph_matrix (w, w->desired_matrix, x, y, dim); | |
| 1944 adjust_glyph_matrix (w, w->current_matrix, x, y, dim); | |
| 1945 } | |
| 1946 } | |
| 1947 | |
| 1948 /* If we are part of a horizontal combination, advance x for | |
| 1949 windows to the right of W; otherwise advance y for windows | |
| 1950 below W. */ | |
| 1951 if (in_horz_combination_p) | |
| 1952 x += dim.width; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1953 else |
| 25012 | 1954 y += dim.height; |
| 1955 | |
| 1956 /* Remember maximum glyph matrix dimensions. */ | |
| 1957 wmax = max (wmax, dim.width); | |
| 1958 hmax = max (hmax, dim.height); | |
| 1959 | |
| 1960 /* Next window on same level. */ | |
| 1961 window = w->next; | |
| 1962 } | |
| 1963 while (!NILP (window)); | |
| 1964 | |
| 1965 /* Set `total' to the total glyph matrix dimension of this window | |
| 1966 level. In a vertical combination, the width is the width of the | |
| 1967 widest window; the height is the y we finally reached, corrected | |
| 1968 by the y we started with. In a horizontal combination, the total | |
| 1969 height is the height of the tallest window, and the width is the | |
| 1970 x we finally reached, corrected by the x we started with. */ | |
| 1971 if (in_horz_combination_p) | |
| 1972 { | |
| 1973 total.width = x - x0; | |
| 1974 total.height = hmax; | |
| 1975 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1976 else |
| 25012 | 1977 { |
| 1978 total.width = wmax; | |
| 1979 total.height = y - y0; | |
| 1980 } | |
| 1981 | |
| 1982 return total; | |
| 1983 } | |
| 1984 | |
| 1985 | |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1986 /* 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
|
1987 |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1988 int |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1989 required_matrix_height (w) |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1990 struct window *w; |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1991 { |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1992 #ifdef HAVE_WINDOW_SYSTEM |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1993 struct frame *f = XFRAME (w->frame); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1994 |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1995 if (FRAME_WINDOW_P (f)) |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1996 { |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1997 int ch_height = FRAME_SMALLEST_FONT_HEIGHT (f); |
| 85252 | 1998 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
|
1999 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
|
2000 / ch_height) * w->nrows_scale_factor |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2001 /* 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
|
2002 bottom of the window. */ |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2003 + 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
|
2004 /* 2 for header and mode line. */ |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2005 + 2); |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2006 } |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2007 #endif /* HAVE_WINDOW_SYSTEM */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2008 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2009 return WINDOW_TOTAL_LINES (w); |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2010 } |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2011 |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2012 |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2013 /* 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
|
2014 |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2015 int |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2016 required_matrix_width (w) |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2017 struct window *w; |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2018 { |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2019 #ifdef HAVE_WINDOW_SYSTEM |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2020 struct frame *f = XFRAME (w->frame); |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2021 if (FRAME_WINDOW_P (f)) |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2022 { |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2023 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
|
2024 int window_pixel_width = WINDOW_TOTAL_WIDTH (w); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2025 |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2026 /* 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
|
2027 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
|
2028 / ch_width) * w->ncols_scale_factor |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2029 /* 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
|
2030 + 2 |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2031 /* One partially visible column at the right |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2032 edge of each marginal area. */ |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2033 + 1 + 1); |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2034 } |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2035 #endif /* HAVE_WINDOW_SYSTEM */ |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2036 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2037 return XINT (w->total_cols); |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2038 } |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2039 |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2040 |
| 25012 | 2041 /* 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
|
2042 window whose matrices must be allocated/reallocated. */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2043 |
| 25012 | 2044 static void |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2045 allocate_matrices_for_window_redisplay (w) |
| 25012 | 2046 struct window *w; |
| 2047 { | |
| 2048 while (w) | |
| 314 | 2049 { |
| 25012 | 2050 if (!NILP (w->vchild)) |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2051 allocate_matrices_for_window_redisplay (XWINDOW (w->vchild)); |
| 25012 | 2052 else if (!NILP (w->hchild)) |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2053 allocate_matrices_for_window_redisplay (XWINDOW (w->hchild)); |
| 25012 | 2054 else |
| 314 | 2055 { |
| 25012 | 2056 /* W is a leaf window. */ |
| 2057 struct dim dim; | |
| 2058 | |
| 2059 /* If matrices are not yet allocated, allocate them now. */ | |
| 2060 if (w->desired_matrix == NULL) | |
| 314 | 2061 { |
| 25012 | 2062 w->desired_matrix = new_glyph_matrix (NULL); |
| 2063 w->current_matrix = new_glyph_matrix (NULL); | |
| 314 | 2064 } |
| 25012 | 2065 |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2066 dim.width = required_matrix_width (w); |
|
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2067 dim.height = required_matrix_height (w); |
| 25012 | 2068 adjust_glyph_matrix (w, w->desired_matrix, 0, 0, dim); |
| 2069 adjust_glyph_matrix (w, w->current_matrix, 0, 0, dim); | |
| 2070 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2071 |
| 25012 | 2072 w = NILP (w->next) ? NULL : XWINDOW (w->next); |
| 2073 } | |
| 2074 } | |
| 2075 | |
| 2076 | |
| 2077 /* Re-allocate/ re-compute glyph matrices on frame F. If F is null, | |
| 2078 do it for all frames; otherwise do it just for the given frame. | |
| 2079 This function must be called when a new frame is created, its size | |
| 2080 changes, or its window configuration changes. */ | |
| 2081 | |
| 2082 void | |
| 2083 adjust_glyphs (f) | |
| 2084 struct frame *f; | |
| 2085 { | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2086 /* 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
|
2087 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
|
2088 BLOCK_INPUT; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2089 |
| 25012 | 2090 if (f) |
| 2091 adjust_frame_glyphs (f); | |
| 2092 else | |
| 2093 { | |
| 2094 Lisp_Object tail, lisp_frame; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2095 |
| 25012 | 2096 FOR_EACH_FRAME (tail, lisp_frame) |
| 2097 adjust_frame_glyphs (XFRAME (lisp_frame)); | |
| 2098 } | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2099 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2100 UNBLOCK_INPUT; |
| 25012 | 2101 } |
| 2102 | |
| 2103 | |
| 2104 /* Adjust frame glyphs when Emacs is initialized. | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2105 |
|
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2106 To be called from init_display. |
|
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2107 |
| 25012 | 2108 We need a glyph matrix because redraw will happen soon. |
| 2109 Unfortunately, window sizes on selected_frame are not yet set to | |
| 2110 meaningful values. I believe we can assume that there are only two | |
| 2111 windows on the frame---the mini-buffer and the root window. Frame | |
| 2112 height and width seem to be correct so far. So, set the sizes of | |
| 2113 windows to estimated values. */ | |
| 2114 | |
| 2115 static void | |
| 2116 adjust_frame_glyphs_initially () | |
| 2117 { | |
|
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2118 struct frame *sf = SELECTED_FRAME (); |
|
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2119 struct window *root = XWINDOW (sf->root_window); |
| 25012 | 2120 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
|
2121 int frame_lines = FRAME_LINES (sf); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2122 int frame_cols = FRAME_COLS (sf); |
|
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2123 int top_margin = FRAME_TOP_MARGIN (sf); |
| 25012 | 2124 |
| 2125 /* 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
|
2126 XSETFASTINT (root->top_line, top_margin); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2127 XSETFASTINT (root->total_cols, frame_cols); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2128 set_window_height (sf->root_window, frame_lines - 1 - top_margin, 0); |
| 25012 | 2129 |
| 2130 /* 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
|
2131 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
|
2132 XSETFASTINT (mini->total_cols, frame_cols); |
| 25012 | 2133 set_window_height (root->next, 1, 0); |
| 2134 | |
|
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2135 adjust_frame_glyphs (sf); |
| 25012 | 2136 glyphs_initialized_initially_p = 1; |
| 2137 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2138 |
| 25012 | 2139 |
| 2140 /* Allocate/reallocate glyph matrices of a single frame F. */ | |
| 2141 | |
| 2142 static void | |
| 2143 adjust_frame_glyphs (f) | |
| 2144 struct frame *f; | |
| 2145 { | |
| 2146 if (FRAME_WINDOW_P (f)) | |
| 2147 adjust_frame_glyphs_for_window_redisplay (f); | |
| 2148 else | |
| 2149 adjust_frame_glyphs_for_frame_redisplay (f); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2150 |
| 25012 | 2151 /* Don't forget the message buffer and the buffer for |
| 2152 decode_mode_spec. */ | |
| 2153 adjust_frame_message_buffer (f); | |
| 2154 adjust_decode_mode_spec_buffer (f); | |
| 2155 | |
| 2156 f->glyphs_initialized_p = 1; | |
| 2157 } | |
| 2158 | |
|
77267
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2159 /* 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
|
2160 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
|
2161 static int |
|
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2162 showing_window_margins_p (w) |
|
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2163 struct window *w; |
|
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2164 { |
|
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2165 while (w) |
|
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2166 { |
|
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2167 if (!NILP (w->hchild)) |
|
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2168 { |
|
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2169 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
|
2170 return 1; |
|
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2171 } |
|
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2172 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
|
2173 { |
|
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2174 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
|
2175 return 1; |
|
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2176 } |
|
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2177 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
|
2178 || !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
|
2179 return 1; |
|
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2180 |
|
77267
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2181 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
|
2182 } |
|
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2183 return 0; |
|
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2184 } |
|
7f8bdfdc0227
(adjust_frame_glyphs_for_frame_redisplay): Set garbaged flag in
Chong Yidong <cyd@stupidchicken.com>
parents:
76621
diff
changeset
|
2185 |
| 25012 | 2186 |
|
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2187 /* 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
|
2188 windows from the frame's current matrix. */ |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2189 |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2190 static void |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2191 fake_current_matrices (window) |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2192 Lisp_Object window; |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2193 { |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2194 struct window *w; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2195 |
|
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2196 for (; !NILP (window); window = w->next) |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2197 { |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2198 w = XWINDOW (window); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2199 |
|
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2200 if (!NILP (w->hchild)) |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2201 fake_current_matrices (w->hchild); |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2202 else if (!NILP (w->vchild)) |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2203 fake_current_matrices (w->vchild); |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2204 else |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2205 { |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2206 int i; |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2207 struct frame *f = XFRAME (w->frame); |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2208 struct glyph_matrix *m = w->current_matrix; |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2209 struct glyph_matrix *fm = f->current_matrix; |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2210 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2211 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
|
2212 xassert (m->matrix_w == WINDOW_TOTAL_COLS (w)); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2213 |
|
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2214 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
|
2215 { |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2216 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
|
2217 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
|
2218 |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2219 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
|
2220 && 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
|
2221 |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2222 r->enabled_p = fr->enabled_p; |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2223 if (r->enabled_p) |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2224 { |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2225 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
|
2226 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
|
2227 r->used[TEXT_AREA] = (m->matrix_w |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2228 - r->used[LEFT_MARGIN_AREA] |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2229 - r->used[RIGHT_MARGIN_AREA]); |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2230 r->mode_line_p = 0; |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2231 } |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2232 } |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2233 } |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2234 } |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2235 } |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2236 |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2237 |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2238 /* 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
|
2239 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
|
2240 |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2241 static struct glyph_matrix * |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2242 save_current_matrix (f) |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2243 struct frame *f; |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2244 { |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2245 int i; |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2246 struct glyph_matrix *saved; |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2247 |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2248 saved = (struct glyph_matrix *) xmalloc (sizeof *saved); |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2249 bzero (saved, sizeof *saved); |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2250 saved->nrows = f->current_matrix->nrows; |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2251 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
|
2252 * sizeof *saved->rows); |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2253 bzero (saved->rows, saved->nrows * sizeof *saved->rows); |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2254 |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2255 for (i = 0; i < saved->nrows; ++i) |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2256 { |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2257 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
|
2258 struct glyph_row *to = saved->rows + i; |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2259 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
|
2260 to->glyphs[TEXT_AREA] = (struct glyph *) xmalloc (nbytes); |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2261 bcopy (from->glyphs[TEXT_AREA], to->glyphs[TEXT_AREA], nbytes); |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2262 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
|
2263 } |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2264 |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2265 return saved; |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2266 } |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2267 |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2268 |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2269 /* 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
|
2270 and free memory associated with SAVED. */ |
|
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2271 |
|
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2272 static void |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2273 restore_current_matrix (f, saved) |
|
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2274 struct frame *f; |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2275 struct glyph_matrix *saved; |
|
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2276 { |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2277 int i; |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2278 |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2279 for (i = 0; i < saved->nrows; ++i) |
|
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2280 { |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2281 struct glyph_row *from = saved->rows + i; |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2282 struct glyph_row *to = f->current_matrix->rows + i; |
|
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2283 size_t nbytes = from->used[TEXT_AREA] * sizeof (struct glyph); |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2284 bcopy (from->glyphs[TEXT_AREA], to->glyphs[TEXT_AREA], nbytes); |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2285 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
|
2286 xfree (from->glyphs[TEXT_AREA]); |
|
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2287 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2288 |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2289 xfree (saved->rows); |
|
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2290 xfree (saved); |
|
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2291 } |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2292 |
|
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2293 |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2294 |
| 25012 | 2295 /* Allocate/reallocate glyph matrices of a single frame F for |
| 2296 frame-based redisplay. */ | |
| 2297 | |
| 2298 static void | |
| 2299 adjust_frame_glyphs_for_frame_redisplay (f) | |
| 2300 struct frame *f; | |
| 2301 { | |
| 2302 struct dim matrix_dim; | |
| 2303 int pool_changed_p; | |
| 2304 int window_change_flags; | |
| 2305 int top_window_y; | |
| 2306 | |
| 2307 if (!FRAME_LIVE_P (f)) | |
| 2308 return; | |
| 2309 | |
| 2310 top_window_y = FRAME_TOP_MARGIN (f); | |
| 2311 | |
| 2312 /* Allocate glyph pool structures if not already done. */ | |
| 2313 if (f->desired_pool == NULL) | |
| 2314 { | |
| 2315 f->desired_pool = new_glyph_pool (); | |
| 2316 f->current_pool = new_glyph_pool (); | |
| 2317 } | |
| 2318 | |
| 2319 /* Allocate frames matrix structures if needed. */ | |
| 2320 if (f->desired_matrix == NULL) | |
| 2321 { | |
| 2322 f->desired_matrix = new_glyph_matrix (f->desired_pool); | |
| 2323 f->current_matrix = new_glyph_matrix (f->current_pool); | |
| 2324 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2325 |
| 25012 | 2326 /* Compute window glyph matrices. (This takes the mini-buffer |
| 2327 window into account). The result is the size of the frame glyph | |
| 2328 matrix needed. The variable window_change_flags is set to a bit | |
| 2329 mask indicating whether new matrices will be allocated or | |
| 2330 existing matrices change their size or location within the frame | |
| 2331 matrix. */ | |
| 2332 window_change_flags = 0; | |
| 2333 matrix_dim | |
| 2334 = allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f), | |
| 2335 0, top_window_y, | |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2336 1, |
| 25012 | 2337 &window_change_flags); |
| 2338 | |
| 2339 /* Add in menu bar lines, if any. */ | |
| 2340 matrix_dim.height += top_window_y; | |
| 2341 | |
| 2342 /* Enlarge pools as necessary. */ | |
| 2343 pool_changed_p = realloc_glyph_pool (f->desired_pool, matrix_dim); | |
| 2344 realloc_glyph_pool (f->current_pool, matrix_dim); | |
| 2345 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2346 /* Set up glyph pointers within window matrices. Do this only if |
| 25012 | 2347 absolutely necessary since it requires a frame redraw. */ |
| 2348 if (pool_changed_p || window_change_flags) | |
| 2349 { | |
| 2350 /* Do it for window matrices. */ | |
| 2351 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
|
2352 0, top_window_y, 0, |
| 25012 | 2353 &window_change_flags); |
| 2354 | |
| 2355 /* Size of frame matrices must equal size of frame. Note | |
| 2356 that we are called for X frames with window widths NOT equal | |
| 2357 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
|
2358 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
|
2359 && matrix_dim.height == FRAME_LINES (f)); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2360 |
|
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2361 /* Pointers to glyph memory in glyph rows are exchanged during |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2362 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
|
2363 frame's current matrix consists of pointers into both the |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2364 desired and current glyph pool of the frame. Adjusting a |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2365 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
|
2366 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
|
2367 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
|
2368 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
|
2369 matrix' contents from that copy. */ |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2370 if (display_completed |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2371 && !FRAME_GARBAGED_P (f) |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2372 && 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
|
2373 && 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
|
2374 /* 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
|
2375 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
|
2376 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
|
2377 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
|
2378 && !showing_window_margins_p (XWINDOW (FRAME_ROOT_WINDOW (f)))) |
|
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2379 { |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2380 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
|
2381 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
|
2382 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
|
2383 restore_current_matrix (f, copy); |
|
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2384 fake_current_matrices (FRAME_ROOT_WINDOW (f)); |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2385 } |
|
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2386 else |
|
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2387 { |
|
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2388 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
|
2389 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
|
2390 SET_FRAME_GARBAGED (f); |
|
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2391 } |
| 25012 | 2392 } |
| 2393 } | |
| 2394 | |
| 2395 | |
| 2396 /* Allocate/reallocate glyph matrices of a single frame F for | |
| 2397 window-based redisplay. */ | |
| 2398 | |
| 2399 static void | |
| 2400 adjust_frame_glyphs_for_window_redisplay (f) | |
| 2401 struct frame *f; | |
| 2402 { | |
| 2403 struct window *w; | |
| 2404 | |
| 2405 xassert (FRAME_WINDOW_P (f) && FRAME_LIVE_P (f)); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2406 |
| 25012 | 2407 /* Allocate/reallocate window matrices. */ |
|
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2408 allocate_matrices_for_window_redisplay (XWINDOW (FRAME_ROOT_WINDOW (f))); |
| 25012 | 2409 |
|
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
|
2410 #ifdef HAVE_X_WINDOWS |
| 25012 | 2411 /* Allocate/ reallocate matrices of the dummy window used to display |
| 2412 the menu bar under X when no X toolkit support is available. */ | |
| 49322 | 2413 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) |
| 25012 | 2414 { |
| 2415 /* Allocate a dummy window if not already done. */ | |
| 2416 if (NILP (f->menu_bar_window)) | |
| 2417 { | |
| 2418 f->menu_bar_window = make_window (); | |
| 2419 w = XWINDOW (f->menu_bar_window); | |
| 2420 XSETFRAME (w->frame, f); | |
| 2421 w->pseudo_window_p = 1; | |
| 2422 } | |
| 2423 else | |
| 2424 w = XWINDOW (f->menu_bar_window); | |
| 2425 | |
| 2426 /* Set window dimensions to frame dimensions and allocate or | |
| 2427 adjust glyph matrices of W. */ | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2428 XSETFASTINT (w->top_line, 0); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2429 XSETFASTINT (w->left_col, 0); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2430 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
|
2431 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
|
2432 allocate_matrices_for_window_redisplay (w); |
| 25012 | 2433 } |
|
73402
c76709b3cbc0
(adjust_frame_glyphs_for_window_redisplay): Fix #endif comments.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73383
diff
changeset
|
2434 #endif /* 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
|
2435 #endif /* HAVE_X_WINDOWS */ |
| 25012 | 2436 |
| 49322 | 2437 #ifndef USE_GTK |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2438 /* 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
|
2439 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
|
2440 if (NILP (f->tool_bar_window)) |
| 25012 | 2441 { |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2442 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
|
2443 w = XWINDOW (f->tool_bar_window); |
| 25012 | 2444 XSETFRAME (w->frame, f); |
| 2445 w->pseudo_window_p = 1; | |
| 2446 } | |
| 2447 else | |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2448 w = XWINDOW (f->tool_bar_window); |
| 25012 | 2449 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2450 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
|
2451 XSETFASTINT (w->left_col, 0); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2452 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
|
2453 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
|
2454 allocate_matrices_for_window_redisplay (w); |
| 49322 | 2455 #endif |
| 25012 | 2456 } |
| 2457 | |
| 2458 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2459 /* Adjust/ allocate message buffer of frame F. |
| 25012 | 2460 |
| 2461 Note that the message buffer is never freed. Since I could not | |
| 2462 find a free in 19.34, I assume that freeing it would be | |
| 2463 problematic in some way and don't do it either. | |
| 2464 | |
| 2465 (Implementation note: It should be checked if we can free it | |
| 2466 eventually without causing trouble). */ | |
| 2467 | |
| 2468 static void | |
| 2469 adjust_frame_message_buffer (f) | |
| 2470 struct frame *f; | |
| 2471 { | |
| 2472 int size = FRAME_MESSAGE_BUF_SIZE (f) + 1; | |
| 2473 | |
| 2474 if (FRAME_MESSAGE_BUF (f)) | |
| 2475 { | |
| 2476 char *buffer = FRAME_MESSAGE_BUF (f); | |
| 2477 char *new_buffer = (char *) xrealloc (buffer, size); | |
| 2478 FRAME_MESSAGE_BUF (f) = new_buffer; | |
| 2479 } | |
| 2480 else | |
| 2481 FRAME_MESSAGE_BUF (f) = (char *) xmalloc (size); | |
| 2482 } | |
| 2483 | |
| 2484 | |
| 2485 /* Re-allocate buffer for decode_mode_spec on frame F. */ | |
| 2486 | |
| 2487 static void | |
| 2488 adjust_decode_mode_spec_buffer (f) | |
| 2489 struct frame *f; | |
| 2490 { | |
| 2491 f->decode_mode_spec_buffer | |
| 2492 = (char *) xrealloc (f->decode_mode_spec_buffer, | |
| 2493 FRAME_MESSAGE_BUF_SIZE (f) + 1); | |
| 2494 } | |
| 2495 | |
| 2496 | |
| 2497 | |
| 2498 /********************************************************************** | |
| 2499 Freeing Glyph Matrices | |
| 2500 **********************************************************************/ | |
| 2501 | |
| 2502 /* Free glyph memory for a frame F. F may be null. This function can | |
| 2503 be called for the same frame more than once. The root window of | |
| 2504 F may be nil when this function is called. This is the case when | |
| 2505 the function is called when F is destroyed. */ | |
| 2506 | |
| 2507 void | |
| 2508 free_glyphs (f) | |
| 2509 struct frame *f; | |
| 2510 { | |
| 2511 if (f && f->glyphs_initialized_p) | |
| 2512 { | |
|
27968
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2513 /* 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
|
2514 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
|
2515 BLOCK_INPUT; |
| 25012 | 2516 f->glyphs_initialized_p = 0; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2517 |
| 25012 | 2518 /* Release window sub-matrices. */ |
| 2519 if (!NILP (f->root_window)) | |
| 2520 free_window_matrices (XWINDOW (f->root_window)); | |
| 2521 | |
| 2522 /* Free the dummy window for menu bars without X toolkit and its | |
| 2523 glyph matrices. */ | |
| 2524 if (!NILP (f->menu_bar_window)) | |
| 2525 { | |
| 2526 struct window *w = XWINDOW (f->menu_bar_window); | |
| 2527 free_glyph_matrix (w->desired_matrix); | |
| 2528 free_glyph_matrix (w->current_matrix); | |
| 2529 w->desired_matrix = w->current_matrix = NULL; | |
| 2530 f->menu_bar_window = Qnil; | |
| 2531 } | |
| 2532 | |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2533 /* 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
|
2534 if (!NILP (f->tool_bar_window)) |
| 25012 | 2535 { |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2536 struct window *w = XWINDOW (f->tool_bar_window); |
| 25012 | 2537 free_glyph_matrix (w->desired_matrix); |
| 2538 free_glyph_matrix (w->current_matrix); | |
| 2539 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
|
2540 f->tool_bar_window = Qnil; |
| 25012 | 2541 } |
| 2542 | |
| 2543 /* Release frame glyph matrices. Reset fields to zero in | |
| 2544 case we are called a second time. */ | |
| 2545 if (f->desired_matrix) | |
| 2546 { | |
| 2547 free_glyph_matrix (f->desired_matrix); | |
| 2548 free_glyph_matrix (f->current_matrix); | |
| 2549 f->desired_matrix = f->current_matrix = NULL; | |
| 2550 } | |
| 2551 | |
| 2552 /* Release glyph pools. */ | |
| 2553 if (f->desired_pool) | |
| 2554 { | |
| 2555 free_glyph_pool (f->desired_pool); | |
| 2556 free_glyph_pool (f->current_pool); | |
| 2557 f->desired_pool = f->current_pool = NULL; | |
| 314 | 2558 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2559 |
|
27968
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2560 UNBLOCK_INPUT; |
| 314 | 2561 } |
| 2562 } | |
| 2563 | |
| 25012 | 2564 |
| 2565 /* Free glyph sub-matrices in the window tree rooted at W. This | |
| 2566 function may be called with a null pointer, and it may be called on | |
| 2567 the same tree more than once. */ | |
| 2568 | |
| 2569 void | |
| 2570 free_window_matrices (w) | |
| 2571 struct window *w; | |
| 2572 { | |
| 2573 while (w) | |
| 2574 { | |
| 2575 if (!NILP (w->hchild)) | |
| 2576 free_window_matrices (XWINDOW (w->hchild)); | |
| 2577 else if (!NILP (w->vchild)) | |
| 2578 free_window_matrices (XWINDOW (w->vchild)); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2579 else |
| 25012 | 2580 { |
| 2581 /* This is a leaf window. Free its memory and reset fields | |
| 2582 to zero in case this function is called a second time for | |
| 2583 W. */ | |
| 2584 free_glyph_matrix (w->current_matrix); | |
| 2585 free_glyph_matrix (w->desired_matrix); | |
| 2586 w->current_matrix = w->desired_matrix = NULL; | |
| 2587 } | |
| 2588 | |
| 2589 /* Next window on same level. */ | |
| 2590 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
| 2591 } | |
| 2592 } | |
| 2593 | |
| 2594 | |
| 2595 /* Check glyph memory leaks. This function is called from | |
| 2596 shut_down_emacs. Note that frames are not destroyed when Emacs | |
| 2597 exits. We therefore free all glyph memory for all active frames | |
| 2598 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
|
2599 |
|
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2600 void |
| 25012 | 2601 check_glyph_memory () |
|
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2602 { |
| 25012 | 2603 Lisp_Object tail, frame; |
| 2604 | |
| 2605 /* Free glyph memory for all frames. */ | |
| 2606 FOR_EACH_FRAME (tail, frame) | |
| 2607 free_glyphs (XFRAME (frame)); | |
| 2608 | |
| 2609 /* Check that nothing is left allocated. */ | |
| 2610 if (glyph_matrix_count) | |
| 2611 abort (); | |
| 2612 if (glyph_pool_count) | |
| 2613 abort (); | |
| 2614 } | |
| 2615 | |
| 2616 | |
| 2617 | |
| 2618 /********************************************************************** | |
| 2619 Building a Frame Matrix | |
| 2620 **********************************************************************/ | |
| 2621 | |
| 2622 /* Most of the redisplay code works on glyph matrices attached to | |
| 2623 windows. This is a good solution most of the time, but it is not | |
| 2624 suitable for terminal code. Terminal output functions cannot rely | |
| 2625 on being able to set an arbitrary terminal window. Instead they | |
| 2626 must be provided with a view of the whole frame, i.e. the whole | |
| 2627 screen. We build such a view by constructing a frame matrix from | |
| 2628 window matrices in this section. | |
| 2629 | |
| 2630 Windows that must be updated have their must_be_update_p flag set. | |
| 2631 For all such windows, their desired matrix is made part of the | |
| 2632 desired frame matrix. For other windows, their current matrix is | |
| 2633 made part of the desired frame matrix. | |
| 2634 | |
| 2635 +-----------------+----------------+ | |
| 2636 | desired | desired | | |
| 2637 | | | | |
| 2638 +-----------------+----------------+ | |
| 2639 | current | | |
| 2640 | | | |
| 2641 +----------------------------------+ | |
| 2642 | |
| 2643 Desired window matrices can be made part of the frame matrix in a | |
| 2644 cheap way: We exploit the fact that the desired frame matrix and | |
| 2645 desired window matrices share their glyph memory. This is not | |
| 2646 possible for current window matrices. Their glyphs are copied to | |
| 2647 the desired frame matrix. The latter is equivalent to | |
| 2648 preserve_other_columns in the old redisplay. | |
| 2649 | |
| 2650 Used glyphs counters for frame matrix rows are the result of adding | |
| 2651 up glyph lengths of the window matrices. A line in the frame | |
| 2652 matrix is enabled, if a corresponding line in a window matrix is | |
| 2653 enabled. | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2654 |
| 25012 | 2655 After building the desired frame matrix, it will be passed to |
| 2656 terminal code, which will manipulate both the desired and current | |
| 2657 frame matrix. Changes applied to the frame's current matrix have | |
| 2658 to be visible in current window matrices afterwards, of course. | |
| 2659 | |
| 2660 This problem is solved like this: | |
| 2661 | |
| 2662 1. Window and frame matrices share glyphs. Window matrices are | |
| 2663 constructed in a way that their glyph contents ARE the glyph | |
| 2664 contents needed in a frame matrix. Thus, any modification of | |
| 2665 glyphs done in terminal code will be reflected in window matrices | |
| 2666 automatically. | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2667 |
| 25012 | 2668 2. Exchanges of rows in a frame matrix done by terminal code are |
| 2669 intercepted by hook functions so that corresponding row operations | |
| 2670 on window matrices can be performed. This is necessary because we | |
| 2671 use pointers to glyphs in glyph row structures. To satisfy the | |
| 2672 assumption of point 1 above that glyphs are updated implicitly in | |
| 2673 window matrices when they are manipulated via the frame matrix, | |
| 2674 window and frame matrix must of course agree where to find the | |
| 2675 glyphs for their rows. Possible manipulations that must be | |
| 2676 mirrored are assignments of rows of the desired frame matrix to the | |
| 2677 current frame matrix and scrolling the current frame matrix. */ | |
| 2678 | |
| 2679 /* Build frame F's desired matrix from window matrices. Only windows | |
| 2680 which have the flag must_be_updated_p set have to be updated. Menu | |
| 2681 bar lines of a frame are not covered by window matrices, so make | |
| 2682 sure not to touch them in this function. */ | |
| 2683 | |
| 2684 static void | |
| 2685 build_frame_matrix (f) | |
| 2686 struct frame *f; | |
| 2687 { | |
|
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2688 int i; |
|
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2689 |
| 25012 | 2690 /* F must have a frame matrix when this function is called. */ |
| 2691 xassert (!FRAME_WINDOW_P (f)); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2692 |
| 25012 | 2693 /* Clear all rows in the frame matrix covered by window matrices. |
| 2694 Menu bar lines are not covered by windows. */ | |
| 2695 for (i = FRAME_TOP_MARGIN (f); i < f->desired_matrix->nrows; ++i) | |
| 2696 clear_glyph_row (MATRIX_ROW (f->desired_matrix, i)); | |
| 2697 | |
| 2698 /* Build the matrix by walking the window tree. */ | |
| 2699 build_frame_matrix_from_window_tree (f->desired_matrix, | |
| 2700 XWINDOW (FRAME_ROOT_WINDOW (f))); | |
| 2701 } | |
| 2702 | |
| 2703 | |
| 2704 /* Walk a window tree, building a frame matrix MATRIX from window | |
| 2705 matrices. W is the root of a window tree. */ | |
| 2706 | |
| 2707 static void | |
| 2708 build_frame_matrix_from_window_tree (matrix, w) | |
| 2709 struct glyph_matrix *matrix; | |
| 2710 struct window *w; | |
| 2711 { | |
| 2712 while (w) | |
|
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2713 { |
| 25012 | 2714 if (!NILP (w->hchild)) |
| 2715 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->hchild)); | |
| 2716 else if (!NILP (w->vchild)) | |
| 2717 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->vchild)); | |
| 2718 else | |
| 2719 build_frame_matrix_from_leaf_window (matrix, w); | |
| 2720 | |
| 2721 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
|
2722 } |
|
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2723 } |
|
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2724 |
| 25012 | 2725 |
| 2726 /* Add a window's matrix to a frame matrix. FRAME_MATRIX is the | |
| 2727 desired frame matrix built. W is a leaf window whose desired or | |
| 2728 current matrix is to be added to FRAME_MATRIX. W's flag | |
| 2729 must_be_updated_p determines which matrix it contributes to | |
| 2730 FRAME_MATRIX. If must_be_updated_p is non-zero, W's desired matrix | |
| 2731 is added to FRAME_MATRIX, otherwise W's current matrix is added. | |
| 2732 Adding a desired matrix means setting up used counters and such in | |
| 2733 frame rows, while adding a current window matrix to FRAME_MATRIX | |
| 2734 means copying glyphs. The latter case corresponds to | |
| 2735 preserve_other_columns in the old redisplay. */ | |
| 2736 | |
| 2737 static void | |
| 2738 build_frame_matrix_from_leaf_window (frame_matrix, w) | |
| 2739 struct glyph_matrix *frame_matrix; | |
|
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2740 struct window *w; |
|
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2741 { |
| 25012 | 2742 struct glyph_matrix *window_matrix; |
| 2743 int window_y, frame_y; | |
| 2744 /* 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
|
2745 GLYPH right_border_glyph; |
|
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2746 |
|
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2747 SET_GLYPH_FROM_CHAR (right_border_glyph, 0); |
| 25012 | 2748 |
| 2749 /* Set window_matrix to the matrix we have to add to FRAME_MATRIX. */ | |
| 2750 if (w->must_be_updated_p) | |
| 2751 { | |
| 2752 window_matrix = w->desired_matrix; | |
| 2753 | |
| 2754 /* Decide whether we want to add a vertical border glyph. */ | |
| 2755 if (!WINDOW_RIGHTMOST_P (w)) | |
| 2756 { | |
| 2757 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
|
2758 Lisp_Object gc; |
|
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2759 |
|
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2760 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
|
2761 if (dp |
|
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2762 && (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
|
2763 && 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
|
2764 { |
|
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2765 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
|
2766 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
|
2767 } |
|
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2768 |
|
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2769 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
|
2770 SET_GLYPH_FACE (right_border_glyph, VERTICAL_BORDER_FACE_ID); |
| 25012 | 2771 } |
| 2772 } | |
| 2773 else | |
| 2774 window_matrix = w->current_matrix; | |
| 2775 | |
| 2776 /* For all rows in the window matrix and corresponding rows in the | |
| 2777 frame matrix. */ | |
| 2778 window_y = 0; | |
| 2779 frame_y = window_matrix->matrix_y; | |
| 2780 while (window_y < window_matrix->nrows) | |
|
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2781 { |
| 25012 | 2782 struct glyph_row *frame_row = frame_matrix->rows + frame_y; |
| 2783 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
|
2784 int current_row_p = window_matrix == w->current_matrix; |
| 25012 | 2785 |
| 2786 /* Fill up the frame row with spaces up to the left margin of the | |
| 2787 window row. */ | |
| 2788 fill_up_frame_row_with_spaces (frame_row, window_matrix->matrix_x); | |
| 2789 | |
| 2790 /* Fill up areas in the window matrix row with spaces. */ | |
| 2791 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
|
2792 |
|
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2793 /* 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
|
2794 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
|
2795 row instead. */ |
|
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2796 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
|
2797 && !window_row->enabled_p) |
|
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2798 { |
|
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2799 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
|
2800 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
|
2801 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2802 |
|
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2803 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
|
2804 { |
|
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2805 /* Copy window row to frame row. */ |
| 25012 | 2806 bcopy (window_row->glyphs[0], |
| 2807 frame_row->glyphs[TEXT_AREA] + window_matrix->matrix_x, | |
| 2808 window_matrix->matrix_w * sizeof (struct glyph)); | |
| 2809 } | |
| 2810 else | |
| 2811 { | |
|
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2812 xassert (window_row->enabled_p); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2813 |
|
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2814 /* 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
|
2815 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
|
2816 frame_row->enabled_p = 1; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2817 |
| 25012 | 2818 /* Maybe insert a vertical border between horizontally adjacent |
| 2819 windows. */ | |
|
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2820 if (GLYPH_CHAR (right_border_glyph) != 0) |
| 25012 | 2821 { |
| 2822 struct glyph *border = window_row->glyphs[LAST_AREA] - 1; | |
| 2823 SET_CHAR_GLYPH_FROM_GLYPH (*border, right_border_glyph); | |
| 2824 } | |
| 2825 | |
|
59902
4a0a167cb6c4
(build_frame_matrix_from_leaf_window)
Kim F. Storm <storm@cua.dk>
parents:
59879
diff
changeset
|
2826 #if GLYPH_DEBUG |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2827 /* 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
|
2828 frame_y. */ |
| 25012 | 2829 xassert (glyph_row_slice_p (window_row, frame_row)); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2830 |
| 25012 | 2831 /* If rows are in sync, we don't have to copy glyphs because |
| 2832 frame and window share glyphs. */ | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2833 |
|
25241
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2834 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
|
2835 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
|
2836 #endif |
| 25012 | 2837 } |
| 2838 | |
| 2839 /* Set number of used glyphs in the frame matrix. Since we fill | |
| 2840 up with spaces, and visit leaf windows from left to right it | |
| 2841 can be done simply. */ | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2842 frame_row->used[TEXT_AREA] |
| 25012 | 2843 = window_matrix->matrix_x + window_matrix->matrix_w; |
| 2844 | |
| 2845 /* Next row. */ | |
| 2846 ++window_y; | |
| 2847 ++frame_y; | |
| 2848 } | |
| 2849 } | |
| 2850 | |
|
63547
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2851 /* 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
|
2852 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
|
2853 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
|
2854 for instance, vertical separators, truncation markers, etc. */ |
|
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2855 |
|
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2856 void |
|
63547
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2857 spec_glyph_lookup_face (w, glyph) |
|
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2858 struct window *w; |
|
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2859 GLYPH *glyph; |
|
63547
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2860 { |
|
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
2861 int lface_id = GLYPH_FACE (*glyph); |
|
63547
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2862 /* 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
|
2863 if (lface_id > 0) |
|
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2864 { |
|
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2865 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
|
2866 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
|
2867 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
|
2868 } |
|
63547
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2869 } |
| 25012 | 2870 |
| 2871 /* Add spaces to a glyph row ROW in a window matrix. | |
| 2872 | |
| 2873 Each row has the form: | |
| 2874 | |
| 2875 +---------+-----------------------------+------------+ | |
| 2876 | left | text | right | | |
| 2877 +---------+-----------------------------+------------+ | |
| 2878 | |
| 2879 Left and right marginal areas are optional. This function adds | |
| 2880 spaces to areas so that there are no empty holes between areas. | |
| 2881 In other words: If the right area is not empty, the text area | |
| 2882 is filled up with spaces up to the right area. If the text area | |
| 2883 is not empty, the left area is filled up. | |
| 2884 | |
| 2885 To be called for frame-based redisplay, only. */ | |
| 2886 | |
| 2887 static void | |
| 2888 fill_up_glyph_row_with_spaces (row) | |
| 2889 struct glyph_row *row; | |
| 2890 { | |
| 2891 fill_up_glyph_row_area_with_spaces (row, LEFT_MARGIN_AREA); | |
| 2892 fill_up_glyph_row_area_with_spaces (row, TEXT_AREA); | |
| 2893 fill_up_glyph_row_area_with_spaces (row, RIGHT_MARGIN_AREA); | |
| 2894 } | |
| 2895 | |
| 2896 | |
| 2897 /* Fill area AREA of glyph row ROW with spaces. To be called for | |
| 2898 frame-based redisplay only. */ | |
| 2899 | |
| 2900 static void | |
| 2901 fill_up_glyph_row_area_with_spaces (row, area) | |
| 2902 struct glyph_row *row; | |
| 2903 int area; | |
| 2904 { | |
| 2905 if (row->glyphs[area] < row->glyphs[area + 1]) | |
| 2906 { | |
| 2907 struct glyph *end = row->glyphs[area + 1]; | |
| 2908 struct glyph *text = row->glyphs[area] + row->used[area]; | |
| 2909 | |
| 2910 while (text < end) | |
| 2911 *text++ = space_glyph; | |
| 2912 row->used[area] = text - row->glyphs[area]; | |
| 2913 } | |
| 2914 } | |
| 2915 | |
| 2916 | |
| 2917 /* Add spaces to the end of ROW in a frame matrix until index UPTO is | |
| 2918 reached. In frame matrices only one area, TEXT_AREA, is used. */ | |
| 2919 | |
| 2920 static void | |
| 2921 fill_up_frame_row_with_spaces (row, upto) | |
| 2922 struct glyph_row *row; | |
| 2923 int upto; | |
| 2924 { | |
| 2925 int i = row->used[TEXT_AREA]; | |
| 2926 struct glyph *glyph = row->glyphs[TEXT_AREA]; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2927 |
| 25012 | 2928 while (i < upto) |
| 2929 glyph[i++] = space_glyph; | |
| 2930 | |
| 2931 row->used[TEXT_AREA] = i; | |
| 2932 } | |
| 2933 | |
| 2934 | |
| 2935 | |
| 2936 /********************************************************************** | |
| 2937 Mirroring operations on frame matrices in window matrices | |
| 2938 **********************************************************************/ | |
| 2939 | |
| 2940 /* Set frame being updated via frame-based redisplay to F. This | |
| 2941 function must be called before updates to make explicit that we are | |
| 2942 working on frame matrices or not. */ | |
| 2943 | |
| 2944 static INLINE void | |
| 2945 set_frame_matrix_frame (f) | |
| 2946 struct frame *f; | |
| 2947 { | |
| 2948 frame_matrix_frame = f; | |
| 2949 } | |
| 2950 | |
| 2951 | |
| 2952 /* Make sure glyph row ROW in CURRENT_MATRIX is up to date. | |
| 2953 DESIRED_MATRIX is the desired matrix corresponding to | |
| 2954 CURRENT_MATRIX. The update is done by exchanging glyph pointers | |
| 2955 between rows in CURRENT_MATRIX and DESIRED_MATRIX. If | |
| 2956 frame_matrix_frame is non-null, this indicates that the exchange is | |
| 2957 done in frame matrices, and that we have to perform analogous | |
| 2958 operations in window matrices of frame_matrix_frame. */ | |
| 2959 | |
| 2960 static INLINE void | |
| 2961 make_current (desired_matrix, current_matrix, row) | |
| 2962 struct glyph_matrix *desired_matrix, *current_matrix; | |
| 2963 int row; | |
| 2964 { | |
| 2965 struct glyph_row *current_row = MATRIX_ROW (current_matrix, row); | |
| 2966 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
|
2967 int mouse_face_p = current_row->mouse_face_p; |
| 25012 | 2968 |
| 2969 /* Do current_row = desired_row. This exchanges glyph pointers | |
| 2970 between both rows, and does a structure assignment otherwise. */ | |
| 2971 assign_row (current_row, desired_row); | |
| 2972 | |
| 2973 /* Enable current_row to mark it as valid. */ | |
| 2974 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
|
2975 current_row->mouse_face_p = mouse_face_p; |
| 25012 | 2976 |
| 2977 /* If we are called on frame matrices, perform analogous operations | |
| 2978 for window matrices. */ | |
| 2979 if (frame_matrix_frame) | |
| 2980 mirror_make_current (XWINDOW (frame_matrix_frame->root_window), row); | |
| 2981 } | |
| 2982 | |
| 2983 | |
| 2984 /* W is the root of a window tree. FRAME_ROW is the index of a row in | |
| 2985 W's frame which has been made current (by swapping pointers between | |
| 2986 current and desired matrix). Perform analogous operations in the | |
| 2987 matrices of leaf windows in the window tree rooted at W. */ | |
| 2988 | |
| 2989 static void | |
| 2990 mirror_make_current (w, frame_row) | |
| 2991 struct window *w; | |
| 2992 int frame_row; | |
| 2993 { | |
| 2994 while (w) | |
| 2995 { | |
| 2996 if (!NILP (w->hchild)) | |
| 2997 mirror_make_current (XWINDOW (w->hchild), frame_row); | |
| 2998 else if (!NILP (w->vchild)) | |
| 2999 mirror_make_current (XWINDOW (w->vchild), frame_row); | |
| 3000 else | |
| 3001 { | |
| 3002 /* Row relative to window W. Don't use FRAME_TO_WINDOW_VPOS | |
| 3003 here because the checks performed in debug mode there | |
| 3004 will not allow the conversion. */ | |
| 3005 int row = frame_row - w->desired_matrix->matrix_y; | |
| 3006 | |
| 3007 /* If FRAME_ROW is within W, assign the desired row to the | |
| 3008 current row (exchanging glyph pointers). */ | |
| 3009 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
|
3010 { |
| 25012 | 3011 struct glyph_row *current_row |
| 3012 = MATRIX_ROW (w->current_matrix, row); | |
| 3013 struct glyph_row *desired_row | |
| 3014 = 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
|
3015 |
|
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
3016 if (desired_row->enabled_p) |
|
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
3017 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
|
3018 else |
|
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
3019 swap_glyph_pointers (desired_row, current_row); |
| 25012 | 3020 current_row->enabled_p = 1; |
|
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
3021 } |
|
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
3022 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3023 |
| 25012 | 3024 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
|
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
3025 } |
|
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
3026 } |
| 25012 | 3027 |
| 3028 | |
| 3029 /* Perform row dance after scrolling. We are working on the range of | |
| 3030 lines UNCHANGED_AT_TOP + 1 to UNCHANGED_AT_TOP + NLINES (not | |
| 3031 including) in MATRIX. COPY_FROM is a vector containing, for each | |
| 3032 row I in the range 0 <= I < NLINES, the index of the original line | |
| 3033 to move to I. This index is relative to the row range, i.e. 0 <= | |
| 3034 index < NLINES. RETAINED_P is a vector containing zero for each | |
| 3035 row 0 <= I < NLINES which is empty. | |
| 3036 | |
| 3037 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
|
3038 |
| 25012 | 3039 void |
| 3040 mirrored_line_dance (matrix, unchanged_at_top, nlines, copy_from, | |
| 3041 retained_p) | |
| 3042 struct glyph_matrix *matrix; | |
| 3043 int unchanged_at_top, nlines; | |
| 3044 int *copy_from; | |
| 3045 char *retained_p; | |
| 3046 { | |
| 3047 /* A copy of original rows. */ | |
| 3048 struct glyph_row *old_rows; | |
| 3049 | |
| 3050 /* Rows to assign to. */ | |
| 3051 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
|
3052 |
| 25012 | 3053 int i; |
| 3054 | |
| 3055 /* Make a copy of the original rows. */ | |
| 3056 old_rows = (struct glyph_row *) alloca (nlines * sizeof *old_rows); | |
| 3057 bcopy (new_rows, old_rows, nlines * sizeof *old_rows); | |
| 3058 | |
| 3059 /* Assign new rows, maybe clear lines. */ | |
| 3060 for (i = 0; i < nlines; ++i) | |
| 3061 { | |
| 3062 int enabled_before_p = new_rows[i].enabled_p; | |
| 3063 | |
| 3064 xassert (i + unchanged_at_top < matrix->nrows); | |
| 3065 xassert (unchanged_at_top + copy_from[i] < matrix->nrows); | |
| 3066 new_rows[i] = old_rows[copy_from[i]]; | |
| 3067 new_rows[i].enabled_p = enabled_before_p; | |
| 3068 | |
| 3069 /* RETAINED_P is zero for empty lines. */ | |
| 3070 if (!retained_p[copy_from[i]]) | |
| 3071 new_rows[i].enabled_p = 0; | |
| 3072 } | |
| 3073 | |
|
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
|
3074 /* Do the same for window matrices, if MATRIX is a frame matrix. */ |
| 25012 | 3075 if (frame_matrix_frame) |
| 3076 mirror_line_dance (XWINDOW (frame_matrix_frame->root_window), | |
| 3077 unchanged_at_top, nlines, copy_from, retained_p); | |
| 3078 } | |
| 3079 | |
| 3080 | |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3081 /* 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
|
3082 the current frame matrix. */ |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3083 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3084 static void |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3085 sync_window_with_frame_matrix_rows (w) |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3086 struct window *w; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3087 { |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3088 struct frame *f = XFRAME (w->frame); |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3089 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
|
3090 int left, right, x, width; |
|
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3091 |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3092 /* 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
|
3093 xassert (NILP (w->hchild) && NILP (w->vchild)); |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3094 xassert (!FRAME_WINDOW_P (f)); |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3095 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3096 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
|
3097 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
|
3098 x = w->current_matrix->matrix_x; |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3099 width = w->current_matrix->matrix_w; |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3100 |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3101 window_row = w->current_matrix->rows; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3102 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
|
3103 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
|
3104 |
|
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3105 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
|
3106 { |
|
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3107 window_row->glyphs[LEFT_MARGIN_AREA] |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3108 = frame_row->glyphs[0] + x; |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3109 window_row->glyphs[TEXT_AREA] |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3110 = window_row->glyphs[LEFT_MARGIN_AREA] + left; |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3111 window_row->glyphs[LAST_AREA] |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3112 = window_row->glyphs[LEFT_MARGIN_AREA] + width; |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3113 window_row->glyphs[RIGHT_MARGIN_AREA] |
|
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3114 = window_row->glyphs[LAST_AREA] - right; |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3115 } |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3116 } |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3117 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3118 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3119 /* 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
|
3120 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
|
3121 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3122 struct window * |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3123 frame_row_to_window (w, row) |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3124 struct window *w; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3125 int row; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3126 { |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3127 struct window *found = NULL; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3128 |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3129 while (w && !found) |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3130 { |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3131 if (!NILP (w->hchild)) |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3132 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
|
3133 else if (!NILP (w->vchild)) |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3134 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
|
3135 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
|
3136 && row < WINDOW_BOTTOM_EDGE_LINE (w)) |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3137 found = w; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3138 |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3139 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3140 } |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3141 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3142 return found; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3143 } |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3144 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3145 |
| 25012 | 3146 /* Perform a line dance in the window tree rooted at W, after |
| 3147 scrolling a frame matrix in mirrored_line_dance. | |
| 3148 | |
| 3149 We are working on the range of lines UNCHANGED_AT_TOP + 1 to | |
| 3150 UNCHANGED_AT_TOP + NLINES (not including) in W's frame matrix. | |
| 3151 COPY_FROM is a vector containing, for each row I in the range 0 <= | |
| 3152 I < NLINES, the index of the original line to move to I. This | |
| 3153 index is relative to the row range, i.e. 0 <= index < NLINES. | |
| 3154 RETAINED_P is a vector containing zero for each row 0 <= I < NLINES | |
| 3155 which is empty. */ | |
| 3156 | |
| 3157 static void | |
| 3158 mirror_line_dance (w, unchanged_at_top, nlines, copy_from, retained_p) | |
| 3159 struct window *w; | |
| 3160 int unchanged_at_top, nlines; | |
| 3161 int *copy_from; | |
| 3162 char *retained_p; | |
| 3163 { | |
| 3164 while (w) | |
| 3165 { | |
| 3166 if (!NILP (w->hchild)) | |
| 3167 mirror_line_dance (XWINDOW (w->hchild), unchanged_at_top, | |
| 3168 nlines, copy_from, retained_p); | |
| 3169 else if (!NILP (w->vchild)) | |
| 3170 mirror_line_dance (XWINDOW (w->vchild), unchanged_at_top, | |
| 3171 nlines, copy_from, retained_p); | |
| 3172 else | |
| 3173 { | |
| 3174 /* W is a leaf window, and we are working on its current | |
| 3175 matrix m. */ | |
| 3176 struct glyph_matrix *m = w->current_matrix; | |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3177 int i, sync_p = 0; |
| 25012 | 3178 struct glyph_row *old_rows; |
| 3179 | |
| 3180 /* Make a copy of the original rows of matrix m. */ | |
| 3181 old_rows = (struct glyph_row *) alloca (m->nrows * sizeof *old_rows); | |
| 3182 bcopy (m->rows, old_rows, m->nrows * sizeof *old_rows); | |
| 3183 | |
| 3184 for (i = 0; i < nlines; ++i) | |
| 3185 { | |
| 3186 /* Frame relative line assigned to. */ | |
| 3187 int frame_to = i + unchanged_at_top; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3188 |
| 25012 | 3189 /* Frame relative line assigned. */ |
| 3190 int frame_from = copy_from[i] + unchanged_at_top; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3191 |
| 25012 | 3192 /* Window relative line assigned to. */ |
| 3193 int window_to = frame_to - m->matrix_y; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3194 |
| 25012 | 3195 /* Window relative line assigned. */ |
| 3196 int window_from = frame_from - m->matrix_y; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3197 |
| 25012 | 3198 /* Is assigned line inside window? */ |
| 3199 int from_inside_window_p | |
| 3200 = window_from >= 0 && window_from < m->matrix_h; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3201 |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3202 /* Is assigned to line inside window? */ |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3203 int to_inside_window_p |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3204 = window_to >= 0 && window_to < m->matrix_h; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3205 |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3206 if (from_inside_window_p && to_inside_window_p) |
| 25012 | 3207 { |
| 3208 /* Enabled setting before assignment. */ | |
| 3209 int enabled_before_p; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3210 |
| 25012 | 3211 /* Do the assignment. The enabled_p flag is saved |
| 3212 over the assignment because the old redisplay did | |
| 3213 that. */ | |
| 3214 enabled_before_p = m->rows[window_to].enabled_p; | |
| 3215 m->rows[window_to] = old_rows[window_from]; | |
| 3216 m->rows[window_to].enabled_p = enabled_before_p; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3217 |
| 25012 | 3218 /* If frame line is empty, window line is empty, too. */ |
| 3219 if (!retained_p[copy_from[i]]) | |
| 3220 m->rows[window_to].enabled_p = 0; | |
| 3221 } | |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3222 else if (to_inside_window_p) |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3223 { |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3224 /* A copy between windows. This is an infrequent |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3225 case not worth optimizing. */ |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3226 struct frame *f = XFRAME (w->frame); |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3227 struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f)); |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3228 struct window *w2; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3229 struct glyph_matrix *m2; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3230 int m2_from; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3231 |
|
60684
18bf961ed63a
(mirror_line_dance): Set W2 according to FRAME_FROM.
Richard M. Stallman <rms@gnu.org>
parents:
59905
diff
changeset
|
3232 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
|
3233 /* 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
|
3234 -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
|
3235 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
|
3236 if (w2) |
|
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3237 { |
|
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3238 m2 = w2->current_matrix; |
|
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3239 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
|
3240 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
|
3241 m2->rows + m2_from); |
|
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3242 |
|
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3243 /* 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
|
3244 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
|
3245 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
|
3246 } |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3247 sync_p = 1; |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3248 } |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3249 else if (from_inside_window_p) |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3250 sync_p = 1; |
| 25012 | 3251 } |
|
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3252 |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3253 /* 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
|
3254 pointers are in sync with the frame matrix. */ |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3255 if (sync_p) |
|
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3256 sync_window_with_frame_matrix_rows (w); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3257 |
| 25012 | 3258 /* Check that no pointers are lost. */ |
| 3259 CHECK_MATRIX (m); | |
| 3260 } | |
| 3261 | |
| 3262 /* Next window on same level. */ | |
| 3263 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
| 3264 } | |
| 3265 } | |
| 3266 | |
| 3267 | |
| 3268 #if GLYPH_DEBUG | |
| 3269 | |
| 3270 /* Check that window and frame matrices agree about their | |
| 3271 understanding where glyphs of the rows are to find. For each | |
| 3272 window in the window tree rooted at W, check that rows in the | |
| 3273 matrices of leaf window agree with their frame matrices about | |
| 3274 glyph pointers. */ | |
| 314 | 3275 |
| 21514 | 3276 void |
| 25012 | 3277 check_window_matrix_pointers (w) |
| 314 | 3278 struct window *w; |
| 3279 { | |
| 25012 | 3280 while (w) |
| 3281 { | |
| 3282 if (!NILP (w->hchild)) | |
| 3283 check_window_matrix_pointers (XWINDOW (w->hchild)); | |
| 3284 else if (!NILP (w->vchild)) | |
| 3285 check_window_matrix_pointers (XWINDOW (w->vchild)); | |
| 3286 else | |
| 3287 { | |
| 3288 struct frame *f = XFRAME (w->frame); | |
| 3289 check_matrix_pointers (w->desired_matrix, f->desired_matrix); | |
| 3290 check_matrix_pointers (w->current_matrix, f->current_matrix); | |
| 3291 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3292 |
| 25012 | 3293 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
| 3294 } | |
| 3295 } | |
| 3296 | |
| 3297 | |
| 3298 /* Check that window rows are slices of frame rows. WINDOW_MATRIX is | |
| 3299 a window and FRAME_MATRIX is the corresponding frame matrix. For | |
| 3300 each row in WINDOW_MATRIX check that it's a slice of the | |
| 3301 corresponding frame row. If it isn't, abort. */ | |
| 3302 | |
| 3303 static void | |
| 3304 check_matrix_pointers (window_matrix, frame_matrix) | |
| 3305 struct glyph_matrix *window_matrix, *frame_matrix; | |
| 3306 { | |
| 3307 /* Row number in WINDOW_MATRIX. */ | |
| 3308 int i = 0; | |
| 3309 | |
| 3310 /* Row number corresponding to I in FRAME_MATRIX. */ | |
| 3311 int j = window_matrix->matrix_y; | |
| 3312 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3313 /* For all rows check that the row in the window matrix is a |
| 25012 | 3314 slice of the row in the frame matrix. If it isn't we didn't |
| 3315 mirror an operation on the frame matrix correctly. */ | |
| 3316 while (i < window_matrix->nrows) | |
| 3317 { | |
| 3318 if (!glyph_row_slice_p (window_matrix->rows + i, | |
| 3319 frame_matrix->rows + j)) | |
| 3320 abort (); | |
| 3321 ++i, ++j; | |
| 3322 } | |
| 3323 } | |
| 3324 | |
| 3325 #endif /* GLYPH_DEBUG != 0 */ | |
| 3326 | |
| 3327 | |
| 3328 | |
| 3329 /********************************************************************** | |
| 3330 VPOS and HPOS translations | |
| 3331 **********************************************************************/ | |
| 3332 | |
| 3333 #if GLYPH_DEBUG | |
| 3334 | |
| 3335 /* Translate vertical position VPOS which is relative to window W to a | |
| 3336 vertical position relative to W's frame. */ | |
| 3337 | |
| 3338 static int | |
| 3339 window_to_frame_vpos (w, vpos) | |
| 3340 struct window *w; | |
| 3341 int vpos; | |
| 3342 { | |
| 3343 struct frame *f = XFRAME (w->frame); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3344 |
| 25012 | 3345 xassert (!FRAME_WINDOW_P (f)); |
| 3346 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
|
3347 vpos += WINDOW_TOP_EDGE_LINE (w); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3348 xassert (vpos >= 0 && vpos <= FRAME_LINES (f)); |
| 25012 | 3349 return vpos; |
| 3350 } | |
| 3351 | |
| 3352 | |
| 3353 /* 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
|
3354 a horizontal position relative to W's frame. */ |
| 25012 | 3355 |
| 3356 static int | |
| 3357 window_to_frame_hpos (w, hpos) | |
| 3358 struct window *w; | |
| 3359 int hpos; | |
| 3360 { | |
|
65308
7b2a711dc863
(window_to_frame_hpos, update_window):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65016
diff
changeset
|
3361 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
|
3362 hpos += WINDOW_LEFT_EDGE_COL (w); |
| 25012 | 3363 return hpos; |
| 314 | 3364 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3365 |
| 25012 | 3366 #endif /* GLYPH_DEBUG */ |
| 3367 | |
| 3368 | |
| 314 | 3369 |
| 25012 | 3370 /********************************************************************** |
| 3371 Redrawing Frames | |
| 3372 **********************************************************************/ | |
| 3373 | |
| 3374 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
|
3375 doc: /* Clear frame FRAME and output again what is supposed to appear on it. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
3376 (frame) |
| 25012 | 3377 Lisp_Object frame; |
| 3378 { | |
| 3379 struct frame *f; | |
| 3380 | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
3381 CHECK_LIVE_FRAME (frame); |
| 25012 | 3382 f = XFRAME (frame); |
| 3383 | |
| 3384 /* Ignore redraw requests, if frame has no glyphs yet. | |
| 3385 (Implementation note: It still has to be checked why we are | |
| 3386 called so early here). */ | |
| 3387 if (!glyphs_initialized_initially_p) | |
| 3388 return Qnil; | |
| 3389 | |
| 3390 update_begin (f); | |
|
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3391 #ifdef MSDOS |
|
35445
9af454aee182
(Fredraw_frame): Remove reference to
Andrew Innes <andrewi@gnu.org>
parents:
35374
diff
changeset
|
3392 if (FRAME_MSDOS_P (f)) |
|
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
3393 set_terminal_modes (FRAME_TERMINAL (f)); |
|
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3394 #endif |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
3395 clear_frame (f); |
| 25012 | 3396 clear_current_matrices (f); |
| 3397 update_end (f); | |
|
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3398 if (FRAME_TERMCAP_P (f)) |
|
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3399 fflush (FRAME_TTY (f)->output); |
| 25012 | 3400 windows_or_buffers_changed++; |
| 3401 /* Mark all windows as inaccurate, so that every window will have | |
| 3402 its redisplay done. */ | |
| 3403 mark_window_display_accurate (FRAME_ROOT_WINDOW (f), 0); | |
| 3404 set_window_update_flags (XWINDOW (FRAME_ROOT_WINDOW (f)), 1); | |
| 3405 f->garbaged = 0; | |
| 3406 return Qnil; | |
| 3407 } | |
| 3408 | |
| 3409 | |
| 3410 /* Redraw frame F. This is nothing more than a call to the Lisp | |
| 3411 function redraw-frame. */ | |
| 3412 | |
| 3413 void | |
| 3414 redraw_frame (f) | |
| 3415 struct frame *f; | |
| 3416 { | |
| 3417 Lisp_Object frame; | |
| 3418 XSETFRAME (frame, f); | |
| 3419 Fredraw_frame (frame); | |
| 3420 } | |
| 3421 | |
| 3422 | |
| 3423 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
|
3424 doc: /* Clear and redisplay all visible frames. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
3425 () |
| 25012 | 3426 { |
| 3427 Lisp_Object tail, frame; | |
| 3428 | |
| 3429 FOR_EACH_FRAME (tail, frame) | |
| 3430 if (FRAME_VISIBLE_P (XFRAME (frame))) | |
| 3431 Fredraw_frame (frame); | |
| 3432 | |
| 3433 return Qnil; | |
| 3434 } | |
| 3435 | |
| 3436 | |
| 3437 /* This is used when frame_garbaged is set. Call Fredraw_frame on all | |
| 3438 visible frames marked as garbaged. */ | |
| 3439 | |
| 3440 void | |
| 3441 redraw_garbaged_frames () | |
| 3442 { | |
| 3443 Lisp_Object tail, frame; | |
| 3444 | |
| 3445 FOR_EACH_FRAME (tail, frame) | |
| 3446 if (FRAME_VISIBLE_P (XFRAME (frame)) | |
| 3447 && FRAME_GARBAGED_P (XFRAME (frame))) | |
| 3448 Fredraw_frame (frame); | |
| 3449 } | |
| 3450 | |
| 3451 | |
| 3452 | |
| 3453 /*********************************************************************** | |
| 3454 Direct Operations | |
| 3455 ***********************************************************************/ | |
| 3456 | |
| 3457 /* Try to update display and current glyph matrix directly. | |
| 3458 | |
| 3459 This function is called after a character G has been inserted into | |
| 3460 current_buffer. It tries to update the current glyph matrix and | |
| 3461 perform appropriate screen output to reflect the insertion. If it | |
| 3462 succeeds, the global flag redisplay_performed_directly_p will be | |
| 3463 set to 1, and thereby prevent the more costly general redisplay | |
| 3464 from running (see redisplay_internal). | |
| 3465 | |
| 3466 This function is not called for `hairy' character insertions. | |
| 3467 In particular, it is not called when after or before change | |
| 3468 functions exist, like they are used by font-lock. See keyboard.c | |
| 3469 for details where this function is called. */ | |
| 314 | 3470 |
| 3471 int | |
| 3472 direct_output_for_insert (g) | |
| 3473 int g; | |
| 3474 { | |
|
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3475 register struct frame *f = SELECTED_FRAME (); |
| 25012 | 3476 struct window *w = XWINDOW (selected_window); |
| 3477 struct it it, it2; | |
| 3478 struct glyph_row *glyph_row; | |
| 3479 struct glyph *glyphs, *glyph, *end; | |
| 3480 int n; | |
|
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Jan?k <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
3481 /* Non-null means that redisplay of W is based on window matrices. */ |
| 25012 | 3482 int window_redisplay_p = FRAME_WINDOW_P (f); |
| 3483 /* Non-null means we are in overwrite mode. */ | |
| 3484 int overwrite_p = !NILP (current_buffer->overwrite_mode); | |
| 3485 int added_width; | |
| 3486 struct text_pos pos; | |
| 3487 int delta, delta_bytes; | |
| 3488 | |
| 3489 /* Not done directly. */ | |
| 3490 redisplay_performed_directly_p = 0; | |
| 3491 | |
| 3492 /* Quickly give up for some common cases. */ | |
| 3493 if (cursor_in_echo_area | |
| 3494 /* Give up if fonts have changed. */ | |
| 3495 || fonts_changed_p | |
| 3496 /* Give up if face attributes have been changed. */ | |
| 3497 || face_change_count | |
| 3498 /* Give up if cursor position not really known. */ | |
| 314 | 3499 || !display_completed |
| 25012 | 3500 /* Give up if buffer appears in two places. */ |
| 314 | 3501 || buffer_shared > 1 |
|
34715
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3502 /* Give up if currently displaying a message instead of the |
|
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3503 minibuffer contents. */ |
|
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3504 || (EQ (selected_window, minibuf_window) |
|
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3505 && EQ (minibuf_window, echo_area_window)) |
| 25012 | 3506 /* Give up for hscrolled mini-buffer because display of the prompt |
| 3507 is handled specially there (see display_line). */ | |
| 3508 || (MINI_WINDOW_P (w) && XFASTINT (w->hscroll)) | |
| 3509 /* Give up if overwriting in the middle of a line. */ | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3510 || (overwrite_p |
|
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3511 && PT != ZV |
| 25012 | 3512 && FETCH_BYTE (PT) != '\n') |
| 3513 /* Give up for tabs and line ends. */ | |
| 3514 || g == '\t' | |
| 3515 || g == '\n' | |
| 3516 || g == '\r' | |
| 3517 /* Give up if unable to display the cursor in the window. */ | |
| 3518 || w->cursor.vpos < 0 | |
|
36279
1e3dc8692936
(direct_output_for_insert): Give up if we are showing
Gerd Moellmann <gerd@gnu.org>
parents:
36115
diff
changeset
|
3519 /* Give up if we are showing a message or just cleared the message |
|
1e3dc8692936
(direct_output_for_insert): Give up if we are showing
Gerd Moellmann <gerd@gnu.org>
parents:
36115
diff
changeset
|
3520 because we might need to resize the echo area window. */ |
|
1e3dc8692936
(direct_output_for_insert): Give up if we are showing
Gerd Moellmann <gerd@gnu.org>
parents:
36115
diff
changeset
|
3521 || !NILP (echo_area_buffer[0]) |
|
1e3dc8692936
(direct_output_for_insert): Give up if we are showing
Gerd Moellmann <gerd@gnu.org>
parents:
36115
diff
changeset
|
3522 || !NILP (echo_area_buffer[1]) |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3523 || (glyph_row = MATRIX_ROW (w->current_matrix, w->cursor.vpos), |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3524 /* Can't do it in a continued line because continuation |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3525 lines would change. */ |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3526 (glyph_row->continued_p |
|
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
3527 || glyph_row->exact_window_width_line_p |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3528 /* Can't use this method if the line overlaps others or is |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3529 overlapped by others because these other lines would |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3530 have to be redisplayed. */ |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3531 || glyph_row->overlapping_p |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3532 || glyph_row->overlapped_p)) |
| 25012 | 3533 /* Can't do it for partial width windows on terminal frames |
| 3534 because we can't clear to eol in such a window. */ | |
| 3535 || (!window_redisplay_p && !WINDOW_FULL_WIDTH_P (w))) | |
| 3536 return 0; | |
| 3537 | |
|
35374
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3538 /* If we can't insert glyphs, we can use this method only |
|
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3539 at the end of a line. */ |
|
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3540 if (!FRAME_CHAR_INS_DEL_OK (f)) |
|
35374
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3541 if (PT != ZV && FETCH_BYTE (PT_BYTE) != '\n') |
|
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3542 return 0; |
|
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3543 |
| 25012 | 3544 /* Set up a display iterator structure for W. Glyphs will be |
| 3545 produced in scratch_glyph_row. Current position is W's cursor | |
| 3546 position. */ | |
| 3547 clear_glyph_row (&scratch_glyph_row); | |
| 3548 SET_TEXT_POS (pos, PT, PT_BYTE); | |
|
28361
eccb57c44da5
(direct_output_for_insert): Use DEC_TEXT_POS
Gerd Moellmann <gerd@gnu.org>
parents:
27968
diff
changeset
|
3549 DEC_TEXT_POS (pos, !NILP (current_buffer->enable_multibyte_characters)); |
| 25012 | 3550 init_iterator (&it, w, CHARPOS (pos), BYTEPOS (pos), &scratch_glyph_row, |
| 3551 DEFAULT_FACE_ID); | |
| 3552 | |
| 3553 glyph_row = MATRIX_ROW (w->current_matrix, w->cursor.vpos); | |
|
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3554 if (glyph_row->mouse_face_p) |
|
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3555 return 0; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3556 |
| 25012 | 3557 /* Give up if highlighting trailing whitespace and we have trailing |
| 3558 whitespace in glyph_row. We would have to remove the trailing | |
| 3559 whitespace face in that case. */ | |
|
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3560 if (!NILP (Vshow_trailing_whitespace) |
| 25012 | 3561 && glyph_row->used[TEXT_AREA]) |
| 3562 { | |
| 3563 struct glyph *last; | |
| 3564 | |
| 3565 last = glyph_row->glyphs[TEXT_AREA] + glyph_row->used[TEXT_AREA] - 1; | |
| 3566 if (last->type == STRETCH_GLYPH | |
| 3567 || (last->type == CHAR_GLYPH | |
|
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
3568 && last->u.ch == ' ')) |
| 25012 | 3569 return 0; |
| 3570 } | |
| 3571 | |
| 3572 /* Give up if there are overlay strings at pos. This would fail | |
| 3573 if the overlay string has newlines in it. */ | |
| 3574 if (STRINGP (it.string)) | |
| 3575 return 0; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3576 |
| 25012 | 3577 it.hpos = w->cursor.hpos; |
| 3578 it.vpos = w->cursor.vpos; | |
| 3579 it.current_x = w->cursor.x + it.first_visible_x; | |
| 3580 it.current_y = w->cursor.y; | |
| 3581 it.end_charpos = PT; | |
| 3582 it.stop_charpos = min (PT, it.stop_charpos); | |
|
39226
d86fe98ee7d5
(direct_output_for_insert): Don't change IT's
Gerd Moellmann <gerd@gnu.org>
parents:
38988
diff
changeset
|
3583 it.stop_charpos = max (IT_CHARPOS (it), it.stop_charpos); |
| 25012 | 3584 |
| 3585 /* More than one display element may be returned for PT - 1 if | |
| 3586 (i) it's a control character which is translated into `\003' or | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3587 `^C', or (ii) it has a display table entry, or (iii) it's a |
| 25012 | 3588 combination of both. */ |
| 3589 delta = delta_bytes = 0; | |
| 3590 while (get_next_display_element (&it)) | |
| 3591 { | |
| 3592 PRODUCE_GLYPHS (&it); | |
| 3593 | |
| 3594 /* Give up if glyph doesn't fit completely on the line. */ | |
| 3595 if (it.current_x >= it.last_visible_x) | |
| 3596 return 0; | |
| 3597 | |
| 3598 /* Give up if new glyph has different ascent or descent than | |
| 3599 the original row, or if it is not a character glyph. */ | |
| 3600 if (glyph_row->ascent != it.ascent | |
| 3601 || glyph_row->height != it.ascent + it.descent | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3602 || glyph_row->phys_ascent != it.phys_ascent |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3603 || glyph_row->phys_height != it.phys_ascent + it.phys_descent |
| 25012 | 3604 || it.what != IT_CHARACTER) |
| 3605 return 0; | |
| 3606 | |
| 3607 delta += 1; | |
| 3608 delta_bytes += it.len; | |
|
32468
20788c8274cd
(direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents:
31932
diff
changeset
|
3609 set_iterator_to_next (&it, 1); |
| 25012 | 3610 } |
| 3611 | |
| 3612 /* Give up if we hit the right edge of the window. We would have | |
| 3613 to insert truncation or continuation glyphs. */ | |
| 3614 added_width = it.current_x - (w->cursor.x + it.first_visible_x); | |
| 3615 if (glyph_row->pixel_width + added_width >= it.last_visible_x) | |
| 314 | 3616 return 0; |
| 3617 | |
| 25012 | 3618 /* Give up if there is a \t following in the line. */ |
| 3619 it2 = it; | |
| 3620 it2.end_charpos = ZV; | |
| 3621 it2.stop_charpos = min (it2.stop_charpos, ZV); | |
| 3622 while (get_next_display_element (&it2) | |
| 3623 && !ITERATOR_AT_END_OF_LINE_P (&it2)) | |
| 3624 { | |
| 3625 if (it2.c == '\t') | |
| 3626 return 0; | |
|
32468
20788c8274cd
(direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents:
31932
diff
changeset
|
3627 set_iterator_to_next (&it2, 1); |
| 25012 | 3628 } |
| 3629 | |
| 3630 /* Number of new glyphs produced. */ | |
| 3631 n = it.glyph_row->used[TEXT_AREA]; | |
| 3632 | |
| 3633 /* Start and end of glyphs in original row. */ | |
| 3634 glyphs = glyph_row->glyphs[TEXT_AREA] + w->cursor.hpos; | |
| 3635 end = glyph_row->glyphs[1 + TEXT_AREA]; | |
| 3636 | |
| 3637 /* Make room for new glyphs, then insert them. */ | |
| 3638 xassert (end - glyphs - n >= 0); | |
|
25781
e5579bc77d9e
(direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents:
25735
diff
changeset
|
3639 safe_bcopy ((char *) glyphs, (char *) (glyphs + n), |
|
e5579bc77d9e
(direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents:
25735
diff
changeset
|
3640 (end - glyphs - n) * sizeof (*end)); |
| 25012 | 3641 bcopy (it.glyph_row->glyphs[TEXT_AREA], glyphs, n * sizeof *glyphs); |
| 3642 glyph_row->used[TEXT_AREA] = min (glyph_row->used[TEXT_AREA] + n, | |
| 3643 end - glyph_row->glyphs[TEXT_AREA]); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3644 |
| 25012 | 3645 /* Compute new line width. */ |
| 3646 glyph = glyph_row->glyphs[TEXT_AREA]; | |
| 3647 end = glyph + glyph_row->used[TEXT_AREA]; | |
| 3648 glyph_row->pixel_width = glyph_row->x; | |
| 3649 while (glyph < end) | |
| 3650 { | |
| 3651 glyph_row->pixel_width += glyph->pixel_width; | |
| 3652 ++glyph; | |
| 3653 } | |
| 3654 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3655 /* Increment buffer positions for glyphs following the newly |
| 25012 | 3656 inserted ones. */ |
| 3657 for (glyph = glyphs + n; glyph < end; ++glyph) | |
|
26546
0f43cc91d6a5
(direct_output_for_insert): Increment glyph positions
Gerd Moellmann <gerd@gnu.org>
parents:
26499
diff
changeset
|
3658 if (glyph->charpos > 0 && BUFFERP (glyph->object)) |
| 25012 | 3659 glyph->charpos += delta; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3660 |
| 25012 | 3661 if (MATRIX_ROW_END_CHARPOS (glyph_row) > 0) |
| 3662 { | |
| 3663 MATRIX_ROW_END_CHARPOS (glyph_row) += delta; | |
| 3664 MATRIX_ROW_END_BYTEPOS (glyph_row) += delta_bytes; | |
| 3665 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3666 |
| 25012 | 3667 /* Adjust positions in lines following the one we are in. */ |
|
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3668 increment_matrix_positions (w->current_matrix, |
|
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3669 w->cursor.vpos + 1, |
|
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3670 w->current_matrix->nrows, |
|
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3671 delta, delta_bytes); |
| 25012 | 3672 |
| 3673 glyph_row->contains_overlapping_glyphs_p | |
| 3674 |= it.glyph_row->contains_overlapping_glyphs_p; | |
| 3675 | |
|
26591
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3676 glyph_row->displays_text_p = 1; |
|
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3677 w->window_end_vpos = make_number (max (w->cursor.vpos, |
|
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3678 XFASTINT (w->window_end_vpos))); |
|
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3679 |
|
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3680 if (!NILP (Vshow_trailing_whitespace)) |
| 25012 | 3681 highlight_trailing_whitespace (it.f, glyph_row); |
| 3682 | |
| 3683 /* Write glyphs. If at end of row, we can simply call write_glyphs. | |
| 3684 In the middle, we have to insert glyphs. Note that this is now | |
| 3685 implemented for X frames. The implementation uses updated_window | |
| 3686 and updated_row. */ | |
| 3687 updated_row = glyph_row; | |
|
38988
53ae5a92e2fc
(direct_output_for_insert): Set updated_area
Gerd Moellmann <gerd@gnu.org>
parents:
38748
diff
changeset
|
3688 updated_area = TEXT_AREA; |
| 25012 | 3689 update_begin (f); |
|
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3690 if (FRAME_RIF (f)) |
| 25012 | 3691 { |
|
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3692 FRAME_RIF (f)->update_window_begin_hook (w); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3693 |
|
36115
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3694 if (glyphs == end - n |
|
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3695 /* In front of a space added by append_space. */ |
|
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3696 || (glyphs == end - n - 1 |
|
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3697 && (end - n)->charpos <= 0)) |
|
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3698 FRAME_RIF (f)->write_glyphs (glyphs, n); |
| 25012 | 3699 else |
|
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3700 FRAME_RIF (f)->insert_glyphs (glyphs, n); |
| 25012 | 3701 } |
| 3702 else | |
| 3703 { | |
| 3704 if (glyphs == end - n) | |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
3705 write_glyphs (f, glyphs, n); |
| 25012 | 3706 else |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
3707 insert_glyphs (f, glyphs, n); |
| 25012 | 3708 } |
| 3709 | |
| 3710 w->cursor.hpos += n; | |
| 3711 w->cursor.x = it.current_x - it.first_visible_x; | |
| 3712 xassert (w->cursor.hpos >= 0 | |
| 3713 && w->cursor.hpos < w->desired_matrix->matrix_w); | |
| 3714 | |
| 3715 /* How to set the cursor differs depending on whether we are | |
| 3716 using a frame matrix or a window matrix. Note that when | |
| 3717 a frame matrix is used, cursor_to expects frame coordinates, | |
| 3718 and the X and Y parameters are not used. */ | |
| 3719 if (window_redisplay_p) | |
|
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3720 FRAME_RIF (f)->cursor_to (w->cursor.vpos, w->cursor.hpos, |
|
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3721 w->cursor.y, w->cursor.x); |
| 25012 | 3722 else |
| 3723 { | |
| 3724 int x, y; | |
| 3725 x = (WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos) | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3726 + (INTEGERP (w->left_margin_cols) |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3727 ? XFASTINT (w->left_margin_cols) |
| 25012 | 3728 : 0)); |
| 3729 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
3730 cursor_to (f, y, x); |
| 25012 | 3731 } |
| 3732 | |
|
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
3733 #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
|
3734 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
|
3735 #endif |
|
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
3736 |
|
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3737 if (FRAME_RIF (f)) |
|
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3738 FRAME_RIF (f)->update_window_end_hook (w, 1, 0); |
| 25012 | 3739 update_end (f); |
| 3740 updated_row = NULL; | |
|
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3741 if (FRAME_TERMCAP_P (f)) |
|
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3742 fflush (FRAME_TTY (f)->output); |
| 25012 | 3743 |
| 3744 TRACE ((stderr, "direct output for insert\n")); | |
|
44260
64c67a3eebb2
(direct_output_for_insert): Call
Gerd Moellmann <gerd@gnu.org>
parents:
43729
diff
changeset
|
3745 mark_window_display_accurate (it.window, 1); |
| 25012 | 3746 redisplay_performed_directly_p = 1; |
| 314 | 3747 return 1; |
| 3748 } | |
| 3749 | |
| 25012 | 3750 |
| 3751 /* Perform a direct display update for moving PT by N positions | |
| 3752 left or right. N < 0 means a movement backwards. This function | |
| 3753 is currently only called for N == 1 or N == -1. */ | |
| 3754 | |
| 314 | 3755 int |
| 3756 direct_output_forward_char (n) | |
| 3757 int n; | |
| 3758 { | |
|
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3759 struct frame *f = SELECTED_FRAME (); |
| 25012 | 3760 struct window *w = XWINDOW (selected_window); |
| 3761 struct glyph_row *row; | |
| 3762 | |
|
26851
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3763 /* Give up if point moved out of or into a composition. */ |
|
28507
b6f06a755c7d
make_number/XINT/XUINT conversions; EQ/== fixes; ==Qnil -> NILP
Ken Raeburn <raeburn@raeburn.org>
parents:
28361
diff
changeset
|
3764 if (check_point_in_composition (current_buffer, XINT (w->last_point), |
|
26851
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3765 current_buffer, PT)) |
|
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3766 return 0; |
|
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3767 |
| 25012 | 3768 /* Give up if face attributes have been changed. */ |
| 3769 if (face_change_count) | |
|
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
3770 return 0; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3771 |
|
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3772 /* Give up if current matrix is not up to date or we are |
| 25012 | 3773 displaying a message. */ |
| 3774 if (!display_completed || cursor_in_echo_area) | |
| 3775 return 0; | |
| 3776 | |
| 3777 /* Give up if the buffer's direction is reversed. */ | |
| 3778 if (!NILP (XBUFFER (w->buffer)->direction_reversed)) | |
| 314 | 3779 return 0; |
|
11096
cac0367b1794
(direct_output_forward_char): Don't use direct output at an overlay boundary.
Karl Heuer <kwzh@gnu.org>
parents:
10770
diff
changeset
|
3780 |
|
2794
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3781 /* Can't use direct output if highlighting a region. */ |
|
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3782 if (!NILP (Vtransient_mark_mode) && !NILP (current_buffer->mark_active)) |
|
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3783 return 0; |
|
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3784 |
|
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3785 /* Can't use direct output if highlighting trailing whitespace. */ |
|
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3786 if (!NILP (Vshow_trailing_whitespace)) |
|
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3787 return 0; |
|
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3788 |
|
25735
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3789 /* Give up if we are showing a message or just cleared the message |
|
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3790 because we might need to resize the echo area window. */ |
|
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3791 if (!NILP (echo_area_buffer[0]) || !NILP (echo_area_buffer[1])) |
|
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3792 return 0; |
|
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3793 |
|
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3794 /* Give up if currently displaying a message instead of the |
|
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3795 minibuffer contents. */ |
|
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3796 if (XWINDOW (minibuf_window) == w |
|
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3797 && EQ (minibuf_window, echo_area_window)) |
|
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3798 return 0; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3799 |
|
25735
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3800 /* Give up if we don't know where the cursor is. */ |
|
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3801 if (w->cursor.vpos < 0) |
|
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3802 return 0; |
|
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3803 |
| 25012 | 3804 row = MATRIX_ROW (w->current_matrix, w->cursor.vpos); |
| 3805 | |
|
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
3806 /* Give up if PT is outside of the last known cursor row. */ |
|
41069
818a84568f83
(direct_output_forward_char): Fix character/byte
Gerd Moellmann <gerd@gnu.org>
parents:
41025
diff
changeset
|
3807 if (PT <= MATRIX_ROW_START_CHARPOS (row) |
|
818a84568f83
(direct_output_forward_char): Fix character/byte
Gerd Moellmann <gerd@gnu.org>
parents:
41025
diff
changeset
|
3808 || PT >= MATRIX_ROW_END_CHARPOS (row)) |
|
6069
07045ca8ff19
(direct_output_forward_char): Use Fget_char_property to test for invisibility.
Karl Heuer <kwzh@gnu.org>
parents:
6068
diff
changeset
|
3809 return 0; |
|
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
3810 |
| 25012 | 3811 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3812 |
| 25012 | 3813 w->last_cursor = w->cursor; |
|
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15896
diff
changeset
|
3814 XSETFASTINT (w->last_point, PT); |
| 25012 | 3815 |
| 3816 xassert (w->cursor.hpos >= 0 | |
| 3817 && w->cursor.hpos < w->desired_matrix->matrix_w); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3818 |
| 25012 | 3819 if (FRAME_WINDOW_P (f)) |
|
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3820 FRAME_RIF (f)->cursor_to (w->cursor.vpos, w->cursor.hpos, |
|
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3821 w->cursor.y, w->cursor.x); |
| 25012 | 3822 else |
| 3823 { | |
| 3824 int x, y; | |
| 3825 x = (WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos) | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3826 + (INTEGERP (w->left_margin_cols) |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3827 ? XFASTINT (w->left_margin_cols) |
| 25012 | 3828 : 0)); |
| 3829 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
3830 cursor_to (f, y, x); |
| 25012 | 3831 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3832 |
|
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3833 if (FRAME_TERMCAP_P (f)) |
|
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3834 fflush (FRAME_TTY (f)->output); |
| 25012 | 3835 redisplay_performed_directly_p = 1; |
| 314 | 3836 return 1; |
| 3837 } | |
| 25012 | 3838 |
| 3839 | |
| 314 | 3840 |
| 25012 | 3841 /*********************************************************************** |
| 3842 Frame Update | |
| 3843 ***********************************************************************/ | |
| 3844 | |
| 3845 /* Update frame F based on the data in desired matrices. | |
| 3846 | |
| 3847 If FORCE_P is non-zero, don't let redisplay be stopped by detecting | |
| 3848 pending input. If INHIBIT_HAIRY_ID_P is non-zero, don't try | |
| 3849 scrolling. | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3850 |
| 25012 | 3851 Value is non-zero if redisplay was stopped due to pending input. */ |
| 314 | 3852 |
| 3853 int | |
| 25012 | 3854 update_frame (f, force_p, inhibit_hairy_id_p) |
| 3855 struct frame *f; | |
| 3856 int force_p; | |
| 3857 int inhibit_hairy_id_p; | |
| 3858 { | |
| 3859 /* 1 means display has been paused because of pending input. */ | |
| 3860 int paused_p; | |
| 3861 struct window *root_window = XWINDOW (f->root_window); | |
| 3862 | |
|
76065
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
3863 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
|
3864 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
|
3865 #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
|
3866 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
|
3867 force_p = 1; |
|
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
3868 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
|
3869 { |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3870 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
|
3871 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
|
3872 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
|
3873 |
|
71378
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3874 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
|
3875 { |
|
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3876 paused_p = 1; |
|
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3877 goto do_pause; |
|
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3878 } |
|
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3879 |
|
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3880 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
|
3881 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
|
3882 |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3883 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
|
3884 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
|
3885 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
|
3886 } |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3887 #endif |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
3888 |
| 25012 | 3889 if (FRAME_WINDOW_P (f)) |
| 3890 { | |
| 3891 /* We are working on window matrix basis. All windows whose | |
| 3892 flag must_be_updated_p is set have to be updated. */ | |
| 3893 | |
| 3894 /* Record that we are not working on frame matrices. */ | |
| 3895 set_frame_matrix_frame (NULL); | |
| 3896 | |
| 3897 /* Update all windows in the window tree of F, maybe stopping | |
| 3898 when pending input is detected. */ | |
| 3899 update_begin (f); | |
| 3900 | |
| 3901 /* Update the menu bar on X frames that don't have toolkit | |
| 3902 support. */ | |
| 3903 if (WINDOWP (f->menu_bar_window)) | |
| 3904 update_window (XWINDOW (f->menu_bar_window), 1); | |
| 3905 | |
| 3906 /* 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
|
3907 if (WINDOWP (f->tool_bar_window)) |
| 25012 | 3908 { |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3909 struct window *w = XWINDOW (f->tool_bar_window); |
| 25012 | 3910 |
| 3911 /* Update tool-bar window. */ | |
| 3912 if (w->must_be_updated_p) | |
| 3913 { | |
|
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
|
3914 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
|
3915 |
| 25012 | 3916 update_window (w, 1); |
| 3917 w->must_be_updated_p = 0; | |
| 3918 | |
| 3919 /* Swap tool-bar strings. We swap because we want to | |
| 3920 reuse strings. */ | |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3921 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
|
3922 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
|
3923 f->desired_tool_bar_string = tem; |
| 25012 | 3924 } |
| 3925 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3926 |
| 25012 | 3927 |
| 3928 /* Update windows. */ | |
| 3929 paused_p = update_window_tree (root_window, force_p); | |
| 3930 update_end (f); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3931 |
|
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3932 /* This flush is a performance bottleneck under X, |
| 83037 | 3933 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
|
3934 It is necessary when resizing the window with the mouse, or |
| 83037 | 3935 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
|
3936 if (f->force_flush_display_p) |
| 83037 | 3937 { |
| 3938 FRAME_RIF (f)->flush_display (f); | |
| 3939 f->force_flush_display_p = 0; | |
| 3940 } | |
| 25012 | 3941 } |
| 3942 else | |
| 3943 { | |
| 3944 /* We are working on frame matrix basis. Set the frame on whose | |
| 3945 frame matrix we operate. */ | |
| 3946 set_frame_matrix_frame (f); | |
| 3947 | |
|
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3948 /* Build F's desired matrix from window matrices. */ |
| 25012 | 3949 build_frame_matrix (f); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3950 |
|
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3951 /* Update the display */ |
|
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3952 update_begin (f); |
| 25012 | 3953 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
|
3954 update_end (f); |
|
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3955 |
|
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3956 if (FRAME_TERMCAP_P (f)) |
|
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3957 { |
|
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3958 if (FRAME_TTY (f)->termscript) |
|
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3959 fflush (FRAME_TTY (f)->termscript); |
|
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
3960 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
|
3961 } |
|
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3962 |
| 25012 | 3963 /* 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
|
3964 #if GLYPH_DEBUG |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3965 check_window_matrix_pointers (root_window); |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3966 add_frame_display_history (f, paused_p); |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3967 #endif |
| 25012 | 3968 } |
| 3969 | |
|
71378
1b442e9d8373
(update_frame): Check for input pending on entry.
Kim F. Storm <storm@cua.dk>
parents:
71333
diff
changeset
|
3970 do_pause: |
| 25012 | 3971 /* Reset flags indicating that a window should be updated. */ |
| 3972 set_window_update_flags (root_window, 0); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3973 |
|
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3974 display_completed = !paused_p; |
| 25012 | 3975 return paused_p; |
| 3976 } | |
| 3977 | |
| 3978 | |
| 3979 | |
| 3980 /************************************************************************ | |
| 3981 Window-based updates | |
| 3982 ************************************************************************/ | |
| 3983 | |
| 3984 /* Perform updates in window tree rooted at W. FORCE_P non-zero means | |
| 3985 don't stop updating when input is pending. */ | |
| 3986 | |
| 3987 static int | |
| 3988 update_window_tree (w, force_p) | |
| 3989 struct window *w; | |
| 3990 int force_p; | |
| 3991 { | |
| 3992 int paused_p = 0; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3993 |
| 25012 | 3994 while (w && !paused_p) |
| 3995 { | |
| 3996 if (!NILP (w->hchild)) | |
| 3997 paused_p |= update_window_tree (XWINDOW (w->hchild), force_p); | |
| 3998 else if (!NILP (w->vchild)) | |
| 3999 paused_p |= update_window_tree (XWINDOW (w->vchild), force_p); | |
| 4000 else if (w->must_be_updated_p) | |
| 4001 paused_p |= update_window (w, force_p); | |
| 4002 | |
| 4003 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
| 4004 } | |
| 4005 | |
| 4006 return paused_p; | |
| 4007 } | |
| 4008 | |
| 4009 | |
| 4010 /* Update window W if its flag must_be_updated_p is non-zero. If | |
| 4011 FORCE_P is non-zero, don't stop updating if input is pending. */ | |
| 4012 | |
| 4013 void | |
| 4014 update_single_window (w, force_p) | |
| 4015 struct window *w; | |
| 4016 int force_p; | |
| 4017 { | |
| 4018 if (w->must_be_updated_p) | |
| 4019 { | |
| 4020 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
| 4021 | |
| 4022 /* Record that this is not a frame-based redisplay. */ | |
| 4023 set_frame_matrix_frame (NULL); | |
| 4024 | |
|
76065
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
4025 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
|
4026 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
|
4027 #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
|
4028 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
|
4029 force_p = 1; |
|
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
4030 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
|
4031 { |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4032 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
|
4033 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
|
4034 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
|
4035 |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4036 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
|
4037 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
|
4038 |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4039 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
|
4040 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
|
4041 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
|
4042 } |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4043 #endif |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4044 |
| 25012 | 4045 /* Update W. */ |
| 4046 update_begin (f); | |
| 4047 update_window (w, force_p); | |
| 4048 update_end (f); | |
| 4049 | |
| 4050 /* Reset flag in W. */ | |
| 4051 w->must_be_updated_p = 0; | |
| 4052 } | |
| 4053 } | |
| 4054 | |
|
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
4055 #ifdef HAVE_WINDOW_SYSTEM |
| 25012 | 4056 |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4057 /* 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
|
4058 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
|
4059 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4060 static void |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4061 redraw_overlapped_rows (w, yb) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4062 struct window *w; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4063 int yb; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4064 { |
|
30165
d7ec5b3caccc
(redraw_overlapped_rows): Add missing local.
Gerd Moellmann <gerd@gnu.org>
parents:
30161
diff
changeset
|
4065 int i; |
|
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4066 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4067 |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4068 /* 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
|
4069 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
|
4070 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
|
4071 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
|
4072 current rows is 0. */ |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4073 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
|
4074 { |
|
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4075 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
|
4076 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4077 if (!row->enabled_p) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4078 break; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4079 else if (row->mode_line_p) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4080 continue; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4081 |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4082 if (row->overlapped_p) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4083 { |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4084 enum glyph_row_area area; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4085 |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4086 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
|
4087 { |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4088 updated_row = row; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4089 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
|
4090 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
|
4091 area == TEXT_AREA ? row->x : 0); |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4092 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
|
4093 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
|
4094 row->used[area]); |
|
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4095 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
|
4096 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4097 |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4098 row->overlapped_p = 0; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4099 } |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4100 |
|
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4101 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
|
4102 break; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4103 } |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4104 } |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4105 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4106 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4107 /* 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
|
4108 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
|
4109 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4110 static void |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4111 redraw_overlapping_rows (w, yb) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4112 struct window *w; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4113 int yb; |
|
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 int i, bottom_y; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4116 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
|
4117 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4118 |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4119 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
|
4120 { |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4121 row = w->current_matrix->rows + i; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4122 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4123 if (!row->enabled_p) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4124 break; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4125 else if (row->mode_line_p) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4126 continue; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4127 |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4128 bottom_y = MATRIX_ROW_BOTTOM_Y (row); |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4129 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4130 if (row->overlapping_p && i > 0 && bottom_y < yb) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4131 { |
|
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
|
4132 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
|
4133 |
|
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4134 if (MATRIX_ROW_OVERLAPS_PRED_P (row) |
|
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4135 && !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
|
4136 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
|
4137 if (MATRIX_ROW_OVERLAPS_SUCC_P (row) |
|
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4138 && !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
|
4139 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
|
4140 |
|
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4141 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
|
4142 { |
|
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4143 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
|
4144 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
|
4145 |
|
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4146 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
|
4147 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
|
4148 |
|
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4149 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
|
4150 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
|
4151 |
|
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4152 /* 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
|
4153 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
|
4154 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
|
4155 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
|
4156 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
|
4157 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
|
4158 } |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4159 } |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4160 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4161 if (bottom_y >= yb) |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4162 break; |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4163 } |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4164 } |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4165 |
|
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
4166 #endif /* HAVE_WINDOW_SYSTEM */ |
|
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
4167 |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4168 |
|
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4169 #ifdef GLYPH_DEBUG |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4170 |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4171 /* 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
|
4172 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
|
4173 |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4174 void |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4175 check_current_matrix_flags (w) |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4176 struct window *w; |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4177 { |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4178 int last_seen_p = 0; |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4179 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
|
4180 |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4181 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
|
4182 { |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4183 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
|
4184 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
|
4185 last_seen_p = 1; |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4186 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
|
4187 abort (); |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4188 } |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4189 } |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4190 |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4191 #endif /* GLYPH_DEBUG */ |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4192 |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4193 |
| 25012 | 4194 /* Update display of window W. FORCE_P non-zero means that we should |
| 4195 not stop when detecting pending input. */ | |
| 4196 | |
| 4197 static int | |
| 4198 update_window (w, force_p) | |
| 4199 struct window *w; | |
| 4200 int force_p; | |
| 4201 { | |
| 4202 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
| 4203 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
|
4204 #if !PERIODIC_PREEMPTION_CHECKING |
| 25012 | 4205 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
|
4206 #endif |
| 25012 | 4207 extern int input_pending; |
|
34517
7c8d2cec3d08
(update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents:
34279
diff
changeset
|
4208 extern Lisp_Object do_mouse_tracking; |
|
83241
3dcba0bc766b
Merged in changes from CVS trunk. (Long time no see!) :-)
Karoly Lorentey <lorentey@elte.hu>
diff
changeset
|
4209 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
|
4210 #if GLYPH_DEBUG |
| 25012 | 4211 /* 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
|
4212 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
|
4213 #endif |
| 25012 | 4214 |
| 4215 /* 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
|
4216 #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
|
4217 if (!force_p) |
|
59580
f43d0816e9c3
* keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
58986
diff
changeset
|
4218 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
|
4219 #endif |
| 25012 | 4220 |
| 4221 /* If forced to complete the update, or if no input is pending, do | |
| 4222 the update. */ | |
|
34517
7c8d2cec3d08
(update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents:
34279
diff
changeset
|
4223 if (force_p || !input_pending || !NILP (do_mouse_tracking)) |
| 25012 | 4224 { |
| 4225 struct glyph_row *row, *end; | |
| 4226 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
|
4227 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
|
4228 int yb, changed_p = 0, mouse_face_overwritten_p = 0, n_updated; |
| 25012 | 4229 |
| 4230 rif->update_window_begin_hook (w); | |
| 4231 yb = window_text_bottom_y (w); | |
| 4232 | |
|
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
|
4233 /* 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
|
4234 Adjust y-positions of other rows by the header line height. */ |
| 25012 | 4235 row = desired_matrix->rows; |
| 4236 end = row + desired_matrix->nrows - 1; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4237 |
| 25012 | 4238 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
|
4239 { |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4240 header_line_row = row; |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4241 ++row; |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4242 } |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4243 else |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4244 header_line_row = NULL; |
| 25012 | 4245 |
| 4246 /* Update the mode line, if necessary. */ | |
| 4247 mode_line_row = MATRIX_MODE_LINE_ROW (desired_matrix); | |
| 4248 if (mode_line_row->mode_line_p && mode_line_row->enabled_p) | |
| 4249 { | |
| 4250 mode_line_row->y = yb; | |
| 4251 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
|
4252 desired_matrix), |
|
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4253 &mouse_face_overwritten_p); |
| 25012 | 4254 } |
| 4255 | |
| 4256 /* Find first enabled row. Optimizations in redisplay_internal | |
| 4257 may lead to an update with only one row enabled. There may | |
| 4258 be also completely empty matrices. */ | |
| 4259 while (row < end && !row->enabled_p) | |
| 4260 ++row; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4261 |
|
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4262 /* Try reusing part of the display by copying. */ |
| 25012 | 4263 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
|
4264 { |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4265 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
|
4266 if (rc < 0) |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4267 { |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4268 /* 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
|
4269 paused_p = 0; |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4270 goto set_cursor; |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4271 } |
|
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4272 else if (rc > 0) |
|
54847
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4273 { |
|
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4274 /* We've scrolled the display. */ |
|
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4275 force_p = 1; |
|
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4276 changed_p = 1; |
|
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4277 } |
|
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4278 } |
| 25012 | 4279 |
| 4280 /* 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
|
4281 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
|
4282 if (row->enabled_p) |
| 25012 | 4283 { |
| 4284 int vpos = MATRIX_ROW_VPOS (row, desired_matrix); | |
| 4285 int i; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4286 |
|
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
|
4287 /* We'll have to play a little bit with when to |
| 25012 | 4288 detect_input_pending. If it's done too often, |
| 4289 scrolling large windows with repeated scroll-up | |
| 4290 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
|
4291 #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
|
4292 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
|
4293 { |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4294 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
|
4295 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
|
4296 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
|
4297 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
|
4298 { |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4299 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
|
4300 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
|
4301 break; |
|
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4302 } |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4303 } |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
4304 #else |
|
34622
877ed6cab304
(update_window): Detect pending input every nth line
Gerd Moellmann <gerd@gnu.org>
parents:
34517
diff
changeset
|
4305 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
|
4306 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
|
4307 #endif |
|
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4308 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
|
4309 &mouse_face_overwritten_p); |
| 25012 | 4310 |
| 4311 /* Mark all rows below the last visible one in the current | |
| 4312 matrix as invalid. This is necessary because of | |
| 4313 variable line heights. Consider the case of three | |
| 4314 successive redisplays, where the first displays 5 | |
| 4315 lines, the second 3 lines, and the third 5 lines again. | |
| 4316 If the second redisplay wouldn't mark rows in the | |
| 4317 current matrix invalid, the third redisplay might be | |
| 4318 tempted to optimize redisplay based on lines displayed | |
| 4319 in the first redisplay. */ | |
| 4320 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) | |
| 4321 for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i) | |
| 4322 MATRIX_ROW (w->current_matrix, i)->enabled_p = 0; | |
| 4323 } | |
| 4324 | |
| 4325 /* Was display preempted? */ | |
| 4326 paused_p = row < end; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4327 |
|
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4328 set_cursor: |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4329 |
|
54176
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4330 /* 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
|
4331 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
|
4332 that can be scrolled. */ |
|
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4333 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
|
4334 { |
|
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4335 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
|
4336 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
|
4337 } |
|
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4338 |
|
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
|
4339 /* Fix the appearance of overlapping/overlapped rows. */ |
| 25012 | 4340 if (!paused_p && !w->pseudo_window_p) |
| 4341 { | |
|
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
4342 #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
|
4343 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
|
4344 { |
|
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4345 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
|
4346 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
|
4347 } |
|
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
4348 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4349 |
| 25012 | 4350 /* Make cursor visible at cursor position of W. */ |
| 4351 set_window_cursor_after_update (w); | |
| 4352 | |
|
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4353 #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
|
4354 for debugging only. See the comment of check_matrix_invariants. */ |
| 25012 | 4355 IF_DEBUG (check_matrix_invariants (w)); |
| 4356 #endif | |
| 4357 } | |
| 4358 | |
| 4359 #if GLYPH_DEBUG | |
| 4360 /* Remember the redisplay method used to display the matrix. */ | |
| 4361 strcpy (w->current_matrix->method, w->desired_matrix->method); | |
| 4362 #endif | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4363 |
|
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
4364 #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
|
4365 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
|
4366 #endif |
|
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4367 |
|
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4368 /* 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
|
4369 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
|
4370 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
|
4371 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
|
4372 rif->update_window_end_hook (w, !paused_p, mouse_face_overwritten_p); |
| 25012 | 4373 } |
| 4374 else | |
| 4375 paused_p = 1; | |
| 4376 | |
|
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
4377 #if GLYPH_DEBUG |
|
34944
4fc804373f2a
(update_window): Don't check_current_matrix_flags.
Gerd Moellmann <gerd@gnu.org>
parents:
34929
diff
changeset
|
4378 /* check_current_matrix_flags (w); */ |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
4379 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
|
4380 #endif |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4381 |
| 25012 | 4382 clear_glyph_matrix (desired_matrix); |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4383 |
| 25012 | 4384 return paused_p; |
| 4385 } | |
| 4386 | |
| 4387 | |
| 4388 /* Update the display of area AREA in window W, row number VPOS. | |
| 4389 AREA can be either LEFT_MARGIN_AREA or RIGHT_MARGIN_AREA. */ | |
| 4390 | |
| 4391 static void | |
| 4392 update_marginal_area (w, area, vpos) | |
| 4393 struct window *w; | |
| 4394 int area, vpos; | |
| 4395 { | |
| 4396 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
|
4397 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
| 25012 | 4398 |
| 4399 /* Let functions in xterm.c know what area subsequent X positions | |
| 4400 will be relative to. */ | |
| 4401 updated_area = area; | |
| 4402 | |
| 4403 /* Set cursor to start of glyphs, write them, and clear to the end | |
| 4404 of the area. I don't think that something more sophisticated is | |
| 4405 necessary here, since marginal areas will not be the default. */ | |
| 4406 rif->cursor_to (vpos, 0, desired_row->y, 0); | |
| 4407 if (desired_row->used[area]) | |
| 4408 rif->write_glyphs (desired_row->glyphs[area], desired_row->used[area]); | |
| 4409 rif->clear_end_of_line (-1); | |
| 4410 } | |
| 4411 | |
| 4412 | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4413 /* 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
|
4414 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
|
4415 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4416 static int |
| 25012 | 4417 update_text_area (w, vpos) |
| 4418 struct window *w; | |
| 4419 int vpos; | |
| 314 | 4420 { |
| 25012 | 4421 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); |
| 4422 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
|
4423 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
|
4424 int changed_p = 0; |
| 25012 | 4425 |
| 4426 /* Let functions in xterm.c know what area subsequent X positions | |
| 4427 will be relative to. */ | |
| 4428 updated_area = TEXT_AREA; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4429 |
| 25012 | 4430 /* If rows are at different X or Y, or rows have different height, |
| 4431 or the current row is marked invalid, write the entire line. */ | |
| 4432 if (!current_row->enabled_p | |
| 4433 || desired_row->y != current_row->y | |
| 4434 || desired_row->ascent != current_row->ascent | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4435 || 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
|
4436 || desired_row->phys_height != current_row->phys_height |
| 25012 | 4437 || 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
|
4438 || 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
|
4439 /* 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
|
4440 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
|
4441 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
|
4442 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
|
4443 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
|
4444 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
|
4445 || (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
|
4446 && !(current_row->mode_line_p && vpos > 0)) |
| 25012 | 4447 || current_row->x != desired_row->x) |
| 4448 { | |
| 4449 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
|
4450 |
| 25012 | 4451 if (desired_row->used[TEXT_AREA]) |
| 4452 rif->write_glyphs (desired_row->glyphs[TEXT_AREA], | |
| 4453 desired_row->used[TEXT_AREA]); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4454 |
| 25012 | 4455 /* Clear to end of window. */ |
| 4456 rif->clear_end_of_line (-1); | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4457 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
|
4458 |
|
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4459 /* 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
|
4460 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
|
4461 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
|
4462 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
|
4463 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
|
4464 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
|
4465 redisplay. */ |
|
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4466 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
|
4467 w->phys_cursor_on_p = 0; |
| 25012 | 4468 } |
| 4469 else | |
| 4470 { | |
| 4471 int stop, i, x; | |
| 4472 struct glyph *current_glyph = current_row->glyphs[TEXT_AREA]; | |
| 4473 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
|
4474 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
|
4475 int desired_stop_pos = desired_row->used[TEXT_AREA]; |
|
d93bf580d166
(update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents:
35006
diff
changeset
|
4476 |
|
69110
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4477 /* 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
|
4478 unless the current row also does so at the same position, |
| 25012 | 4479 make sure we write at least one glyph, so that the face |
| 4480 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
|
4481 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
|
4482 && (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
|
4483 || (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
|
4484 && !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
|
4485 --desired_stop_pos; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4486 |
| 25012 | 4487 stop = min (current_row->used[TEXT_AREA], desired_stop_pos); |
| 4488 i = 0; | |
| 4489 x = desired_row->x; | |
|
36097
1dfaaf6d6166
(update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents:
35924
diff
changeset
|
4490 |
|
1dfaaf6d6166
(update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents:
35924
diff
changeset
|
4491 /* 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
|
4492 in common. */ |
| 25012 | 4493 while (i < stop) |
| 4494 { | |
|
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4495 int can_skip_p = 1; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4496 |
| 25012 | 4497 /* 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
|
4498 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
|
4499 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
|
4500 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
|
4501 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
|
4502 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
|
4503 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
|
4504 `f' on the screen. */ |
|
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4505 if (overlapping_glyphs_p && i > 0) |
| 25012 | 4506 { |
|
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4507 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
|
4508 int left, right; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4509 |
|
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4510 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
|
4511 &left, &right); |
|
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4512 can_skip_p = right == 0; |
| 25012 | 4513 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4514 |
|
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4515 if (can_skip_p) |
| 25012 | 4516 { |
|
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4517 while (i < stop |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4518 && GLYPH_EQUAL_P (desired_glyph, current_glyph)) |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4519 { |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4520 x += desired_glyph->pixel_width; |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4521 ++desired_glyph, ++current_glyph, ++i; |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4522 } |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4523 |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4524 /* 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
|
4525 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
|
4526 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
|
4527 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
|
4528 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
|
4529 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
|
4530 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
|
4531 taken care of by draw_glyphs. */ |
|
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4532 if (overlapping_glyphs_p |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4533 && i > 0 |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4534 && i < current_row->used[TEXT_AREA] |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4535 && (current_row->used[TEXT_AREA] |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4536 != desired_row->used[TEXT_AREA])) |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4537 { |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4538 int left, right; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4539 |
|
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4540 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
|
4541 &left, &right); |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4542 while (left > 0 && i > 0) |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4543 { |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4544 --i, --desired_glyph, --current_glyph; |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4545 x -= desired_glyph->pixel_width; |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4546 left -= desired_glyph->pixel_width; |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4547 } |
| 25012 | 4548 } |
| 4549 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4550 |
| 25012 | 4551 /* Try to avoid writing the entire rest of the desired row |
| 4552 by looking for a resync point. This mainly prevents | |
| 4553 mode line flickering in the case the mode line is in | |
| 4554 fixed-pitch font, which it usually will be. */ | |
| 4555 if (i < desired_row->used[TEXT_AREA]) | |
| 4556 { | |
| 4557 int start_x = x, start_hpos = i; | |
| 4558 struct glyph *start = desired_glyph; | |
| 4559 int current_x = x; | |
|
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4560 int skip_first_p = !can_skip_p; |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4561 |
| 25012 | 4562 /* Find the next glyph that's equal again. */ |
| 4563 while (i < stop | |
|
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4564 && (skip_first_p |
|
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4565 || !GLYPH_EQUAL_P (desired_glyph, current_glyph)) |
| 25012 | 4566 && x == current_x) |
| 4567 { | |
| 4568 x += desired_glyph->pixel_width; | |
| 4569 current_x += current_glyph->pixel_width; | |
| 4570 ++desired_glyph, ++current_glyph, ++i; | |
|
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4571 skip_first_p = 0; |
| 25012 | 4572 } |
| 4573 | |
| 4574 if (i == start_hpos || x != current_x) | |
| 4575 { | |
| 4576 i = start_hpos; | |
| 4577 x = start_x; | |
| 4578 desired_glyph = start; | |
| 4579 break; | |
| 4580 } | |
|
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4581 |
| 25012 | 4582 rif->cursor_to (vpos, start_hpos, desired_row->y, start_x); |
| 4583 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
|
4584 changed_p = 1; |
| 25012 | 4585 } |
| 4586 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4587 |
| 25012 | 4588 /* Write the rest. */ |
| 4589 if (i < desired_row->used[TEXT_AREA]) | |
| 4590 { | |
| 4591 rif->cursor_to (vpos, i, desired_row->y, x); | |
| 4592 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
|
4593 changed_p = 1; |
| 25012 | 4594 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4595 |
| 25012 | 4596 /* Maybe clear to end of line. */ |
| 4597 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)) | |
| 4598 { | |
| 4599 /* If new row extends to the end of the text area, nothing | |
| 4600 has to be cleared, if and only if we did a write_glyphs | |
| 4601 above. This is made sure by setting desired_stop_pos | |
| 4602 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
|
4603 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
|
4604 || ((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
|
4605 == 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
|
4606 && MATRIX_ROW_EXTENDS_FACE_P (current_row))); |
| 25012 | 4607 } |
| 4608 else if (MATRIX_ROW_EXTENDS_FACE_P (current_row)) | |
| 4609 { | |
| 4610 /* If old row extends to the end of the text area, clear. */ | |
| 4611 if (i >= desired_row->used[TEXT_AREA]) | |
| 4612 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
|
4613 desired_row->pixel_width); |
| 25012 | 4614 rif->clear_end_of_line (-1); |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4615 changed_p = 1; |
| 25012 | 4616 } |
| 4617 else if (desired_row->pixel_width < current_row->pixel_width) | |
| 4618 { | |
| 4619 /* Otherwise clear to the end of the old row. Everything | |
| 4620 after that position should be clear already. */ | |
| 4621 int x; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4622 |
| 25012 | 4623 if (i >= desired_row->used[TEXT_AREA]) |
| 4624 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
|
4625 desired_row->pixel_width); |
| 25012 | 4626 |
| 4627 /* If cursor is displayed at the end of the line, make sure | |
| 4628 it's cleared. Nowadays we don't have a phys_cursor_glyph | |
| 4629 with which to erase the cursor (because this method | |
| 4630 doesn't work with lbearing/rbearing), so we must do it | |
| 4631 this way. */ | |
| 4632 if (vpos == w->phys_cursor.vpos | |
| 4633 && w->phys_cursor.hpos >= desired_row->used[TEXT_AREA]) | |
| 4634 { | |
| 4635 w->phys_cursor_on_p = 0; | |
| 4636 x = -1; | |
| 4637 } | |
| 4638 else | |
|
53055
4cb0d5b004e9
(update_text_area): Fix redisplay error when hscroll
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4639 x = current_row->pixel_width; |
| 25012 | 4640 rif->clear_end_of_line (x); |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4641 changed_p = 1; |
| 25012 | 4642 } |
| 4643 } | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4644 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4645 return changed_p; |
| 25012 | 4646 } |
| 4647 | |
| 4648 | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4649 /* 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
|
4650 changed. */ |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4651 |
|
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4652 static int |
|
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4653 update_window_line (w, vpos, mouse_face_overwritten_p) |
| 25012 | 4654 struct window *w; |
|
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4655 int vpos, *mouse_face_overwritten_p; |
| 25012 | 4656 { |
| 4657 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); | |
| 4658 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
|
4659 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
|
4660 int changed_p = 0; |
| 25012 | 4661 |
| 4662 /* Set the row being updated. This is important to let xterm.c | |
| 4663 know what line height values are in effect. */ | |
| 4664 updated_row = desired_row; | |
| 4665 | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4666 /* 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
|
4667 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
|
4668 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
|
4669 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
|
4670 if (desired_row->mode_line_p |
|
59b455472b56
(update_window_line): Make sure to always draw
Gerd Moellmann <gerd@gnu.org>
parents:
31690
diff
changeset
|
4671 || desired_row->visible_height > 0) |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4672 { |
|
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4673 xassert (desired_row->enabled_p); |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4674 |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4675 /* 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
|
4676 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
|
4677 && !NILP (w->left_margin_cols)) |
|
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4678 { |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4679 changed_p = 1; |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4680 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
|
4681 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4682 |
|
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4683 /* Update the display of the text area. */ |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4684 if (update_text_area (w, vpos)) |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4685 { |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4686 changed_p = 1; |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4687 if (current_row->mouse_face_p) |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4688 *mouse_face_overwritten_p = 1; |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4689 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4690 |
|
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4691 /* 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
|
4692 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
|
4693 && !NILP (w->right_margin_cols)) |
|
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4694 { |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4695 changed_p = 1; |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4696 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
|
4697 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4698 |
|
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4699 /* Draw truncation marks etc. */ |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4700 if (!current_row->enabled_p |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4701 || desired_row->y != current_row->y |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4702 || 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
|
4703 || 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
|
4704 || 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
|
4705 || current_row->redraw_fringe_bitmaps_p |
|
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4706 || 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
|
4707 || 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
|
4708 || (MATRIX_ROW_CONTINUATION_LINE_P (desired_row) |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4709 != MATRIX_ROW_CONTINUATION_LINE_P (current_row))) |
|
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4710 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
|
4711 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4712 |
| 25012 | 4713 /* Update current_row from desired_row. */ |
| 4714 make_current (w->desired_matrix, w->current_matrix, vpos); | |
| 4715 updated_row = NULL; | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4716 return changed_p; |
| 25012 | 4717 } |
| 4718 | |
| 4719 | |
| 4720 /* Set the cursor after an update of window W. This function may only | |
| 4721 be called from update_window. */ | |
| 4722 | |
| 4723 static void | |
| 4724 set_window_cursor_after_update (w) | |
| 4725 struct window *w; | |
| 4726 { | |
| 4727 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
|
4728 struct redisplay_interface *rif = FRAME_RIF (f); |
| 25012 | 4729 int cx, cy, vpos, hpos; |
| 4730 | |
| 4731 /* Not intended for frame matrix updates. */ | |
| 4732 xassert (FRAME_WINDOW_P (f)); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4733 |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4734 if (cursor_in_echo_area |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4735 && !NILP (echo_area_buffer[0]) |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4736 /* 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
|
4737 show the cursor for the message instead. */ |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4738 && XWINDOW (minibuf_window) == w |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4739 && EQ (minibuf_window, echo_area_window) |
| 25012 | 4740 /* These cases apply only to the frame that contains |
| 4741 the active mini-buffer window. */ | |
| 4742 && FRAME_HAS_MINIBUF_P (f) | |
| 4743 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) | |
| 4744 { | |
| 4745 cx = cy = vpos = hpos = 0; | |
| 4746 | |
| 4747 if (cursor_in_echo_area >= 0) | |
| 4748 { | |
| 4749 /* If the mini-buffer is several lines high, find the last | |
| 4750 line that has any text on it. Note: either all lines | |
| 4751 are enabled or none. Otherwise we wouldn't be able to | |
| 4752 determine Y. */ | |
|
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4753 struct glyph_row *row, *last_row; |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4754 struct glyph *glyph; |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4755 int yb = window_text_bottom_y (w); |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4756 |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4757 last_row = NULL; |
|
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4758 row = w->current_matrix->rows; |
|
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4759 while (row->enabled_p |
|
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4760 && (last_row == NULL |
|
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4761 || MATRIX_ROW_BOTTOM_Y (row) <= yb)) |
| 25012 | 4762 { |
|
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4763 if (row->used[TEXT_AREA] |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4764 && row->glyphs[TEXT_AREA][0].charpos >= 0) |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4765 last_row = row; |
|
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4766 ++row; |
| 25012 | 4767 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4768 |
| 25012 | 4769 if (last_row) |
| 4770 { | |
|
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4771 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
|
4772 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
|
4773 |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4774 while (last > start && last->charpos < 0) |
|
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4775 --last; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4776 |
|
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4777 for (glyph = start; glyph < last; ++glyph) |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4778 { |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4779 cx += glyph->pixel_width; |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4780 ++hpos; |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4781 } |
|
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4782 |
| 25012 | 4783 cy = last_row->y; |
|
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4784 vpos = MATRIX_ROW_VPOS (last_row, w->current_matrix); |
| 25012 | 4785 } |
| 4786 } | |
| 4787 } | |
| 4788 else | |
| 4789 { | |
| 4790 cx = w->cursor.x; | |
| 4791 cy = w->cursor.y; | |
| 4792 hpos = w->cursor.hpos; | |
| 4793 vpos = w->cursor.vpos; | |
| 4794 } | |
| 4795 | |
| 4796 /* Window cursor can be out of sync for horizontally split windows. */ | |
| 4797 hpos = max (0, hpos); | |
| 4798 hpos = min (w->current_matrix->matrix_w - 1, hpos); | |
| 4799 vpos = max (0, vpos); | |
| 4800 vpos = min (w->current_matrix->nrows - 1, vpos); | |
| 4801 rif->cursor_to (vpos, hpos, cy, cx); | |
| 4802 } | |
| 4803 | |
| 4804 | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4805 /* 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
|
4806 tree rooted at W. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4807 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4808 void |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4809 set_window_update_flags (w, on_p) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4810 struct window *w; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4811 int on_p; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4812 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4813 while (w) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4814 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4815 if (!NILP (w->hchild)) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4816 set_window_update_flags (XWINDOW (w->hchild), on_p); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4817 else if (!NILP (w->vchild)) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4818 set_window_update_flags (XWINDOW (w->vchild), on_p); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4819 else |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4820 w->must_be_updated_p = on_p; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4821 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4822 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4823 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4824 } |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4825 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4826 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4827 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4828 /*********************************************************************** |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4829 Window-Based Scrolling |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4830 ***********************************************************************/ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4831 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4832 /* Structure describing rows in scrolling_window. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4833 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4834 struct row_entry |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4835 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4836 /* 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
|
4837 int old_uses, new_uses; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4838 |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4839 /* Vpos of row in new matrix. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4840 int new_line_number; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4841 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4842 /* 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
|
4843 int bucket; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4844 |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4845 /* The row described by this entry. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4846 struct glyph_row *row; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4847 |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4848 /* Hash collision chain. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4849 struct row_entry *next; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4850 }; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4851 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4852 /* 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
|
4853 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
|
4854 that we need a larger one. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4855 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4856 static struct row_entry *row_entry_pool; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4857 static int row_entry_pool_size; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4858 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4859 /* Index of next free entry in row_entry_pool. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4860 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4861 static int row_entry_idx; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4862 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4863 /* 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
|
4864 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
|
4865 current matrix. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4866 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4867 static struct row_entry **row_table; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4868 static int row_table_size; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4869 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4870 /* 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
|
4871 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
|
4872 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4873 static struct row_entry **old_lines, **new_lines; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4874 static int old_lines_size, new_lines_size; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4875 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4876 /* 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
|
4877 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4878 static struct run *run_pool; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4879 static int runs_size; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4880 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4881 /* A vector of runs of lines found during scrolling. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4882 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4883 static struct run **runs; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4884 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4885 /* 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
|
4886 of window W. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4887 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4888 static INLINE struct row_entry * |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4889 add_row_entry (w, row) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4890 struct window *w; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4891 struct glyph_row *row; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4892 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4893 struct row_entry *entry; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4894 int i = row->hash % row_table_size; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4895 |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4896 entry = row_table[i]; |
|
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
4897 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
|
4898 entry = entry->next; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4899 |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4900 if (entry == NULL) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4901 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4902 entry = row_entry_pool + row_entry_idx++; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4903 entry->row = row; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4904 entry->old_uses = entry->new_uses = 0; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4905 entry->new_line_number = 0; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4906 entry->bucket = i; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4907 entry->next = row_table[i]; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4908 row_table[i] = entry; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4909 } |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4910 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4911 return entry; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4912 } |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4913 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4914 |
| 25012 | 4915 /* 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
|
4916 HEADER_LINE_P non-zero means W has a header line. |
| 25012 | 4917 |
| 4918 The algorithm is taken from Communications of the ACM, Apr78 "A | |
| 4919 Technique for Isolating Differences Between Files." It should take | |
| 4920 O(N) time. | |
| 4921 | |
| 4922 A short outline of the steps of the algorithm | |
| 4923 | |
| 4924 1. Skip lines equal at the start and end of both matrices. | |
| 4925 | |
| 4926 2. Enter rows in the current and desired matrix into a symbol | |
| 4927 table, counting how often they appear in both matrices. | |
| 4928 | |
| 4929 3. Rows that appear exactly once in both matrices serve as anchors, | |
| 4930 i.e. we assume that such lines are likely to have been moved. | |
| 4931 | |
| 4932 4. Starting from anchor lines, extend regions to be scrolled both | |
| 4933 forward and backward. | |
| 4934 | |
| 4935 Value is | |
| 4936 | |
| 4937 -1 if all rows were found to be equal. | |
| 4938 0 to indicate that we did not scroll the display, or | |
| 4939 1 if we did scroll. */ | |
| 4940 | |
| 4941 static int | |
| 25546 | 4942 scrolling_window (w, header_line_p) |
| 25012 | 4943 struct window *w; |
| 25546 | 4944 int header_line_p; |
| 25012 | 4945 { |
| 4946 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
| 4947 struct glyph_matrix *current_matrix = w->current_matrix; | |
| 4948 int yb = window_text_bottom_y (w); | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4949 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
|
4950 int nruns, nbytes, n, run_idx; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4951 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
|
4952 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
| 25012 | 4953 |
| 4954 /* 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
|
4955 for (i = header_line_p ? 1 : 0; i < current_matrix->nrows - 1; ++i) |
| 25012 | 4956 { |
|
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4957 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
|
4958 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
|
4959 |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4960 if (c->enabled_p |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4961 && d->enabled_p |
|
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4962 && !d->redraw_fringe_bitmaps_p |
|
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4963 && c->y == d->y |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4964 && MATRIX_ROW_BOTTOM_Y (c) <= yb |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4965 && MATRIX_ROW_BOTTOM_Y (d) <= yb |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4966 && row_equal_p (w, c, d, 1)) |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4967 { |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4968 assign_row (c, d); |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4969 d->enabled_p = 0; |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4970 } |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4971 else |
|
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4972 break; |
| 25012 | 4973 } |
| 4974 | |
| 4975 /* Give up if some rows in the desired matrix are not enabled. */ | |
| 4976 if (!MATRIX_ROW (desired_matrix, i)->enabled_p) | |
| 4977 return -1; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4978 |
| 25012 | 4979 first_old = first_new = i; |
| 4980 | |
| 4981 /* Set last_new to the index + 1 of the last enabled row in the | |
| 4982 desired matrix. */ | |
| 4983 i = first_new + 1; | |
| 4984 while (i < desired_matrix->nrows - 1 | |
| 4985 && MATRIX_ROW (desired_matrix, i)->enabled_p | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4986 && MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (desired_matrix, i)) <= yb) |
| 25012 | 4987 ++i; |
| 4988 | |
| 4989 if (!MATRIX_ROW (desired_matrix, i)->enabled_p) | |
| 4990 return 0; | |
| 4991 | |
| 4992 last_new = i; | |
| 4993 | |
| 4994 /* Set last_old to the index + 1 of the last enabled row in the | |
| 4995 current matrix. We don't look at the enabled flag here because | |
| 4996 we plan to reuse part of the display even if other parts are | |
| 4997 disabled. */ | |
| 4998 i = first_old + 1; | |
|
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4999 while (i < current_matrix->nrows - 1) |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
5000 { |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
5001 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
|
5002 if (bottom <= yb) |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
5003 ++i; |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
5004 if (bottom >= yb) |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
5005 break; |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
5006 } |
|
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
5007 |
| 25012 | 5008 last_old = i; |
| 5009 | |
| 5010 /* Skip over rows equal at the bottom. */ | |
| 5011 i = last_new; | |
| 5012 j = last_old; | |
| 5013 while (i - 1 > first_new | |
| 5014 && j - 1 > first_old | |
| 5015 && MATRIX_ROW (current_matrix, i - 1)->enabled_p | |
| 5016 && (MATRIX_ROW (current_matrix, i - 1)->y | |
| 5017 == 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
|
5018 && !MATRIX_ROW (desired_matrix, j - 1)->redraw_fringe_bitmaps_p |
| 25012 | 5019 && row_equal_p (w, |
| 5020 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
|
5021 MATRIX_ROW (current_matrix, j - 1), 1)) |
| 25012 | 5022 --i, --j; |
| 5023 last_new = i; | |
| 5024 last_old = j; | |
| 5025 | |
| 5026 /* Nothing to do if all rows are equal. */ | |
| 5027 if (last_new == first_new) | |
| 5028 return 0; | |
| 5029 | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5030 /* Reallocate vectors, tables etc. if necessary. */ |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5031 |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5032 if (current_matrix->nrows > old_lines_size) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5033 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5034 old_lines_size = current_matrix->nrows; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5035 nbytes = old_lines_size * sizeof *old_lines; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5036 old_lines = (struct row_entry **) xrealloc (old_lines, nbytes); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5037 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5038 |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5039 if (desired_matrix->nrows > new_lines_size) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5040 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5041 new_lines_size = desired_matrix->nrows; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5042 nbytes = new_lines_size * sizeof *new_lines; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5043 new_lines = (struct row_entry **) xrealloc (new_lines, nbytes); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5044 } |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5045 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5046 n = desired_matrix->nrows + current_matrix->nrows; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5047 if (3 * n > row_table_size) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5048 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5049 row_table_size = next_almost_prime (3 * n); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5050 nbytes = row_table_size * sizeof *row_table; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5051 row_table = (struct row_entry **) xrealloc (row_table, nbytes); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5052 bzero (row_table, nbytes); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5053 } |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5054 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5055 if (n > row_entry_pool_size) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5056 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5057 row_entry_pool_size = n; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5058 nbytes = row_entry_pool_size * sizeof *row_entry_pool; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5059 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
|
5060 } |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5061 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5062 if (desired_matrix->nrows > runs_size) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5063 { |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5064 runs_size = desired_matrix->nrows; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5065 nbytes = runs_size * sizeof *runs; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5066 runs = (struct run **) xrealloc (runs, nbytes); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5067 nbytes = runs_size * sizeof *run_pool; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5068 run_pool = (struct run *) xrealloc (run_pool, nbytes); |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5069 } |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5070 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5071 nruns = run_idx = 0; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5072 row_entry_idx = 0; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5073 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5074 /* 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
|
5075 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
|
5076 |
| 25012 | 5077 for (i = first_old; i < last_old; ++i) |
| 5078 { | |
| 5079 if (MATRIX_ROW (current_matrix, i)->enabled_p) | |
| 5080 { | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5081 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
|
5082 old_lines[i] = entry; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5083 ++entry->old_uses; |
| 25012 | 5084 } |
| 5085 else | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5086 old_lines[i] = NULL; |
| 25012 | 5087 } |
| 5088 | |
| 5089 for (i = first_new; i < last_new; ++i) | |
| 5090 { | |
| 5091 xassert (MATRIX_ROW_ENABLED_P (desired_matrix, i)); | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5092 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
|
5093 ++entry->new_uses; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5094 entry->new_line_number = i; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5095 new_lines[i] = entry; |
| 25012 | 5096 } |
| 5097 | |
| 5098 /* Identify moves based on lines that are unique and equal | |
| 5099 in both matrices. */ | |
| 5100 for (i = first_old; i < last_old;) | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5101 if (old_lines[i] |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5102 && old_lines[i]->old_uses == 1 |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5103 && old_lines[i]->new_uses == 1) |
| 25012 | 5104 { |
| 5105 int j, k; | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5106 int new_line = old_lines[i]->new_line_number; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5107 struct run *run = run_pool + run_idx++; |
| 25012 | 5108 |
| 5109 /* Record move. */ | |
| 5110 run->current_vpos = i; | |
| 5111 run->current_y = MATRIX_ROW (current_matrix, i)->y; | |
| 5112 run->desired_vpos = new_line; | |
| 5113 run->desired_y = MATRIX_ROW (desired_matrix, new_line)->y; | |
| 5114 run->nrows = 1; | |
| 5115 run->height = MATRIX_ROW (current_matrix, i)->height; | |
| 5116 | |
| 5117 /* Extend backward. */ | |
| 5118 j = i - 1; | |
| 5119 k = new_line - 1; | |
| 5120 while (j > first_old | |
| 5121 && k > first_new | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5122 && old_lines[j] == new_lines[k]) |
| 25012 | 5123 { |
| 5124 int h = MATRIX_ROW (current_matrix, j)->height; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5125 --run->current_vpos; |
|
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5126 --run->desired_vpos; |
| 25012 | 5127 ++run->nrows; |
| 5128 run->height += h; | |
| 5129 run->desired_y -= h; | |
| 5130 run->current_y -= h; | |
| 5131 --j, --k; | |
| 5132 } | |
| 5133 | |
| 5134 /* Extend forward. */ | |
| 5135 j = i + 1; | |
| 5136 k = new_line + 1; | |
| 5137 while (j < last_old | |
| 5138 && k < last_new | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5139 && old_lines[j] == new_lines[k]) |
| 25012 | 5140 { |
| 5141 int h = MATRIX_ROW (current_matrix, j)->height; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5142 ++run->nrows; |
| 25012 | 5143 run->height += h; |
| 5144 ++j, ++k; | |
| 5145 } | |
| 5146 | |
| 5147 /* Insert run into list of all runs. Order runs by copied | |
| 5148 pixel lines. Note that we record runs that don't have to | |
| 5149 be copied because they are already in place. This is done | |
| 5150 because we can avoid calling update_window_line in this | |
| 5151 case. */ | |
| 5152 for (j = 0; j < nruns && runs[j]->height > run->height; ++j) | |
| 5153 ; | |
|
34203
e55480843a8e
(scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents:
33763
diff
changeset
|
5154 for (k = nruns; k > j; --k) |
| 25012 | 5155 runs[k] = runs[k - 1]; |
| 5156 runs[j] = run; | |
| 5157 ++nruns; | |
| 5158 | |
| 5159 i += run->nrows; | |
| 5160 } | |
| 5161 else | |
| 5162 ++i; | |
| 5163 | |
| 5164 /* Do the moves. Do it in a way that we don't overwrite something | |
| 5165 we want to copy later on. This is not solvable in general | |
| 5166 because there is only one display and we don't have a way to | |
| 5167 exchange areas on this display. Example: | |
| 5168 | |
| 5169 +-----------+ +-----------+ | |
| 5170 | A | | B | | |
| 5171 +-----------+ --> +-----------+ | |
| 5172 | B | | A | | |
| 5173 +-----------+ +-----------+ | |
| 5174 | |
| 5175 Instead, prefer bigger moves, and invalidate moves that would | |
| 5176 copy from where we copied to. */ | |
| 5177 | |
| 5178 for (i = 0; i < nruns; ++i) | |
| 5179 if (runs[i]->nrows > 0) | |
| 5180 { | |
| 5181 struct run *r = runs[i]; | |
| 5182 | |
| 5183 /* Copy on the display. */ | |
| 5184 if (r->current_y != r->desired_y) | |
| 5185 { | |
| 5186 rif->scroll_run_hook (w, r); | |
| 5187 | |
| 5188 /* Invalidate runs that copy from where we copied to. */ | |
| 5189 for (j = i + 1; j < nruns; ++j) | |
| 5190 { | |
| 5191 struct run *p = runs[j]; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5192 |
| 25012 | 5193 if ((p->current_y >= r->desired_y |
| 5194 && p->current_y < r->desired_y + r->height) | |
| 5195 || (p->current_y + p->height >= r->desired_y | |
| 5196 && (p->current_y + p->height | |
| 5197 < r->desired_y + r->height))) | |
| 5198 p->nrows = 0; | |
| 5199 } | |
| 5200 } | |
| 5201 | |
| 5202 /* Assign matrix rows. */ | |
| 5203 for (j = 0; j < r->nrows; ++j) | |
| 5204 { | |
| 5205 struct glyph_row *from, *to; | |
|
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
5206 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
|
5207 |
| 25012 | 5208 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
|
5209 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
|
5210 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
|
5211 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
|
5212 && (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
|
5213 || 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
|
5214 || 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
|
5215 || 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
|
5216 || 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
|
5217 from->redraw_fringe_bitmaps_p = 1; |
| 25012 | 5218 assign_row (to, from); |
| 5219 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
|
5220 to->overlapped_p = to_overlapped_p; |
| 25012 | 5221 } |
| 5222 } | |
| 5223 | |
|
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5224 /* Clear the hash table, for the next time. */ |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5225 for (i = 0; i < row_entry_idx; ++i) |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5226 row_table[row_entry_pool[i].bucket] = NULL; |
|
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5227 |
|
54847
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
5228 /* 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
|
5229 return nruns; |
| 25012 | 5230 } |
| 5231 | |
| 5232 | |
| 5233 | |
| 5234 /************************************************************************ | |
| 5235 Frame-Based Updates | |
| 5236 ************************************************************************/ | |
| 5237 | |
| 5238 /* Update the desired frame matrix of frame F. | |
| 5239 | |
| 5240 FORCE_P non-zero means that the update should not be stopped by | |
| 5241 pending input. INHIBIT_HAIRY_ID_P non-zero means that scrolling | |
| 5242 should not be tried. | |
| 5243 | |
| 5244 Value is non-zero if update was stopped due to pending input. */ | |
| 5245 | |
| 5246 static int | |
| 5247 update_frame_1 (f, force_p, inhibit_id_p) | |
| 5248 struct frame *f; | |
| 5249 int force_p; | |
| 5250 int inhibit_id_p; | |
| 5251 { | |
| 5252 /* Frame matrices to work on. */ | |
| 5253 struct glyph_matrix *current_matrix = f->current_matrix; | |
| 5254 struct glyph_matrix *desired_matrix = f->desired_matrix; | |
| 5255 int i; | |
| 314 | 5256 int pause; |
| 5257 int preempt_count = baud_rate / 2400 + 1; | |
| 21514 | 5258 extern int input_pending; |
| 25012 | 5259 |
| 5260 xassert (current_matrix && desired_matrix); | |
| 314 | 5261 |
|
10122
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
5262 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
|
5263 calculate_costs (f); |
|
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
5264 |
|
3357
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5265 if (preempt_count <= 0) |
|
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5266 preempt_count = 1; |
|
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5267 |
|
76065
2001cae9df4e
(update_frame, update_single_window): Set force_p here if
Kim F. Storm <storm@cua.dk>
parents:
75371
diff
changeset
|
5268 #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
|
5269 if (!force_p && detect_input_pending_ignore_squeezables ()) |
| 314 | 5270 { |
| 5271 pause = 1; | |
| 5272 goto do_pause; | |
| 5273 } | |
|
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5274 #endif |
| 314 | 5275 |
| 25012 | 5276 /* 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
|
5277 if (!FRAME_LINE_INS_DEL_OK (f)) |
| 25012 | 5278 inhibit_id_p = 1; |
|
7188
7da4ad9a2a8f
(update_frame): Move those assignments even farther down.
Richard M. Stallman <rms@gnu.org>
parents:
7179
diff
changeset
|
5279 |
| 493 | 5280 /* See if any of the desired lines are enabled; don't compute for |
| 25012 | 5281 i/d line if just want cursor motion. */ |
| 5282 for (i = 0; i < desired_matrix->nrows; i++) | |
| 5283 if (MATRIX_ROW_ENABLED_P (desired_matrix, i)) | |
| 314 | 5284 break; |
| 5285 | |
| 5286 /* Try doing i/d line, if not yet inhibited. */ | |
| 25012 | 5287 if (!inhibit_id_p && i < desired_matrix->nrows) |
| 5288 force_p |= scrolling (f); | |
| 314 | 5289 |
| 5290 /* Update the individual lines as needed. Do bottom line first. */ | |
| 25012 | 5291 if (MATRIX_ROW_ENABLED_P (desired_matrix, desired_matrix->nrows - 1)) |
| 5292 update_frame_line (f, desired_matrix->nrows - 1); | |
| 5293 | |
| 5294 /* Now update the rest of the lines. */ | |
| 5295 for (i = 0; i < desired_matrix->nrows - 1 && (force_p || !input_pending); i++) | |
| 314 | 5296 { |
| 25012 | 5297 if (MATRIX_ROW_ENABLED_P (desired_matrix, i)) |
| 314 | 5298 { |
|
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5299 if (FRAME_TERMCAP_P (f)) |
| 314 | 5300 { |
| 5301 /* Flush out every so many lines. | |
| 5302 Also flush out if likely to have more than 1k buffered | |
| 5303 otherwise. I'm told that some telnet connections get | |
| 5304 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
|
5305 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
|
5306 if (display_output) |
| 314 | 5307 { |
|
94909
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5308 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
|
5309 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
|
5310 || (outq > 20 && ((i - 1) % preempt_count == 0))) |
| 314 | 5311 { |
|
94909
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5312 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
|
5313 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
|
5314 { |
| 554 | 5315 #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
|
5316 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
|
5317 /* 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
|
5318 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
|
5319 outq = PENDING_OUTPUT_COUNT (FRAME_TTY (f->output)); |
| 314 | 5320 #endif |
|
94909
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5321 outq *= 10; |
|
11f28d8c2c22
(update_frame_1): Check if tty output is still valid before flushing
Chong Yidong <cyd@stupidchicken.com>
parents:
94513
diff
changeset
|
5322 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
|
5323 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
|
5324 } |
| 314 | 5325 } |
| 5326 } | |
| 5327 } | |
| 5328 | |
|
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5329 #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
|
5330 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
|
5331 { |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5332 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
|
5333 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
|
5334 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
|
5335 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
|
5336 { |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5337 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
|
5338 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
|
5339 break; |
|
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5340 } |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5341 } |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5342 #else |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
5343 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
|
5344 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
|
5345 #endif |
|
16822
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
5346 |
| 25012 | 5347 update_frame_line (f, i); |
| 314 | 5348 } |
| 5349 } | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5350 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5351 pause = (i < FRAME_LINES (f) - 1) ? i : 0; |
| 314 | 5352 |
| 5353 /* Now just clean up termcap drivers and set cursor, etc. */ | |
| 5354 if (!pause) | |
| 5355 { | |
|
12409
6e374b28ecc3
(update_frame): Pretend cursor is in echo area
Richard M. Stallman <rms@gnu.org>
parents:
12193
diff
changeset
|
5356 if ((cursor_in_echo_area |
| 25012 | 5357 /* 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
|
5358 show the cursor for the message instead of for the |
| 25012 | 5359 (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
|
5360 || (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
|
5361 && EQ (minibuf_window, echo_area_window) |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5362 && !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
|
5363 /* These cases apply only to the frame that contains |
| 25012 | 5364 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
|
5365 && FRAME_HAS_MINIBUF_P (f) |
|
14459
c1d25453a95f
(update_frame): Compare FRAME_MINIBUF_WINDOW(f)
Richard M. Stallman <rms@gnu.org>
parents:
14286
diff
changeset
|
5366 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) |
| 708 | 5367 { |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5368 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
|
5369 int row, col; |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5370 |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5371 if (cursor_in_echo_area < 0) |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5372 { |
| 25012 | 5373 /* Negative value of cursor_in_echo_area means put |
| 5374 cursor at beginning of line. */ | |
|
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5375 row = top; |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5376 col = 0; |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5377 } |
| 708 | 5378 else |
|
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5379 { |
| 25012 | 5380 /* Positive value of cursor_in_echo_area means put |
| 5381 cursor at the end of the prompt. If the mini-buffer | |
| 5382 is several lines high, find the last line that has | |
| 5383 any text on it. */ | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5384 row = FRAME_LINES (f); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5385 do |
|
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5386 { |
| 25012 | 5387 --row; |
| 5388 col = 0; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5389 |
| 25012 | 5390 if (MATRIX_ROW_ENABLED_P (current_matrix, row)) |
| 5391 { | |
| 5392 /* Frame rows are filled up with spaces that | |
| 5393 must be ignored here. */ | |
| 5394 struct glyph_row *r = MATRIX_ROW (current_matrix, | |
| 5395 row); | |
| 5396 struct glyph *start = r->glyphs[TEXT_AREA]; | |
| 5397 struct glyph *last = start + r->used[TEXT_AREA]; | |
| 5398 | |
| 5399 while (last > start | |
| 5400 && (last - 1)->charpos < 0) | |
| 5401 --last; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5402 |
| 25012 | 5403 col = last - start; |
| 5404 } | |
|
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5405 } |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5406 while (row > top && col == 0); |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5407 |
|
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5408 /* 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
|
5409 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
|
5410 { |
|
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5411 /* 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
|
5412 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
|
5413 { |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5414 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
|
5415 row++; |
|
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5416 } |
|
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5417 /* 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
|
5418 else |
|
21763
b685f9451792
(change_frame_size_1): Use FRAME_CURSOR_X_LIMIT.
Richard M. Stallman <rms@gnu.org>
parents:
21757
diff
changeset
|
5419 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
|
5420 } |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5421 } |
|
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5422 |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5423 cursor_to (f, row, col); |
| 708 | 5424 } |
| 314 | 5425 else |
| 25012 | 5426 { |
| 5427 /* We have only one cursor on terminal frames. Use it to | |
| 5428 display the cursor of the selected window. */ | |
| 5429 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
|
5430 if (w->cursor.vpos >= 0 |
|
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5431 /* 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
|
5432 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
|
5433 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
|
5434 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
|
5435 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
|
5436 && w->cursor.vpos < WINDOW_TOTAL_LINES (w)) |
| 25012 | 5437 { |
| 5438 int x = WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos); | |
| 5439 int y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
| 5440 | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5441 if (INTEGERP (w->left_margin_cols)) |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5442 x += XFASTINT (w->left_margin_cols); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5443 |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5444 /* x = max (min (x, FRAME_TOTAL_COLS (f) - 1), 0); */ |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5445 cursor_to (f, y, x); |
| 25012 | 5446 } |
| 5447 } | |
| 314 | 5448 } |
| 5449 | |
| 5450 do_pause: | |
| 5451 | |
| 25012 | 5452 clear_desired_matrices (f); |
| 314 | 5453 return pause; |
| 5454 } | |
| 5455 | |
| 25012 | 5456 |
| 5457 /* Do line insertions/deletions on frame F for frame-based redisplay. */ | |
| 314 | 5458 |
| 21514 | 5459 int |
| 764 | 5460 scrolling (frame) |
| 25012 | 5461 struct frame *frame; |
| 314 | 5462 { |
| 5463 int unchanged_at_top, unchanged_at_bottom; | |
| 5464 int window_size; | |
| 5465 int changed_lines; | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5466 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
|
5467 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
|
5468 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
|
5469 int *old_draw_cost = (int *) alloca (FRAME_LINES (frame) * sizeof (int)); |
| 314 | 5470 register int i; |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5471 int free_at_end_vpos = FRAME_LINES (frame); |
| 25012 | 5472 struct glyph_matrix *current_matrix = frame->current_matrix; |
| 5473 struct glyph_matrix *desired_matrix = frame->desired_matrix; | |
| 5474 | |
| 5475 if (!current_matrix) | |
| 5476 abort (); | |
| 5477 | |
| 5478 /* Compute hash codes of all the lines. Also calculate number of | |
| 5479 changed lines, number of unchanged lines at the beginning, and | |
| 5480 number of unchanged lines at the end. */ | |
| 314 | 5481 changed_lines = 0; |
| 5482 unchanged_at_top = 0; | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5483 unchanged_at_bottom = FRAME_LINES (frame); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5484 for (i = 0; i < FRAME_LINES (frame); i++) |
| 314 | 5485 { |
| 5486 /* Give up on this scrolling if some old lines are not enabled. */ | |
| 25012 | 5487 if (!MATRIX_ROW_ENABLED_P (current_matrix, i)) |
| 314 | 5488 return 0; |
| 25012 | 5489 old_hash[i] = line_hash_code (MATRIX_ROW (current_matrix, i)); |
| 5490 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
|
5491 { |
|
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5492 /* 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
|
5493 new_hash[i] = old_hash[i]; |
|
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5494 #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
|
5495 draw_cost[i] = INFINITY; |
|
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5496 } |
| 314 | 5497 else |
|
18015
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5498 { |
| 25012 | 5499 new_hash[i] = line_hash_code (MATRIX_ROW (desired_matrix, i)); |
| 5500 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
|
5501 } |
| 314 | 5502 |
| 5503 if (old_hash[i] != new_hash[i]) | |
| 5504 { | |
| 5505 changed_lines++; | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5506 unchanged_at_bottom = FRAME_LINES (frame) - i - 1; |
| 314 | 5507 } |
| 5508 else if (i == unchanged_at_top) | |
| 5509 unchanged_at_top++; | |
| 25012 | 5510 old_draw_cost[i] = line_draw_cost (current_matrix, i); |
| 314 | 5511 } |
| 5512 | |
| 5513 /* 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
|
5514 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
|
5515 && changed_lines < baud_rate / 2400) |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5516 || unchanged_at_bottom == FRAME_LINES (frame)) |
| 314 | 5517 return 1; |
| 5518 | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5519 window_size = (FRAME_LINES (frame) - unchanged_at_top |
| 314 | 5520 - unchanged_at_bottom); |
| 5521 | |
|
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5522 if (FRAME_SCROLL_REGION_OK (frame)) |
| 314 | 5523 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
|
5524 else if (FRAME_MEMORY_BELOW_FRAME (frame)) |
| 314 | 5525 free_at_end_vpos = -1; |
| 5526 | |
| 5527 /* If large window, fast terminal and few lines in common between | |
| 25012 | 5528 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
|
5529 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
|
5530 && window_size >= 18 && baud_rate > 2400 |
| 314 | 5531 && (window_size >= |
| 5532 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
|
5533 FRAME_LINES (frame) - unchanged_at_bottom, |
| 314 | 5534 old_hash, new_hash, draw_cost))) |
| 5535 return 0; | |
| 5536 | |
| 25012 | 5537 if (window_size < 2) |
| 5538 return 0; | |
| 5539 | |
| 764 | 5540 scrolling_1 (frame, window_size, unchanged_at_top, unchanged_at_bottom, |
| 314 | 5541 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
|
5542 old_draw_cost + unchanged_at_top - 1, |
| 314 | 5543 old_hash + unchanged_at_top - 1, |
| 5544 new_hash + unchanged_at_top - 1, | |
| 5545 free_at_end_vpos - unchanged_at_top); | |
| 5546 | |
| 5547 return 0; | |
| 5548 } | |
| 25012 | 5549 |
| 5550 | |
| 5551 /* Count the number of blanks at the start of the vector of glyphs R | |
| 5552 which is LEN glyphs long. */ | |
| 5553 | |
| 5554 static int | |
| 5555 count_blanks (r, len) | |
| 5556 struct glyph *r; | |
| 5557 int len; | |
| 314 | 5558 { |
| 25012 | 5559 int i; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5560 |
| 25012 | 5561 for (i = 0; i < len; ++i) |
| 5562 if (!CHAR_GLYPH_SPACE_P (r[i])) | |
| 5563 break; | |
| 5564 | |
| 5565 return i; | |
| 314 | 5566 } |
| 25012 | 5567 |
| 5568 | |
| 5569 /* Count the number of glyphs in common at the start of the glyph | |
| 5570 vectors STR1 and STR2. END1 is the end of STR1 and END2 is the end | |
| 5571 of STR2. Value is the number of equal glyphs equal at the start. */ | |
| 314 | 5572 |
| 5573 static int | |
| 25012 | 5574 count_match (str1, end1, str2, end2) |
| 5575 struct glyph *str1, *end1, *str2, *end2; | |
| 314 | 5576 { |
| 25012 | 5577 struct glyph *p1 = str1; |
| 5578 struct glyph *p2 = str2; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5579 |
| 25012 | 5580 while (p1 < end1 |
| 5581 && p2 < end2 | |
|
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
5582 && GLYPH_CHAR_AND_FACE_EQUAL_P (p1, p2)) |
| 25012 | 5583 ++p1, ++p2; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5584 |
| 25012 | 5585 return p1 - str1; |
| 314 | 5586 } |
| 5587 | |
| 25012 | 5588 |
| 314 | 5589 /* Char insertion/deletion cost vector, from term.c */ |
| 25012 | 5590 |
| 314 | 5591 extern int *char_ins_del_vector; |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5592 #define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_TOTAL_COLS((f))]) |
| 314 | 5593 |
| 25012 | 5594 |
| 5595 /* Perform a frame-based update on line VPOS in frame FRAME. */ | |
| 5596 | |
| 314 | 5597 static void |
|
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5598 update_frame_line (f, vpos) |
|
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5599 struct frame *f; |
| 314 | 5600 int vpos; |
| 5601 { | |
| 25012 | 5602 struct glyph *obody, *nbody, *op1, *op2, *np1, *nend; |
| 314 | 5603 int tem; |
| 5604 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
|
5605 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
|
5606 struct glyph_matrix *desired_matrix = f->desired_matrix; |
| 25012 | 5607 struct glyph_row *current_row = MATRIX_ROW (current_matrix, vpos); |
| 5608 struct glyph_row *desired_row = MATRIX_ROW (desired_matrix, vpos); | |
| 5609 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
|
5610 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
|
5611 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
|
5612 != FACE_TTY_DEFAULT_BG_COLOR); |
|
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5613 |
|
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5614 if (colored_spaces_p) |
|
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5615 write_spaces_p = 1; |
| 25012 | 5616 |
|
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5617 /* 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
|
5618 write the whole desired line in that case. */ |
| 25012 | 5619 must_write_whole_line_p = !current_row->enabled_p; |
| 5620 if (must_write_whole_line_p) | |
| 314 | 5621 { |
| 25012 | 5622 obody = 0; |
| 314 | 5623 olen = 0; |
| 5624 } | |
| 5625 else | |
| 5626 { | |
| 25012 | 5627 obody = MATRIX_ROW_GLYPH_START (current_matrix, vpos); |
| 5628 olen = current_row->used[TEXT_AREA]; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5629 |
|
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5630 /* 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
|
5631 if (!write_spaces_p) |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5632 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
|
5633 olen--; |
| 314 | 5634 } |
| 5635 | |
| 25012 | 5636 current_row->enabled_p = 1; |
| 5637 current_row->used[TEXT_AREA] = desired_row->used[TEXT_AREA]; | |
| 5638 | |
| 5639 /* If desired line is empty, just clear the line. */ | |
| 5640 if (!desired_row->enabled_p) | |
| 314 | 5641 { |
| 5642 nlen = 0; | |
| 5643 goto just_erase; | |
| 5644 } | |
| 5645 | |
| 25012 | 5646 nbody = desired_row->glyphs[TEXT_AREA]; |
| 5647 nlen = desired_row->used[TEXT_AREA]; | |
| 5648 nend = nbody + nlen; | |
| 5649 | |
| 5650 /* If display line has unknown contents, write the whole line. */ | |
| 5651 if (must_write_whole_line_p) | |
| 5652 { | |
|
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5653 /* 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
|
5654 if (!write_spaces_p) |
|
25313
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5655 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
|
5656 --nlen; |
|
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5657 |
|
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5658 /* 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
|
5659 if (nlen) |
|
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5660 { |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5661 cursor_to (f, vpos, 0); |
|
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5662 write_glyphs (f, nbody, nlen); |
|
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5663 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5664 |
|
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5665 /* 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
|
5666 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
|
5667 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
|
5668 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
|
5669 { |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5670 cursor_to (f, vpos, nlen); |
|
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5671 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
|
5672 } |
|
28682
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5673 else |
|
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5674 /* 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
|
5675 with cmgoto might use `ch' in the wrong row. */ |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5676 cursor_to (f, vpos, 0); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5677 |
| 25012 | 5678 make_current (desired_matrix, current_matrix, vpos); |
| 5679 return; | |
| 5680 } | |
| 314 | 5681 |
| 5682 /* Pretend trailing spaces are not there at all, | |
| 5683 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
|
5684 if (!write_spaces_p) |
|
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5685 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
|
5686 nlen--; |
| 314 | 5687 |
| 5688 /* 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
|
5689 if (!FRAME_CHAR_INS_DEL_OK (f)) |
| 314 | 5690 { |
| 25012 | 5691 int i, j; |
| 5692 | |
| 5693 /* Find the first glyph in desired row that doesn't agree with | |
| 5694 a glyph in the current row, and write the rest from there on. */ | |
| 314 | 5695 for (i = 0; i < nlen; i++) |
| 5696 { | |
| 25012 | 5697 if (i >= olen || !GLYPH_EQUAL_P (nbody + i, obody + i)) |
| 314 | 5698 { |
| 25012 | 5699 /* Find the end of the run of different glyphs. */ |
| 5700 j = i + 1; | |
| 5701 while (j < nlen | |
| 5702 && (j >= olen | |
| 5703 || !GLYPH_EQUAL_P (nbody + j, obody + j) | |
| 5704 || CHAR_GLYPH_PADDING_P (nbody[j]))) | |
| 5705 ++j; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5706 |
|
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5707 /* Output this run of non-matching chars. */ |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5708 cursor_to (f, vpos, i); |
|
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5709 write_glyphs (f, nbody + i, j - i); |
| 25012 | 5710 i = j - 1; |
| 314 | 5711 |
| 5712 /* Now find the next non-match. */ | |
| 5713 } | |
| 5714 } | |
| 5715 | |
| 5716 /* Clear the rest of the line, or the non-clear part of it. */ | |
| 5717 if (olen > nlen) | |
| 5718 { | |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5719 cursor_to (f, vpos, nlen); |
|
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5720 clear_end_of_line (f, olen); |
| 314 | 5721 } |
| 5722 | |
| 25012 | 5723 /* Make current row = desired row. */ |
| 5724 make_current (desired_matrix, current_matrix, vpos); | |
| 314 | 5725 return; |
| 5726 } | |
| 5727 | |
| 25012 | 5728 /* Here when CHAR_INS_DEL_OK != 0, i.e. we can insert or delete |
| 5729 characters in a row. */ | |
| 5730 | |
| 314 | 5731 if (!olen) |
| 5732 { | |
| 25012 | 5733 /* If current line is blank, skip over initial spaces, if |
| 5734 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
|
5735 if (write_spaces_p) |
| 25012 | 5736 nsp = 0; |
| 5737 else | |
| 5738 nsp = count_blanks (nbody, nlen); | |
| 5739 | |
| 314 | 5740 if (nlen > nsp) |
| 5741 { | |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5742 cursor_to (f, vpos, nsp); |
|
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5743 write_glyphs (f, nbody + nsp, nlen - nsp); |
| 314 | 5744 } |
| 5745 | |
| 764 | 5746 /* Exchange contents between current_frame and new_frame. */ |
| 25012 | 5747 make_current (desired_matrix, current_matrix, vpos); |
| 314 | 5748 return; |
| 5749 } | |
| 5750 | |
| 5751 /* Compute number of leading blanks in old and new contents. */ | |
| 25012 | 5752 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
|
5753 nsp = (colored_spaces_p ? 0 : count_blanks (nbody, nlen)); |
| 25012 | 5754 |
| 5755 /* Compute number of matching chars starting with first non-blank. */ | |
| 5756 begmatch = count_match (obody + osp, obody + olen, | |
| 5757 nbody + nsp, nbody + nlen); | |
| 314 | 5758 |
| 5759 /* Spaces in new match implicit space past the end of old. */ | |
| 5760 /* 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
|
5761 if (!write_spaces_p && osp + begmatch == olen) |
| 314 | 5762 { |
| 5763 np1 = nbody + nsp; | |
| 25012 | 5764 while (np1 + begmatch < nend && CHAR_GLYPH_SPACE_P (np1[begmatch])) |
| 5765 ++begmatch; | |
| 314 | 5766 } |
| 5767 | |
| 5768 /* Avoid doing insert/delete char | |
| 5769 just cause number of leading spaces differs | |
| 25012 | 5770 when the following text does not match. */ |
| 314 | 5771 if (begmatch == 0 && osp != nsp) |
| 5772 osp = nsp = min (osp, nsp); | |
| 5773 | |
| 5774 /* Find matching characters at end of line */ | |
| 5775 op1 = obody + olen; | |
| 5776 np1 = nbody + nlen; | |
| 5777 op2 = op1 + begmatch - min (olen - osp, nlen - nsp); | |
| 25012 | 5778 while (op1 > op2 |
| 5779 && GLYPH_EQUAL_P (op1 - 1, np1 - 1)) | |
| 314 | 5780 { |
| 5781 op1--; | |
| 5782 np1--; | |
| 5783 } | |
| 5784 endmatch = obody + olen - op1; | |
| 5785 | |
| 5786 /* tem gets the distance to insert or delete. | |
| 5787 endmatch is how many characters we save by doing so. | |
| 5788 Is it worth it? */ | |
| 5789 | |
| 5790 tem = (nlen - nsp) - (olen - osp); | |
| 5791 if (endmatch && tem | |
|
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5792 && (!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
|
5793 || endmatch <= char_ins_del_cost (f)[tem])) |
| 314 | 5794 endmatch = 0; |
| 5795 | |
| 5796 /* nsp - osp is the distance to insert or delete. | |
| 5797 If that is nonzero, begmatch is known to be nonzero also. | |
| 5798 begmatch + endmatch is how much we save by doing the ins/del. | |
| 5799 Is it worth it? */ | |
| 5800 | |
| 5801 if (nsp != osp | |
|
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5802 && (!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
|
5803 || begmatch + endmatch <= char_ins_del_cost (f)[nsp - osp])) |
| 314 | 5804 { |
| 5805 begmatch = 0; | |
| 5806 endmatch = 0; | |
| 5807 osp = nsp = min (osp, nsp); | |
| 5808 } | |
| 5809 | |
| 5810 /* Now go through the line, inserting, writing and | |
| 5811 deleting as appropriate. */ | |
| 5812 | |
| 5813 if (osp > nsp) | |
| 5814 { | |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5815 cursor_to (f, vpos, nsp); |
|
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5816 delete_glyphs (f, osp - nsp); |
| 314 | 5817 } |
| 5818 else if (nsp > osp) | |
| 5819 { | |
| 5820 /* If going to delete chars later in line | |
| 5821 and insert earlier in the line, | |
| 5822 must delete first to avoid losing data in the insert */ | |
| 5823 if (endmatch && nlen < olen + nsp - osp) | |
| 5824 { | |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5825 cursor_to (f, vpos, nlen - endmatch + osp - nsp); |
|
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5826 delete_glyphs (f, olen + nsp - osp - nlen); |
| 314 | 5827 olen = nlen - (nsp - osp); |
| 5828 } | |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5829 cursor_to (f, vpos, osp); |
|
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5830 insert_glyphs (f, 0, nsp - osp); |
| 314 | 5831 } |
| 5832 olen += nsp - osp; | |
| 5833 | |
| 5834 tem = nsp + begmatch + endmatch; | |
| 5835 if (nlen != tem || olen != tem) | |
| 5836 { | |
| 5837 if (!endmatch || nlen == olen) | |
| 5838 { | |
|
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5839 /* 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
|
5840 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
|
5841 (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
|
5842 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
|
5843 if (nlen == FRAME_TOTAL_COLS (f)) |
| 314 | 5844 olen = 0; |
|
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5845 |
|
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5846 /* 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
|
5847 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
|
5848 unnecessary cursor movement. */ |
|
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5849 if (nlen - tem > 0) |
|
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5850 { |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5851 cursor_to (f, vpos, nsp + begmatch); |
|
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5852 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
|
5853 } |
| 314 | 5854 } |
| 5855 else if (nlen > olen) | |
| 5856 { | |
|
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5857 /* 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
|
5858 ---------------------------------------- |
|
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5859 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
|
5860 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
|
5861 ---------------------------------------- |
|
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5862 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
|
5863 is a padding glyph. */ |
|
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5864 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
|
5865 int del; |
|
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5866 |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5867 cursor_to (f, vpos, nsp + begmatch); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5868 |
|
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5869 /* 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
|
5870 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
|
5871 out--; |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5872 write_glyphs (f, nbody + nsp + begmatch, out); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5873 |
| 25012 | 5874 /* 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
|
5875 del = olen - tem - out; |
|
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5876 if (del > 0) |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5877 delete_glyphs (f, del); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5878 |
|
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5879 /* At last, we insert columns not yet written out. */ |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5880 insert_glyphs (f, nbody + nsp + begmatch + out, nlen - olen + del); |
| 314 | 5881 olen = nlen; |
| 5882 } | |
| 5883 else if (olen > nlen) | |
| 5884 { | |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5885 cursor_to (f, vpos, nsp + begmatch); |
|
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5886 write_glyphs (f, nbody + nsp + begmatch, nlen - tem); |
|
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5887 delete_glyphs (f, olen - nlen); |
| 314 | 5888 olen = nlen; |
| 5889 } | |
| 5890 } | |
| 5891 | |
| 5892 just_erase: | |
| 5893 /* If any unerased characters remain after the new line, erase them. */ | |
| 5894 if (olen > nlen) | |
| 5895 { | |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5896 cursor_to (f, vpos, nlen); |
|
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
5897 clear_end_of_line (f, olen); |
| 314 | 5898 } |
| 5899 | |
| 764 | 5900 /* Exchange contents between current_frame and new_frame. */ |
| 25012 | 5901 make_current (desired_matrix, current_matrix, vpos); |
| 314 | 5902 } |
| 25012 | 5903 |
| 5904 | |
| 314 | 5905 |
| 25012 | 5906 /*********************************************************************** |
| 5907 X/Y Position -> Buffer Position | |
| 5908 ***********************************************************************/ | |
| 5909 | |
|
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5910 /* Determine what's under window-relative pixel position (*X, *Y). |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5911 Return the object (string or buffer) that's there. |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5912 Return in *POS the position in that object. |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5913 Adjust *X and *Y to character positions. */ |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5914 |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5915 Lisp_Object |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5916 buffer_posn_from_coords (w, x, y, pos, object, dx, dy, width, height) |
| 25012 | 5917 struct window *w; |
| 5918 int *x, *y; | |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5919 struct display_pos *pos; |
|
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5920 Lisp_Object *object; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5921 int *dx, *dy; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5922 int *width, *height; |
|
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5923 { |
| 25012 | 5924 struct it it; |
| 5925 struct buffer *old_current_buffer = current_buffer; | |
| 5926 struct text_pos startp; | |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5927 Lisp_Object string; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5928 struct glyph_row *row; |
|
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5929 #ifdef HAVE_WINDOW_SYSTEM |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5930 struct image *img = 0; |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5931 #endif |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5932 int x0, x1; |
| 25012 | 5933 |
| 5934 current_buffer = XBUFFER (w->buffer); | |
| 5935 SET_TEXT_POS_FROM_MARKER (startp, w->start); | |
| 5936 CHARPOS (startp) = min (ZV, max (BEGV, CHARPOS (startp))); | |
| 5937 BYTEPOS (startp) = min (ZV_BYTE, max (BEGV_BYTE, BYTEPOS (startp))); | |
| 5938 start_display (&it, w, startp); | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5939 |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5940 x0 = *x - WINDOW_LEFT_MARGIN_WIDTH (w); |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5941 move_it_to (&it, -1, x0 + it.first_visible_x, *y, -1, |
| 25012 | 5942 MOVE_TO_X | MOVE_TO_Y); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5943 |
| 25012 | 5944 current_buffer = old_current_buffer; |
|
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5945 |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5946 *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
|
5947 *dy = *y - it.current_y; |
|
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5948 |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5949 string = w->buffer; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5950 if (STRINGP (it.string)) |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5951 string = it.string; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5952 *pos = it.current; |
|
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5953 |
|
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
|
5954 #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
|
5955 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
|
5956 { |
|
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5957 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
|
5958 && !NILP (img->spec)) |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5959 *object = img->spec; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5960 } |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5961 #endif |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5962 |
|
65016
2b179104bc17
(buffer_posn_from_coords): Check that target row is
Kim F. Storm <storm@cua.dk>
parents:
65003
diff
changeset
|
5963 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
|
5964 && (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
|
5965 row->enabled_p)) |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5966 { |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5967 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
|
5968 { |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5969 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
|
5970 #ifdef HAVE_WINDOW_SYSTEM |
|
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5971 if (img) |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5972 { |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5973 *dy -= row->ascent - glyph->ascent; |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5974 *dx += glyph->slice.x; |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5975 *dy += glyph->slice.y; |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5976 /* 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
|
5977 *width = img->width; |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5978 *height = img->height; |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5979 } |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5980 else |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5981 #endif |
|
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5982 { |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5983 *width = glyph->pixel_width; |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5984 *height = glyph->ascent + glyph->descent; |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5985 } |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5986 } |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5987 else |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5988 { |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5989 *width = 0; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5990 *height = row->height; |
|
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5991 } |
|
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5992 } |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5993 else |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5994 { |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5995 *width = *height = 0; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5996 } |
|
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5997 |
|
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5998 /* 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
|
5999 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
|
6000 if (x0 > x1) |
|
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6001 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
|
6002 |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6003 *x = it.hpos; |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6004 *y = it.vpos; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6005 |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6006 return string; |
| 25012 | 6007 } |
| 6008 | |
| 6009 | |
| 6010 /* 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
|
6011 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
|
6012 *CHARPOS is set to the position in the string returned. */ |
| 25012 | 6013 |
| 6014 Lisp_Object | |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6015 mode_line_string (w, part, x, y, charpos, object, dx, dy, width, height) |
| 25012 | 6016 struct window *w; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6017 enum window_part part; |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6018 int *x, *y; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6019 int *charpos; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6020 Lisp_Object *object; |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6021 int *dx, *dy; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6022 int *width, *height; |
| 25012 | 6023 { |
| 6024 struct glyph_row *row; | |
| 6025 struct glyph *glyph, *end; | |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6026 int x0, y0; |
| 25012 | 6027 Lisp_Object string = Qnil; |
| 6028 | |
|
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
6029 if (part == ON_MODE_LINE) |
| 25012 | 6030 row = MATRIX_MODE_LINE_ROW (w->current_matrix); |
| 6031 else | |
| 25546 | 6032 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
|
6033 y0 = *y - row->y; |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6034 *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
|
6035 |
| 25012 | 6036 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
|
6037 { |
| 25012 | 6038 /* Find the glyph under X. If we find one with a string object, |
| 6039 it's the one we were looking for. */ | |
| 6040 glyph = row->glyphs[TEXT_AREA]; | |
| 6041 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
|
6042 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
|
6043 x0 -= glyph->pixel_width; |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6044 *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
|
6045 if (glyph < end) |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6046 { |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6047 string = glyph->object; |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6048 *charpos = glyph->charpos; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6049 *width = glyph->pixel_width; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6050 *height = glyph->ascent + glyph->descent; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6051 #ifdef HAVE_WINDOW_SYSTEM |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6052 if (glyph->type == IMAGE_GLYPH) |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6053 { |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6054 struct image *img; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6055 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
|
6056 if (img != NULL) |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6057 *object = img->spec; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6058 y0 -= row->ascent - glyph->ascent; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6059 } |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6060 #endif |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6061 } |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6062 else |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6063 { |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6064 /* 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
|
6065 *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
|
6066 *width = 0; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6067 *height = row->height; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6068 } |
|
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6069 } |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6070 else |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6071 { |
|
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6072 *x = 0; |
|
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6073 x0 = 0; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6074 *width = *height = 0; |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6075 } |
|
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6076 |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6077 *dx = x0; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6078 *dy = y0; |
| 25012 | 6079 |
| 6080 return string; | |
|
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6081 } |
| 25012 | 6082 |
| 6083 | |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6084 /* 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
|
6085 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
|
6086 the string returned. */ |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6087 |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6088 Lisp_Object |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6089 marginal_area_string (w, part, x, y, charpos, object, dx, dy, width, height) |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6090 struct window *w; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6091 enum window_part part; |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6092 int *x, *y; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6093 int *charpos; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6094 Lisp_Object *object; |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6095 int *dx, *dy; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6096 int *width, *height; |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6097 { |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6098 struct glyph_row *row = w->current_matrix->rows; |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6099 struct glyph *glyph, *end; |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6100 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
|
6101 int area; |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6102 Lisp_Object string = Qnil; |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6103 |
|
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
6104 if (part == ON_LEFT_MARGIN) |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6105 area = LEFT_MARGIN_AREA; |
|
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
6106 else if (part == ON_RIGHT_MARGIN) |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6107 area = RIGHT_MARGIN_AREA; |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6108 else |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6109 abort (); |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6110 |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6111 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
|
6112 if (wy >= row->y && wy < MATRIX_ROW_BOTTOM_Y (row)) |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6113 break; |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6114 y0 = *y - row->y; |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6115 *y = row - MATRIX_FIRST_TEXT_ROW (w->current_matrix); |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6116 |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6117 if (row->enabled_p) |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6118 { |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6119 /* 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
|
6120 it's the one we were looking for. */ |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6121 if (area == RIGHT_MARGIN_AREA) |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6122 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
|
6123 ? WINDOW_LEFT_FRINGE_WIDTH (w) |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6124 : WINDOW_TOTAL_FRINGE_WIDTH (w)) |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6125 + 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
|
6126 + window_box_width (w, TEXT_AREA)); |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6127 else |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6128 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
|
6129 ? WINDOW_LEFT_FRINGE_WIDTH (w) |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6130 : 0); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6131 |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6132 glyph = row->glyphs[area]; |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6133 end = glyph + row->used[area]; |
|
59592
c0533d2d03af
(mode_line_string, marginal_area_string): Fix
Kim F. Storm <storm@cua.dk>
parents:
59580
diff
changeset
|
6134 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
|
6135 x0 -= glyph->pixel_width; |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6136 *x = glyph - row->glyphs[area]; |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6137 if (glyph < end) |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6138 { |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6139 string = glyph->object; |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6140 *charpos = glyph->charpos; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6141 *width = glyph->pixel_width; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6142 *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
|
6143 #ifdef HAVE_WINDOW_SYSTEM |
|
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6144 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
|
6145 { |
|
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6146 struct image *img; |
|
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6147 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
|
6148 if (img != NULL) |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6149 *object = img->spec; |
|
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6150 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
|
6151 x0 += glyph->slice.x; |
|
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
6152 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
|
6153 } |
|
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6154 #endif |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6155 } |
|
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6156 else |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6157 { |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6158 /* 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
|
6159 *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
|
6160 *width = 0; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6161 *height = row->height; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6162 } |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6163 } |
|
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6164 else |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6165 { |
|
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6166 x0 = 0; |
|
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6167 *x = 0; |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6168 *width = *height = 0; |
|
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6169 } |
|
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6170 |
|
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6171 *dx = x0; |
|
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6172 *dy = y0; |
|
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6173 |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6174 return string; |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6175 } |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6176 |
|
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6177 |
| 25012 | 6178 /*********************************************************************** |
| 6179 Changing Frame Sizes | |
| 6180 ***********************************************************************/ | |
| 314 | 6181 |
| 6182 #ifdef SIGWINCH | |
| 25012 | 6183 |
| 493 | 6184 SIGTYPE |
|
10745
a553a08f5785
(window_change_signal): Add ignored argument.
Richard M. Stallman <rms@gnu.org>
parents:
10259
diff
changeset
|
6185 window_change_signal (signalnum) /* If we don't have an argument, */ |
| 25012 | 6186 int signalnum; /* some compilers complain in signal calls. */ |
| 314 | 6187 { |
| 6188 int width, height; | |
|
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
6189 #ifndef USE_CRT_DLL |
| 314 | 6190 extern int errno; |
|
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
6191 #endif |
| 314 | 6192 int old_errno = errno; |
| 6193 | |
|
82989
f3845715a5f6
Separate frame-local, tty-dependent parameters from tty-local parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
82987
diff
changeset
|
6194 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
|
6195 |
|
58986
59945307b86b
* syssignal.h: Declare main_thread.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57808
diff
changeset
|
6196 signal (SIGWINCH, window_change_signal); |
|
59945307b86b
* syssignal.h: Declare main_thread.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57808
diff
changeset
|
6197 SIGNAL_THREAD_CHECK (signalnum); |
|
59945307b86b
* syssignal.h: Declare main_thread.
Jan Dj?rv <jan.h.d@swipnet.se>
parents:
57808
diff
changeset
|
6198 |
|
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
|
6199 /* 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
|
6200 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
|
6201 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
|
6202 */ |
|
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
|
6203 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
|
6204 |
| 53341 | 6205 if (! tty->term_initted) |
| 6206 continue; | |
|
82995
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
6207 |
|
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6208 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
|
6209 |
|
83412
573105015a96
Work around Emacs crash on Konsole detach. (Tom Schutzer-Weissmann)
Karoly Lorentey <lorentey@elte.hu>
parents:
83384
diff
changeset
|
6210 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
|
6211 Lisp_Object tail, frame; |
|
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
6212 |
|
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
|
6213 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
|
6214 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
|
6215 /* 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
|
6216 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
|
6217 signal handler. */ |
|
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
6218 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
|
6219 } |
| 314 | 6220 } |
| 6221 | |
| 6222 errno = old_errno; | |
| 6223 } | |
| 6224 #endif /* SIGWINCH */ | |
| 6225 | |
| 6226 | |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6227 /* 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
|
6228 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
|
6229 safe to change frame sizes while a redisplay is in progress. */ |
| 314 | 6230 |
| 21514 | 6231 void |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6232 do_pending_window_change (safe) |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6233 int safe; |
| 314 | 6234 { |
| 6235 /* 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
|
6236 if (redisplaying_p && !safe) |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6237 return; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6238 |
| 314 | 6239 while (delayed_size_change) |
| 6240 { | |
|
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6241 Lisp_Object tail, frame; |
| 314 | 6242 |
| 6243 delayed_size_change = 0; | |
| 6244 | |
|
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6245 FOR_EACH_FRAME (tail, frame) |
| 314 | 6246 { |
| 25012 | 6247 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
|
6248 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6249 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
|
6250 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
|
6251 0, 0, safe); |
| 314 | 6252 } |
| 6253 } | |
| 6254 } | |
| 6255 | |
| 6256 | |
| 764 | 6257 /* 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
|
6258 indicate no change is to take place. |
| 314 | 6259 |
|
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6260 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
|
6261 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
|
6262 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
|
6263 from a signal handler. |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6264 |
|
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6265 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
|
6266 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
|
6267 |
| 21514 | 6268 void |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6269 change_frame_size (f, newheight, newwidth, pretend, delay, safe) |
| 25012 | 6270 register struct frame *f; |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6271 int newheight, newwidth, pretend, delay, safe; |
|
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6272 { |
|
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6273 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
|
6274 |
|
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
|
6275 if (FRAME_MSDOS_P (f)) |
|
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6276 { |
|
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
|
6277 /* 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
|
6278 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
|
6279 ttys. */ |
|
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6280 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
|
6281 if (! FRAME_WINDOW_P (XFRAME (frame))) |
|
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6282 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
|
6283 pretend, delay, safe); |
|
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6284 } |
|
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6285 else |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6286 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
|
6287 } |
|
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6288 |
|
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6289 static void |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6290 change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe) |
| 25012 | 6291 register struct frame *f; |
|
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6292 int newheight, newwidth, pretend, delay, safe; |
| 314 | 6293 { |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6294 int new_frame_total_cols; |
|
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
44890
diff
changeset
|
6295 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
|
6296 |
| 314 | 6297 /* 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
|
6298 if (delay || (redisplaying_p && !safe)) |
| 314 | 6299 { |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6300 f->new_text_lines = newheight; |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6301 f->new_text_cols = newwidth; |
| 314 | 6302 delayed_size_change = 1; |
| 6303 return; | |
| 6304 } | |
| 6305 | |
| 764 | 6306 /* 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
|
6307 f->new_text_lines = 0; |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6308 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
|
6309 |
|
3449
ad455da9b789
(do_pending_window_change): No need to clear
Richard M. Stallman <rms@gnu.org>
parents:
3357
diff
changeset
|
6310 /* 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
|
6311 if (newheight == 0) |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6312 newheight = FRAME_LINES (f); |
|
15896
3a3c30116313
(change_frame_size_1): Clean up conditional.
Erik Naggum <erik@naggum.no>
parents:
15687
diff
changeset
|
6313 if (newwidth == 0) |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6314 newwidth = FRAME_COLS (f); |
| 25012 | 6315 |
| 6316 /* Compute width of windows in F. | |
| 6317 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
|
6318 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
|
6319 |
|
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6320 /* Round up to the smallest acceptable size. */ |
| 25012 | 6321 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
|
6322 |
|
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6323 /* If we're not changing the frame size, quit now. */ |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6324 if (newheight == FRAME_LINES (f) |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6325 && new_frame_total_cols == FRAME_TOTAL_COLS (f)) |
| 314 | 6326 return; |
| 6327 | |
| 15078 | 6328 BLOCK_INPUT; |
| 6329 | |
|
14286
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6330 #ifdef MSDOS |
|
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6331 /* 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
|
6332 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
|
6333 or equal to the requested dimensions. */ |
|
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6334 dos_set_window_size (&newheight, &newwidth); |
|
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6335 #endif |
|
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6336 |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6337 if (newheight != FRAME_LINES (f)) |
| 314 | 6338 { |
| 25012 | 6339 if (FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f)) |
| 314 | 6340 { |
| 25012 | 6341 /* 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
|
6342 XSETFASTINT (XWINDOW (FRAME_ROOT_WINDOW (f))->top_line, |
| 25012 | 6343 FRAME_TOP_MARGIN (f)); |
| 6344 set_window_height (FRAME_ROOT_WINDOW (f), | |
| 6345 (newheight | |
| 6346 - 1 | |
| 6347 - FRAME_TOP_MARGIN (f)), | |
|
94513
5b9bb0c0273a
(change_frame_size_1): Preserve small windows when shrinking
Martin Rudalics <rudalics@gmx.at>
parents:
92692
diff
changeset
|
6348 2); |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6349 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
|
6350 newheight - 1); |
| 25012 | 6351 set_window_height (FRAME_MINIBUF_WINDOW (f), 1, 0); |
| 314 | 6352 } |
| 6353 else | |
| 764 | 6354 /* Frame has just one top-level window. */ |
| 25012 | 6355 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
|
6356 newheight - FRAME_TOP_MARGIN (f), 2); |
| 25012 | 6357 |
| 6358 if (FRAME_TERMCAP_P (f) && !pretend) | |
|
53232
22aaf1e5fbe6
Full support for multiple terminal I/O (with some rough edges).
Karoly Lorentey <lorentey@elte.hu>
parents:
53231
diff
changeset
|
6359 FrameRows (FRAME_TTY (f)) = newheight; |
| 314 | 6360 } |
| 6361 | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6362 if (new_frame_total_cols != FRAME_TOTAL_COLS (f)) |
| 314 | 6363 { |
|
94513
5b9bb0c0273a
(change_frame_size_1): Preserve small windows when shrinking
Martin Rudalics <rudalics@gmx.at>
parents:
92692
diff
changeset
|
6364 set_window_width (FRAME_ROOT_WINDOW (f), new_frame_total_cols, 2); |
| 25012 | 6365 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
|
6366 set_window_width (FRAME_MINIBUF_WINDOW (f), new_frame_total_cols, 0); |
| 25012 | 6367 |
| 6368 if (FRAME_TERMCAP_P (f) && !pretend) | |
|
53232
22aaf1e5fbe6
Full support for multiple terminal I/O (with some rough edges).
Karoly Lorentey <lorentey@elte.hu>
parents:
53231
diff
changeset
|
6369 FrameCols (FRAME_TTY (f)) = newwidth; |
| 25012 | 6370 |
|
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
6371 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
|
6372 XSETFASTINT (XWINDOW (f->tool_bar_window)->total_cols, newwidth); |
| 314 | 6373 } |
| 6374 | |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6375 FRAME_LINES (f) = newheight; |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6376 SET_FRAME_COLS (f, newwidth); |
| 25012 | 6377 |
| 6378 { | |
| 6379 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f)); | |
| 6380 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
|
6381 |
| 25012 | 6382 window_box (w, TEXT_AREA, &text_area_x, &text_area_y, &text_area_width, |
| 6383 &text_area_height); | |
| 6384 if (w->cursor.x >= text_area_x + text_area_width) | |
| 6385 w->cursor.hpos = w->cursor.x = 0; | |
| 6386 if (w->cursor.y >= text_area_y + text_area_height) | |
| 6387 w->cursor.vpos = w->cursor.y = 0; | |
| 6388 } | |
| 6389 | |
| 6390 adjust_glyphs (f); | |
|
40512
d256f6fc9c05
(change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents:
40334
diff
changeset
|
6391 calculate_costs (f); |
| 25012 | 6392 SET_FRAME_GARBAGED (f); |
|
40512
d256f6fc9c05
(change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents:
40334
diff
changeset
|
6393 f->resized_p = 1; |
| 15065 | 6394 |
| 6395 UNBLOCK_INPUT; | |
|
17282
5023bea28298
(change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents:
17015
diff
changeset
|
6396 |
|
19627
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
6397 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
|
6398 |
|
88050
449ffc76e463
* window.c (run_window_configuration_change_hook): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
6399 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
|
6400 |
|
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
6401 unbind_to (count, Qnil); |
| 314 | 6402 } |
| 25012 | 6403 |
| 6404 | |
| 314 | 6405 |
| 25012 | 6406 /*********************************************************************** |
| 6407 Terminal Related Lisp Functions | |
| 6408 ***********************************************************************/ | |
| 6409 | |
| 6410 DEFUN ("open-termscript", Fopen_termscript, Sopen_termscript, | |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6411 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
|
6412 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
|
6413 FILE = nil means just close any termscript file currently open. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6414 (file) |
| 25012 | 6415 Lisp_Object file; |
| 6416 { | |
|
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6417 struct tty_display_info *tty; |
|
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6418 |
|
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6419 if (! FRAME_TERMCAP_P (SELECTED_FRAME ())) |
|
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6420 error ("Current frame is not on a tty device"); |
|
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6421 |
|
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6422 tty = CURTTY (); |
|
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6423 |
|
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6424 if (tty->termscript != 0) |
| 83560 | 6425 { |
| 6426 BLOCK_INPUT; | |
|
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6427 fclose (tty->termscript); |
| 83560 | 6428 UNBLOCK_INPUT; |
| 6429 } | |
|
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6430 tty->termscript = 0; |
| 25012 | 6431 |
| 6432 if (! NILP (file)) | |
| 6433 { | |
| 6434 file = Fexpand_file_name (file, Qnil); | |
|
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6435 tty->termscript = fopen (SDATA (file), "w"); |
|
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6436 if (tty->termscript == 0) |
| 25012 | 6437 report_file_error ("Opening termscript", Fcons (file, Qnil)); |
| 6438 } | |
| 6439 return Qnil; | |
| 6440 } | |
| 6441 | |
| 6442 | |
| 314 | 6443 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
|
6444 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
|
6445 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
|
6446 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
|
6447 |
|
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6448 Optional parameter TERMINAL specifies the tty terminal device to use. |
|
83370
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83362
diff
changeset
|
6449 It may be a terminal id, a frame, or nil for the terminal used by the |
|
5272862a4865
Fix crashes in xdialog_show (and other places) with xterm-mouse-mode.
Karoly Lorentey <lorentey@elte.hu>
parents:
83362
diff
changeset
|
6450 currently 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
|
6451 (string, terminal) |
|
14068
a3c83dde295e
(Fsend_string_to_terminal, Fsit_for): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13526
diff
changeset
|
6452 Lisp_Object string; |
|
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6453 Lisp_Object terminal; |
| 314 | 6454 { |
|
83512
5d328dadd0f4
Make `tty-display-color-p' follow its doc string. (Reported by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83510
diff
changeset
|
6455 struct terminal *t = get_tty_terminal (terminal, 1); |
|
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6456 struct tty_display_info *tty; |
|
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6457 |
|
20618
d5acac3af6e3
(Fsend_string_to_terminal): Use size_byte.
Richard M. Stallman <rms@gnu.org>
parents:
19627
diff
changeset
|
6458 /* ??? 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
|
6459 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
|
6460 BLOCK_INPUT; |
|
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6461 |
|
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6462 if (!t) |
|
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6463 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
|
6464 |
|
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6465 tty = t->display_info.tty; |
|
92276
1dc7b04a4d95
(line_draw_cost): Adapt to new glyph type.
Kim F. Storm <storm@cua.dk>
parents:
91367
diff
changeset
|
6466 |
|
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6467 if (tty->termscript) |
| 314 | 6468 { |
|
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6469 fwrite (SDATA (string), 1, SBYTES (string), tty->termscript); |
|
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6470 fflush (tty->termscript); |
| 314 | 6471 } |
|
83065
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6472 fwrite (SDATA (string), 1, SBYTES (string), tty->output); |
|
a871be7b26a5
Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
83037
diff
changeset
|
6473 fflush (tty->output); |
|
76621
685fa6c9ae44
(Fopen_termscript): Add BLOCK_INPUT around fclose.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
76069
diff
changeset
|
6474 UNBLOCK_INPUT; |
| 314 | 6475 return Qnil; |
| 6476 } | |
| 6477 | |
| 25012 | 6478 |
| 314 | 6479 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
|
6480 doc: /* Beep, or flash the screen. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6481 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
|
6482 terminate any keyboard macro currently executing. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6483 (arg) |
| 314 | 6484 Lisp_Object arg; |
| 6485 { | |
| 493 | 6486 if (!NILP (arg)) |
| 314 | 6487 { |
|
649
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6488 if (noninteractive) |
|
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6489 putchar (07); |
|
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6490 else |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
6491 ring_bell (XFRAME (selected_frame)); |
| 314 | 6492 } |
| 6493 else | |
| 6494 bitch_at_user (); | |
| 6495 | |
| 6496 return Qnil; | |
| 6497 } | |
| 6498 | |
| 21514 | 6499 void |
| 314 | 6500 bitch_at_user () |
| 6501 { | |
| 6502 if (noninteractive) | |
| 6503 putchar (07); | |
| 25012 | 6504 else if (!INTERACTIVE) /* Stop executing a keyboard macro. */ |
| 314 | 6505 error ("Keyboard macro terminated by a command ringing the bell"); |
| 6506 else | |
|
83100
4970ad4995f5
Eliminated updating_frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83098
diff
changeset
|
6507 ring_bell (XFRAME (selected_frame)); |
| 314 | 6508 } |
| 6509 | |
| 25012 | 6510 |
| 6511 | |
| 6512 /*********************************************************************** | |
| 6513 Sleeping, Waiting | |
| 6514 ***********************************************************************/ | |
| 6515 | |
| 314 | 6516 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
|
6517 doc: /* Pause, without updating display, for SECONDS seconds. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6518 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
|
6519 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
|
6520 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
|
6521 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
|
6522 \(Not all operating systems support waiting for a fraction of a second.) */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6523 (seconds, milliseconds) |
|
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6524 Lisp_Object seconds, milliseconds; |
| 314 | 6525 { |
|
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6526 int sec, usec; |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6527 |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6528 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
|
6529 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
|
6530 else |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6531 CHECK_NUMBER (milliseconds); |
| 2648 | 6532 usec = XINT (milliseconds) * 1000; |
| 6533 | |
| 6534 { | |
| 6535 double duration = extract_float (seconds); | |
| 6536 sec = (int) duration; | |
| 6537 usec += (duration - sec) * 1000000; | |
| 6538 } | |
| 314 | 6539 |
|
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6540 #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
|
6541 if (sec == 0 && usec != 0) |
|
63695
98563021d2e3
(Fsleep_for, Fsit_for): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
63649
diff
changeset
|
6542 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
|
6543 #endif |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6544 |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6545 /* 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
|
6546 if (usec < 0) |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6547 { |
|
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
|
6548 /* 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
|
6549 if (-1000000 < usec) |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6550 sec--, usec += 1000000; |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6551 else |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6552 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
|
6553 } |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6554 else |
|
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6555 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
|
6556 |
|
14646
68fe10d1abd0
(Fsleep_for): Accept sub-second intervals.
Erik Naggum <erik@naggum.no>
parents:
14459
diff
changeset
|
6557 if (sec < 0 || (sec == 0 && usec == 0)) |
| 314 | 6558 return Qnil; |
| 6559 | |
|
56727
6b028bf60b4e
(Fsleep_for): Remove obsolete code.
Kim F. Storm <storm@cua.dk>
parents:
56717
diff
changeset
|
6560 wait_reading_process_output (sec, usec, 0, 0, Qnil, NULL, 0); |
| 314 | 6561 |
| 6562 return Qnil; | |
| 6563 } | |
| 6564 | |
| 25012 | 6565 |
|
56727
6b028bf60b4e
(Fsleep_for): Remove obsolete code.
Kim F. Storm <storm@cua.dk>
parents:
56717
diff
changeset
|
6566 /* 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
|
6567 it does redisplay. |
|
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6568 |
|
73318
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6569 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
|
6570 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
|
6571 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
|
6572 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
|
6573 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
|
6574 */ |
| 650 | 6575 |
| 6576 Lisp_Object | |
|
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6577 sit_for (timeout, reading, do_display) |
|
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6578 Lisp_Object timeout; |
|
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6579 int reading, do_display; |
| 314 | 6580 { |
|
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6581 int sec, usec; |
|
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6582 |
|
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6583 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
|
6584 |
|
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6585 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
|
6586 || !NILP (Vexecuting_kbd_macro)) |
| 314 | 6587 return Qnil; |
| 650 | 6588 |
|
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6589 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
|
6590 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
|
6591 |
|
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
|
6592 if (INTEGERP (timeout)) |
|
71333
a8cbcce39bd0
(sit_for): Undo 2006-06-01 change. Instead, a
Kim F. Storm <storm@cua.dk>
parents:
71323
diff
changeset
|
6593 { |
| 71810 | 6594 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
|
6595 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
|
6596 } |
|
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
|
6597 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
|
6598 { |
|
71831
347f809d2edb
(sit_for): Tiny simplification.
Kim F. Storm <storm@cua.dk>
parents:
71810
diff
changeset
|
6599 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
|
6600 sec = (int) seconds; |
|
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6601 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
|
6602 } |
|
73318
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6603 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
|
6604 { |
|
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6605 sec = 0; |
|
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6606 usec = 0; |
|
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6607 } |
|
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6608 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
|
6609 wrong_type_argument (Qnumberp, timeout); |
| 314 | 6610 |
|
73318
e876a1f62fec
* dispnew.c (sit_for): Sit forever if TIMEOUT is t.
Chong Yidong <cyd@stupidchicken.com>
parents:
72949
diff
changeset
|
6611 if (sec == 0 && usec == 0 && !EQ (timeout, Qt)) |
| 673 | 6612 return Qt; |
| 6613 | |
| 314 | 6614 #ifdef SIGIO |
|
1915
98ecf99d7b1a
* dispnew.c (sit_for): Pass the correct number of arguments to
Jim Blandy <jimb@redhat.com>
parents:
1872
diff
changeset
|
6615 gobble_input (0); |
| 650 | 6616 #endif |
| 6617 | |
|
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6618 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
|
6619 Qnil, NULL, 0); |
| 650 | 6620 |
| 314 | 6621 return detect_input_pending () ? Qnil : Qt; |
| 6622 } | |
| 6623 | |
| 25012 | 6624 |
|
71771
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6625 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
|
6626 doc: /* Perform redisplay if no input is available. |
| 71773 | 6627 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
|
6628 perform a full redisplay even if input is available. |
|
102f29870373
(Fredisplay): Document return value.
Kim F. Storm <storm@cua.dk>
parents:
71946
diff
changeset
|
6629 Return t if redisplay was performed, nil otherwise. */) |
|
71771
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6630 (force) |
|
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6631 Lisp_Object force; |
| 650 | 6632 { |
|
71771
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6633 int count; |
|
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6634 |
|
71794
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6635 swallow_events (1); |
|
d76f16a63bf2
(sit_for): Reduce number of args from 5 to 3.
Kim F. Storm <storm@cua.dk>
parents:
71773
diff
changeset
|
6636 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
|
6637 && NILP (force) && !redisplay_dont_pause) |
|
71761
1055c0769159
* puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents:
71573
diff
changeset
|
6638 || !NILP (Vexecuting_kbd_macro)) |
|
1055c0769159
* puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents:
71573
diff
changeset
|
6639 return Qnil; |
|
1055c0769159
* puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents:
71573
diff
changeset
|
6640 |
|
71771
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6641 count = SPECPDL_INDEX (); |
|
c6e0c9217129
(Fredisplay): Add FORCE argument to force redisplay when
Kim F. Storm <storm@cua.dk>
parents:
71761
diff
changeset
|
6642 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
|
6643 specbind (Qredisplay_dont_pause, Qt); |
|
71761
1055c0769159
* puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents:
71573
diff
changeset
|
6644 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
|
6645 unbind_to (count, Qnil); |
|
71761
1055c0769159
* puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents:
71573
diff
changeset
|
6646 return Qt; |
| 650 | 6647 } |
| 25012 | 6648 |
| 6649 | |
| 314 | 6650 |
| 25012 | 6651 /*********************************************************************** |
| 6652 Other Lisp Functions | |
| 6653 ***********************************************************************/ | |
| 6654 | |
| 6655 /* A vector of size >= 2 * NFRAMES + 3 * NBUFFERS + 1, containing the | |
| 6656 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
|
6657 buffer-modified-flags. */ |
| 25012 | 6658 |
| 6659 static Lisp_Object frame_and_buffer_state; | |
| 6660 | |
| 6661 | |
| 6662 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
|
6663 Sframe_or_buffer_changed_p, 0, 1, 0, |
| 40979 | 6664 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
|
6665 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
|
6666 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
|
6667 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
|
6668 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
|
6669 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
|
6670 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
|
6671 the current state. |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6672 |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6673 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
|
6674 pass nil for VARIABLE. */) |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6675 (variable) |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6676 Lisp_Object variable; |
| 25012 | 6677 { |
|
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6678 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
|
6679 Lisp_Object *vecp, *end; |
| 25012 | 6680 int n; |
| 6681 | |
|
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6682 if (! NILP (variable)) |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6683 { |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6684 CHECK_SYMBOL (variable); |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6685 state = Fsymbol_value (variable); |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6686 if (! VECTORP (state)) |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6687 goto changed; |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6688 } |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6689 else |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6690 state = frame_and_buffer_state; |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6691 |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6692 vecp = XVECTOR (state)->contents; |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6693 end = vecp + XVECTOR (state)->size; |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6694 |
| 25012 | 6695 FOR_EACH_FRAME (tail, frame) |
| 6696 { | |
|
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6697 if (vecp == end) |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6698 goto changed; |
| 25012 | 6699 if (!EQ (*vecp++, frame)) |
| 6700 goto changed; | |
|
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6701 if (vecp == end) |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6702 goto changed; |
| 25012 | 6703 if (!EQ (*vecp++, XFRAME (frame)->name)) |
| 6704 goto changed; | |
| 6705 } | |
|
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6706 /* 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
|
6707 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
| 25012 | 6708 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6709 buf = XCDR (XCAR (tail)); |
| 25012 | 6710 /* 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
|
6711 if (SREF (XBUFFER (buf)->name, 0) == ' ') |
| 25012 | 6712 continue; |
|
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6713 if (vecp == end) |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6714 goto changed; |
| 25012 | 6715 if (!EQ (*vecp++, buf)) |
| 6716 goto changed; | |
|
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6717 if (vecp == end) |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6718 goto changed; |
| 25012 | 6719 if (!EQ (*vecp++, XBUFFER (buf)->read_only)) |
| 6720 goto changed; | |
|
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6721 if (vecp == end) |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6722 goto changed; |
| 25012 | 6723 if (!EQ (*vecp++, Fbuffer_modified_p (buf))) |
| 6724 goto changed; | |
| 6725 } | |
|
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6726 if (vecp == end) |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6727 goto changed; |
| 25012 | 6728 /* Detect deletion of a buffer at the end of the list. */ |
| 6729 if (EQ (*vecp, Qlambda)) | |
| 6730 return Qnil; | |
|
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6731 |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6732 /* Come here if we decide the data has changed. */ |
| 25012 | 6733 changed: |
|
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6734 /* 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
|
6735 Start with 1 so there is room for at least one lambda at the end. */ |
| 25012 | 6736 n = 1; |
| 6737 FOR_EACH_FRAME (tail, frame) | |
| 6738 n += 2; | |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6739 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
| 25012 | 6740 n += 3; |
|
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6741 /* 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
|
6742 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
|
6743 if (! VECTORP (state) |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6744 || n > XVECTOR (state)->size |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6745 || n + 20 < XVECTOR (state)->size / 2) |
| 25012 | 6746 /* 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
|
6747 { |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6748 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
|
6749 if (! NILP (variable)) |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6750 Fset (variable, state); |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6751 else |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6752 frame_and_buffer_state = state; |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6753 } |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6754 |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6755 /* 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
|
6756 vecp = XVECTOR (state)->contents; |
| 25012 | 6757 FOR_EACH_FRAME (tail, frame) |
| 6758 { | |
| 6759 *vecp++ = frame; | |
| 6760 *vecp++ = XFRAME (frame)->name; | |
| 6761 } | |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6762 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
| 25012 | 6763 { |
|
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6764 buf = XCDR (XCAR (tail)); |
| 25012 | 6765 /* 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
|
6766 if (SREF (XBUFFER (buf)->name, 0) == ' ') |
| 25012 | 6767 continue; |
| 6768 *vecp++ = buf; | |
| 6769 *vecp++ = XBUFFER (buf)->read_only; | |
| 6770 *vecp++ = Fbuffer_modified_p (buf); | |
| 6771 } | |
| 6772 /* Fill up the vector with lambdas (always at least one). */ | |
| 6773 *vecp++ = Qlambda; | |
|
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6774 while (vecp - XVECTOR (state)->contents |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6775 < XVECTOR (state)->size) |
| 25012 | 6776 *vecp++ = Qlambda; |
| 6777 /* 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
|
6778 if (vecp - XVECTOR (state)->contents |
|
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6779 > XVECTOR (state)->size) |
| 25012 | 6780 abort (); |
| 6781 return Qt; | |
| 6782 } | |
| 6783 | |
| 6784 | |
| 6785 | |
| 6786 /*********************************************************************** | |
| 6787 Initialization | |
| 6788 ***********************************************************************/ | |
| 6789 | |
| 6790 /* Initialization done when Emacs fork is started, before doing stty. | |
| 6791 Determine terminal type and set terminal_driver. Then invoke its | |
| 6792 decoding routine to set up variables in the terminal package. */ | |
| 314 | 6793 |
| 21514 | 6794 void |
| 314 | 6795 init_display () |
| 6796 { | |
|
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6797 char *terminal_type; |
|
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6798 |
| 314 | 6799 #ifdef HAVE_X_WINDOWS |
| 6800 extern int display_arg; | |
| 6801 #endif | |
| 6802 | |
| 25012 | 6803 /* Construct the space glyph. */ |
| 6804 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
|
6805 SET_CHAR_GLYPH (space_glyph, ' ', DEFAULT_FACE_ID, 0); |
| 25012 | 6806 space_glyph.charpos = -1; |
| 6807 | |
| 314 | 6808 inverse_video = 0; |
| 6809 cursor_in_echo_area = 0; | |
| 6810 terminal_type = (char *) 0; | |
| 6811 | |
|
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6812 /* 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
|
6813 during startup. */ |
|
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6814 Vinitial_window_system = Qnil; |
| 314 | 6815 |
|
83146
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6816 /* 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
|
6817 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
|
6818 automatically. */ |
|
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6819 #ifdef SIGWINCH |
|
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6820 #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
|
6821 if (initialized) |
|
3708519cf113
Make sure the SIGWINCH handler is always set (rep. by Yoshiaki Kasahara).
Karoly Lorentey <lorentey@elte.hu>
parents:
83112
diff
changeset
|
6822 #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
|
6823 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
|
6824 #endif /* SIGWINCH */ |
| 314 | 6825 |
|
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6826 /* 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
|
6827 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
|
6828 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
|
6829 using the window system. |
|
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6830 |
|
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6831 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
|
6832 try to use X, and die with an error message if that doesn't work. */ |
| 314 | 6833 |
| 6834 #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
|
6835 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
|
6836 { |
|
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6837 char *display; |
|
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6838 #ifdef VMS |
|
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6839 display = getenv ("DECW$DISPLAY"); |
|
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6840 #else |
|
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6841 display = getenv ("DISPLAY"); |
|
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6842 #endif |
|
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6843 |
|
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6844 display_arg = (display != 0 && *display != 0); |
|
69607
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6845 |
|
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6846 if (display_arg && !x_display_ok (display)) |
|
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6847 { |
|
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6848 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
|
6849 display); |
|
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6850 inhibit_window_system = 1; |
|
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6851 } |
| 2364 | 6852 } |
|
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6853 |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6854 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
|
6855 #ifndef CANNOT_DUMP |
|
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6856 && initialized |
|
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6857 #endif |
|
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6858 ) |
| 314 | 6859 { |
|
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6860 Vinitial_window_system = intern ("x"); |
| 314 | 6861 #ifdef HAVE_X11 |
| 6862 Vwindow_system_version = make_number (11); | |
| 6863 #else | |
| 6864 Vwindow_system_version = make_number (10); | |
| 6865 #endif | |
|
41969
e669966d496e
Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents:
41120
diff
changeset
|
6866 #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
|
6867 /* In some versions of ncurses, |
| 15282 | 6868 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
|
6869 So call tgetent. */ |
|
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6870 { char b[2044]; tgetent (b, "xterm");} |
|
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6871 #endif |
| 25012 | 6872 adjust_frame_glyphs_initially (); |
| 314 | 6873 return; |
| 6874 } | |
| 6875 #endif /* HAVE_X_WINDOWS */ | |
| 6876 | |
|
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6877 #ifdef HAVE_NTGUI |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6878 if (!inhibit_window_system) |
|
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6879 { |
|
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6880 Vinitial_window_system = intern ("w32"); |
|
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6881 Vwindow_system_version = make_number (1); |
| 25012 | 6882 adjust_frame_glyphs_initially (); |
|
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6883 return; |
|
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6884 } |
|
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6885 #endif /* HAVE_NTGUI */ |
|
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6886 |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
6887 #ifdef MAC_OS |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6888 if (!inhibit_window_system) |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6889 { |
|
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6890 Vinitial_window_system = intern ("mac"); |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6891 Vwindow_system_version = make_number (1); |
|
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6892 adjust_frame_glyphs_initially (); |
|
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6893 return; |
|
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6894 } |
|
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
6895 #endif /* MAC_OS */ |
|
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6896 |
| 314 | 6897 /* If no window system has been specified, try to use the terminal. */ |
| 6898 if (! isatty (0)) | |
| 6899 { | |
|
16896
b2c51d6de440
(init_display): Use `fatal'.
Richard M. Stallman <rms@gnu.org>
parents:
16891
diff
changeset
|
6900 fatal ("standard input is not a tty"); |
| 314 | 6901 exit (1); |
| 6902 } | |
| 6903 | |
|
86273
77b991c8303d
(init_display) [WINDOWSNT]: Hardcode terminal_type.
Jason Rumney <jasonr@gnu.org>
parents:
85826
diff
changeset
|
6904 #ifdef WINDOWSNT |
|
77b991c8303d
(init_display) [WINDOWSNT]: Hardcode terminal_type.
Jason Rumney <jasonr@gnu.org>
parents:
85826
diff
changeset
|
6905 terminal_type = "w32console"; |
|
77b991c8303d
(init_display) [WINDOWSNT]: Hardcode terminal_type.
Jason Rumney <jasonr@gnu.org>
parents:
85826
diff
changeset
|
6906 #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
|
6907 /* Look at the TERM variable. */ |
| 314 | 6908 terminal_type = (char *) getenv ("TERM"); |
|
86273
77b991c8303d
(init_display) [WINDOWSNT]: Hardcode terminal_type.
Jason Rumney <jasonr@gnu.org>
parents:
85826
diff
changeset
|
6909 #endif |
| 314 | 6910 if (!terminal_type) |
| 6911 { | |
| 6912 #ifdef VMS | |
| 6913 fprintf (stderr, "Please specify your terminal type.\n\ | |
| 6914 For types defined in VMS, use set term /device=TYPE.\n\ | |
| 6915 For types not defined in VMS, use define emacs_term \"TYPE\".\n\ | |
| 6916 \(The quotation marks are necessary since terminal types are lower case.)\n"); | |
|
71944
270a672fc28c
(init_display): Mention DISPLAY as well as TERM in err msg.
Richard M. Stallman <rms@gnu.org>
parents:
71831
diff
changeset
|
6917 #else /* not VMS */ |
|
270a672fc28c
(init_display): Mention DISPLAY as well as TERM in err msg.
Richard M. Stallman <rms@gnu.org>
parents:
71831
diff
changeset
|
6918 |
| 71946 | 6919 #ifdef HAVE_WINDOW_SYSTEM |
| 71945 | 6920 if (! inhibit_window_system) |
| 6921 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
|
6922 else |
|
270a672fc28c
(init_display): Mention DISPLAY as well as TERM in err msg.
Richard M. Stallman <rms@gnu.org>
parents:
71831
diff
changeset
|
6923 #endif /* HAVE_WINDOW_SYSTEM */ |
| 71945 | 6924 fprintf (stderr, "Please set the environment variable 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
|
6925 #endif /* not VMS */ |
| 314 | 6926 exit (1); |
| 6927 } | |
| 6928 | |
| 6929 #ifdef VMS | |
| 25012 | 6930 /* VMS DCL tends to up-case things, so down-case term type. |
| 314 | 6931 Hardly any uppercase letters in terminal types; should be none. */ |
| 6932 { | |
| 6933 char *new = (char *) xmalloc (strlen (terminal_type) + 1); | |
| 6934 char *p; | |
| 6935 | |
| 6936 strcpy (new, terminal_type); | |
| 6937 | |
| 6938 for (p = new; *p; p++) | |
| 6939 if (isupper (*p)) | |
| 6940 *p = tolower (*p); | |
| 6941 | |
| 6942 terminal_type = new; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6943 } |
| 25012 | 6944 #endif /* VMS */ |
| 314 | 6945 |
| 53341 | 6946 { |
|
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6947 struct terminal *t; |
|
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6948 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
|
6949 |
|
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6950 /* 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
|
6951 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
|
6952 |
|
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6953 /* 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
|
6954 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
|
6955 abort (); |
|
83431
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6956 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
|
6957 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
|
6958 |
|
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6959 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
|
6960 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
|
6961 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
|
6962 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
|
6963 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
|
6964 |
|
76396de7f50a
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83413
diff
changeset
|
6965 /* 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
|
6966 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
|
6967 && 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
|
6968 (*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
|
6969 |
|
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
6970 /* 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
|
6971 Fmodify_frame_parameters |
|
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
6972 (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
|
6973 Ftty_type (selected_frame)), Qnil)); |
|
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
|
6974 Fmodify_frame_parameters (selected_frame, Fcons (Fcons (Qtty, Qnil), Qnil)); |
| 53341 | 6975 } |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6976 |
|
16891
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6977 { |
|
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6978 struct frame *sf = SELECTED_FRAME (); |
|
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6979 int width = FRAME_TOTAL_COLS (sf); |
|
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6980 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
|
6981 |
| 25012 | 6982 unsigned int total_glyphs = height * (width + 2) * sizeof (struct glyph); |
| 6983 | |
| 6984 /* If these sizes are so big they cause overflow, just ignore the | |
| 6985 change. It's not clear what better we could do. */ | |
| 6986 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
|
6987 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
|
6988 } |
|
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6989 |
| 25012 | 6990 adjust_frame_glyphs_initially (); |
|
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6991 calculate_costs (XFRAME (selected_frame)); |
| 314 | 6992 |
| 25012 | 6993 /* Set up faces of the initial terminal frame of a dumped Emacs. */ |
| 6994 if (initialized | |
| 6995 && !noninteractive | |
|
25118
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6996 #ifdef MSDOS |
|
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6997 /* The MSDOS terminal turns on its ``window system'' relatively |
|
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6998 late into the startup, so we cannot do the frame faces' |
|
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6999 initialization just yet. It will be done later by pc-win.el |
|
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
7000 and internal_terminal_init. */ |
|
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
7001 && (strcmp (terminal_type, "internal") != 0 || inhibit_window_system) |
|
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
7002 #endif |
|
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
7003 && 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
|
7004 { |
|
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
7005 /* 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
|
7006 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
|
7007 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
|
7008 |
|
26902
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26851
diff
changeset
|
7009 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
|
7010 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
|
7011 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
|
7012 } |
| 314 | 7013 } |
| 25012 | 7014 |
| 7015 | |
| 314 | 7016 |
| 25012 | 7017 /*********************************************************************** |
| 7018 Blinking cursor | |
| 7019 ***********************************************************************/ | |
| 7020 | |
|
26280
083835afced5
(Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
7021 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
|
7022 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
|
7023 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
|
7024 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
|
7025 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
|
7026 don't show a cursor. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7027 (window, show) |
|
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7028 Lisp_Object window, show; |
| 25012 | 7029 { |
| 7030 /* Don't change cursor state while redisplaying. This could confuse | |
| 7031 output routines. */ | |
| 7032 if (!redisplaying_p) | |
| 7033 { | |
| 7034 if (NILP (window)) | |
| 7035 window = selected_window; | |
| 7036 else | |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
7037 CHECK_WINDOW (window); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
7038 |
|
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7039 XWINDOW (window)->cursor_off_p = NILP (show); |
| 25012 | 7040 } |
| 7041 | |
| 7042 return Qnil; | |
| 7043 } | |
| 7044 | |
| 7045 | |
|
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7046 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
|
7047 Sinternal_show_cursor_p, 0, 1, 0, |
| 40979 | 7048 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
|
7049 WINDOW nil or omitted means report on the selected window. */) |
|
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7050 (window) |
|
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7051 Lisp_Object window; |
|
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7052 { |
|
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7053 struct window *w; |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
7054 |
|
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7055 if (NILP (window)) |
|
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7056 window = selected_window; |
|
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7057 else |
|
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Jan?k <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
7058 CHECK_WINDOW (window); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
7059 |
|
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7060 w = XWINDOW (window); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
7061 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
|
7062 } |
|
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7063 |
|
95590
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
7064 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
|
7065 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
|
7066 doc: /* Value is last nonminibuffer frame. */) |
|
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
7067 () |
|
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
7068 { |
|
95639
2c12b44a3dfc
(Flast_nonminibuf_frame): Handle the NULL case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
7069 Lisp_Object frame = Qnil; |
|
2c12b44a3dfc
(Flast_nonminibuf_frame): Handle the NULL case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
7070 |
|
2c12b44a3dfc
(Flast_nonminibuf_frame): Handle the NULL case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
7071 if (last_nonminibuf_frame) |
|
2c12b44a3dfc
(Flast_nonminibuf_frame): Handle the NULL case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95590
diff
changeset
|
7072 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
|
7073 |
|
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
7074 return frame; |
|
9a4b27c8feec
* window.el (display-buffer-function, special-display-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94963
diff
changeset
|
7075 } |
| 25012 | 7076 |
| 7077 /*********************************************************************** | |
| 7078 Initialization | |
| 7079 ***********************************************************************/ | |
| 7080 | |
| 21514 | 7081 void |
| 314 | 7082 syms_of_display () |
| 7083 { | |
| 764 | 7084 defsubr (&Sredraw_frame); |
| 314 | 7085 defsubr (&Sredraw_display); |
|
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
7086 defsubr (&Sframe_or_buffer_changed_p); |
| 314 | 7087 defsubr (&Sopen_termscript); |
| 7088 defsubr (&Sding); | |
|
71761
1055c0769159
* puresize.h (BASE_PURESIZE): Increment to 1211000.
Chong Yidong <cyd@stupidchicken.com>
parents:
71573
diff
changeset
|
7089 defsubr (&Sredisplay); |
| 314 | 7090 defsubr (&Ssleep_for); |
| 7091 defsubr (&Ssend_string_to_terminal); | |
|
26280
083835afced5
(Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
7092 defsubr (&Sinternal_show_cursor); |
|
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
7093 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
|
7094 defsubr (&Slast_nonminibuf_frame); |
| 314 | 7095 |
|
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
7096 #if GLYPH_DEBUG |
|
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
7097 defsubr (&Sdump_redisplay_history); |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
7098 #endif |
|
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
7099 |
|
12186
6811992e871c
(Fframe_or_buffer_changed_p): Calculate vector size right.
Karl Heuer <kwzh@gnu.org>
parents:
11919
diff
changeset
|
7100 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
|
7101 staticpro (&frame_and_buffer_state); |
|
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
7102 |
|
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
7103 Qdisplay_table = intern ("display-table"); |
|
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
7104 staticpro (&Qdisplay_table); |
|
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
7105 Qredisplay_dont_pause = intern ("redisplay-dont-pause"); |
|
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
7106 staticpro (&Qredisplay_dont_pause); |
|
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
7107 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7108 DEFVAR_INT ("baud-rate", &baud_rate, |
| 40979 | 7109 doc: /* *The output baud rate of the terminal. |
|
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7110 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
|
7111 and the other strategic decisions made during redisplay. */); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
7112 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7113 DEFVAR_BOOL ("inverse-video", &inverse_video, |
| 40979 | 7114 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
|
7115 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
|
7116 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7117 DEFVAR_BOOL ("visible-bell", &visible_bell, |
| 40979 | 7118 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
|
7119 |
|
bee6cc2e8a90
(syms_of_display) <visible-bell>: Add a reference to
Eli Zaretskii <eliz@gnu.org>
parents:
40271
diff
changeset
|
7120 See also `ring-bell-function'. */); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
7121 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7122 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter, |
| 40979 | 7123 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
|
7124 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
|
7125 Emacs's frame display when you reenter Emacs. |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7126 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
|
7127 |
|
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
7128 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
|
7129 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
|
7130 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
|
7131 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
|
7132 |
|
85614
9f3a25157e4f
Make `window-system' into a keyboard-local variable (rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85252
diff
changeset
|
7133 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
|
7134 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
|
7135 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
|
7136 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
|
7137 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7138 DEFVAR_LISP ("window-system-version", &Vwindow_system_version, |
| 40979 | 7139 doc: /* The version number of the window system in use. |
| 85826 | 7140 For X windows, this is 11. */); |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
7141 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7142 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area, |
| 40979 | 7143 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
|
7144 |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7145 DEFVAR_LISP ("glyph-table", &Vglyph_table, |
| 40979 | 7146 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
|
7147 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
|
7148 Each element can be: |
|
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
7149 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
|
7150 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
|
7151 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
|
7152 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
|
7153 while outputting it. */); |
| 314 | 7154 Vglyph_table = Qnil; |
| 7155 | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7156 DEFVAR_LISP ("standard-display-table", &Vstandard_display_table, |
| 40979 | 7157 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
|
7158 See `buffer-display-table' for more information. */); |
| 314 | 7159 Vstandard_display_table = Qnil; |
| 7160 | |
|
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
7161 DEFVAR_BOOL ("redisplay-dont-pause", &redisplay_dont_pause, |
| 40979 | 7162 doc: /* *Non-nil means update isn't paused when input is detected. */); |
| 25012 | 7163 redisplay_dont_pause = 0; |
| 7164 | |
|
71323
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
7165 #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
|
7166 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
|
7167 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
|
7168 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
|
7169 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
|
7170 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
|
7171 #endif |
|
e882f189c3af
Modify preemptive redisplay to be based on periodic checks for input.
Kim F. Storm <storm@cua.dk>
parents:
71211
diff
changeset
|
7172 |
| 314 | 7173 #ifdef CANNOT_DUMP |
| 7174 if (noninteractive) | |
| 7175 #endif | |
| 7176 { | |
|
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
7177 Vinitial_window_system = Qnil; |
| 314 | 7178 Vwindow_system_version = Qnil; |
| 7179 } | |
| 7180 } | |
| 52401 | 7181 |
| 7182 /* arch-tag: 8d812b1f-04a2-4195-a9c4-381f8457a413 | |
| 7183 (do not change this comment) */ |
