annotate src/dispnew.c @ 52987:ac21698ba968

(add-hook): Fix last change.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 03 Nov 2003 14:44:48 +0000
parents 695cf19ef79e
children 4cb0d5b004e9 375f2633d815
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1 /* Updating of data structures for redisplay.
51232
07dc24e888c8 (mode_line_string): Remove unused var `f'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51193
diff changeset
2 Copyright (C) 1985,86,87,88,93,94,95,97,98,1999,2000,01,02,2003
18853
4501a367a887 (direct_output_forward_char): Reenable check against
Richard M. Stallman <rms@gnu.org>
parents: 18774
diff changeset
3 Free Software Foundation, Inc.
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5 This file is part of GNU Emacs.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 GNU Emacs is free software; you can redistribute it and/or modify
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8 it under the terms of the GNU General Public License as published by
1777
4edfaa19c7a7 * window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents: 1766
diff changeset
9 the Free Software Foundation; either version 2, or (at your option)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10 any later version.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 GNU Emacs is distributed in the hope that it will be useful,
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 GNU General Public License for more details.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 along with GNU Emacs; see the file COPYING. If not, write to
14186
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 14125
diff changeset
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 14125
diff changeset
20 Boston, MA 02111-1307, USA. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 25781
diff changeset
22 #include <config.h>
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
23 #include <signal.h>
7900
60795e826dad Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents: 7814
diff changeset
24 #include <stdio.h>
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
25 #include <ctype.h>
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
26
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
27 #ifdef HAVE_UNISTD_H
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
28 #include <unistd.h>
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
29 #endif
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
30
3525
58e789baa27a Include lisp.h earlier (before termhooks.h).
Richard M. Stallman <rms@gnu.org>
parents: 3517
diff changeset
31 #include "lisp.h"
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
32 #include "termchar.h"
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
33 #include "termopts.h"
2198
8d7841ea526f Include termhooks.h.
Richard M. Stallman <rms@gnu.org>
parents: 2132
diff changeset
34 #include "termhooks.h"
13526
34382f4e23cb Always include dispextern.h before cm.h.
Richard M. Stallman <rms@gnu.org>
parents: 13448
diff changeset
35 /* cm.h must come after dispextern.h on Windows. */
13408
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
36 #include "dispextern.h"
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
37 #include "cm.h"
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
38 #include "buffer.h"
17015
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
39 #include "charset.h"
31093
6da961dff718 Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30720
diff changeset
40 #include "keyboard.h"
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
41 #include "frame.h"
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
42 #include "window.h"
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
43 #include "commands.h"
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
44 #include "disptab.h"
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
45 #include "indent.h"
4384
98605d0ea3cf (direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents: 4290
diff changeset
46 #include "intervals.h"
15065
270020829d09 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 14964
diff changeset
47 #include "blockinput.h"
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
48 #include "process.h"
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
49
17015
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
50 /* I don't know why DEC Alpha OSF1 fail to compile this file if we
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
51 include the following file. */
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
52 /* #include "systty.h" */
12917
8da09b463ee4 Include syssignal.h.
Richard M. Stallman <rms@gnu.org>
parents: 12667
diff changeset
53 #include "syssignal.h"
554
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
54
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
55 #ifdef HAVE_X_WINDOWS
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
56 #include "xterm.h"
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
57 #endif /* HAVE_X_WINDOWS */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
58
13408
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
59 #ifdef HAVE_NTGUI
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
60 #include "w32term.h"
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
61 #endif /* HAVE_NTGUI */
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
62
44890
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents: 44815
diff changeset
63 #ifdef MAC_OS
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32468
diff changeset
64 #include "macterm.h"
44890
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents: 44815
diff changeset
65 #endif /* MAC_OS */
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32468
diff changeset
66
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
67 /* Include systime.h after xterm.h to avoid double inclusion of time.h. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
68
7808
52e2eb6245d4 Include systime.h after xterm.h.
Richard M. Stallman <rms@gnu.org>
parents: 7648
diff changeset
69 #include "systime.h"
7558
8497bcb9fb8e (PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents: 7530
diff changeset
70 #include <errno.h>
8497bcb9fb8e (PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents: 7530
diff changeset
71
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
72 /* To get the prototype for `sleep'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
73
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
74 #ifdef HAVE_UNISTD_H
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
75 #include <unistd.h>
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
76 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
77
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
78 /* Get number of chars of output now in the buffer of a stdio stream.
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
79 This ought to be built in in stdio, but it isn't. Some s- files
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
80 override this because their stdio internals differ. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
81
5214
c4bf07b226be (PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents: 5083
diff changeset
82 #ifdef __GNU_LIBRARY__
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
83
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
84 /* The s- file might have overridden the definition with one that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
85 works for the system's C library. But we are using the GNU C
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
86 library, so this is the right definition for every system. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
87
7558
8497bcb9fb8e (PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents: 7530
diff changeset
88 #ifdef GNU_LIBRARY_PENDING_OUTPUT_COUNT
8497bcb9fb8e (PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents: 7530
diff changeset
89 #define PENDING_OUTPUT_COUNT GNU_LIBRARY_PENDING_OUTPUT_COUNT
8497bcb9fb8e (PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents: 7530
diff changeset
90 #else
7443
a9cb818e5316 [__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents: 7247
diff changeset
91 #undef PENDING_OUTPUT_COUNT
5214
c4bf07b226be (PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents: 5083
diff changeset
92 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__bufp - (FILE)->__buffer)
7558
8497bcb9fb8e (PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents: 7530
diff changeset
93 #endif
8497bcb9fb8e (PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents: 7530
diff changeset
94 #else /* not __GNU_LIBRARY__ */
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 25781
diff changeset
95 #if !defined (PENDING_OUTPUT_COUNT) && HAVE_STDIO_EXT_H && HAVE___FPENDING
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 25781
diff changeset
96 #include <stdio_ext.h>
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 25781
diff changeset
97 #define PENDING_OUTPUT_COUNT(FILE) __fpending (FILE)
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 25781
diff changeset
98 #endif
7443
a9cb818e5316 [__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents: 7247
diff changeset
99 #ifndef PENDING_OUTPUT_COUNT
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
100 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
101 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
102 #endif /* not __GNU_LIBRARY__ */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
103
41969
e669966d496e Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents: 41120
diff changeset
104 #if defined(HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES)
29437
979a75b2755b Conditionally include term.h.
Dave Love <fx@gnu.org>
parents: 29336
diff changeset
105 #include <term.h> /* for tgetent */
979a75b2755b Conditionally include term.h.
Dave Love <fx@gnu.org>
parents: 29336
diff changeset
106 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
107
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
108 /* Structure to pass dimensions around. Used for character bounding
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
109 boxes, glyph matrix dimensions and alike. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
110
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
111 struct dim
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
112 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
113 int width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
114 int height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
115 };
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
116
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
117
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
118 /* Function prototypes. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
119
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
120 static struct glyph_matrix *save_current_matrix P_ ((struct frame *));
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
121 static void restore_current_matrix P_ ((struct frame *, struct glyph_matrix *));
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
122 static void fake_current_matrices P_ ((Lisp_Object));
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
123 static void redraw_overlapping_rows P_ ((struct window *, int));
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
124 static void redraw_overlapped_rows P_ ((struct window *, int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
125 static int count_blanks P_ ((struct glyph *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
126 static int count_match P_ ((struct glyph *, struct glyph *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
127 struct glyph *, struct glyph *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
128 static unsigned line_draw_cost P_ ((struct glyph_matrix *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
129 static void update_frame_line P_ ((struct frame *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
130 static struct dim allocate_matrices_for_frame_redisplay
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
131 P_ ((Lisp_Object, int, int, int, int *));
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
132 static void allocate_matrices_for_window_redisplay P_ ((struct window *));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
133 static int realloc_glyph_pool P_ ((struct glyph_pool *, struct dim));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
134 static void adjust_frame_glyphs P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
135 struct glyph_matrix *new_glyph_matrix P_ ((struct glyph_pool *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
136 static void free_glyph_matrix P_ ((struct glyph_matrix *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
137 static void adjust_glyph_matrix P_ ((struct window *, struct glyph_matrix *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
138 int, int, struct dim));
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
139 static void change_frame_size_1 P_ ((struct frame *, int, int, int, int, int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
140 static void swap_glyph_pointers P_ ((struct glyph_row *, struct glyph_row *));
34895
53e52b3525bf Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents: 34893
diff changeset
141 #if GLYPH_DEBUG
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
142 static int glyph_row_slice_p P_ ((struct glyph_row *, struct glyph_row *));
30323
4cd1b8fe118c (direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents: 30307
diff changeset
143 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
144 static void fill_up_frame_row_with_spaces P_ ((struct glyph_row *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
145 static void build_frame_matrix_from_window_tree P_ ((struct glyph_matrix *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
146 struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
147 static void build_frame_matrix_from_leaf_window P_ ((struct glyph_matrix *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
148 struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
149 static struct glyph_pool *new_glyph_pool P_ ((void));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
150 static void free_glyph_pool P_ ((struct glyph_pool *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
151 static void adjust_frame_glyphs_initially P_ ((void));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
152 static void adjust_frame_message_buffer P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
153 static void adjust_decode_mode_spec_buffer P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
154 static void fill_up_glyph_row_with_spaces P_ ((struct glyph_row *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
155 static void build_frame_matrix P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
156 void clear_current_matrices P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
157 void scroll_glyph_matrix_range P_ ((struct glyph_matrix *, int, int,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
158 int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
159 static void clear_window_matrices P_ ((struct window *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
160 static void fill_up_glyph_row_area_with_spaces P_ ((struct glyph_row *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
161 static int scrolling_window P_ ((struct window *, int));
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
162 static int update_window_line P_ ((struct window *, int, int *));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
163 static void update_marginal_area P_ ((struct window *, int, int));
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
164 static int update_text_area P_ ((struct window *, int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
165 static void make_current P_ ((struct glyph_matrix *, struct glyph_matrix *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
166 int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
167 static void mirror_make_current P_ ((struct window *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
168 void check_window_matrix_pointers P_ ((struct window *));
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
169 #if GLYPH_DEBUG
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
170 static void check_matrix_pointers P_ ((struct glyph_matrix *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
171 struct glyph_matrix *));
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
172 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
173 static void mirror_line_dance P_ ((struct window *, int, int, int *, char *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
174 static int update_window_tree P_ ((struct window *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
175 static int update_window P_ ((struct window *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
176 static int update_frame_1 P_ ((struct frame *, int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
177 static void set_window_cursor_after_update P_ ((struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
178 static int row_equal_p P_ ((struct window *, struct glyph_row *,
30152
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
179 struct glyph_row *, int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
180 static void adjust_frame_glyphs_for_window_redisplay P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
181 static void adjust_frame_glyphs_for_frame_redisplay P_ ((struct frame *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
182 static void reverse_rows P_ ((struct glyph_matrix *, int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
183 static int margin_glyphs_to_reserve P_ ((struct window *, int, Lisp_Object));
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
184 static void sync_window_with_frame_matrix_rows P_ ((struct window *));
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
185 struct window *frame_row_to_window P_ ((struct window *, int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
186
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
187
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
188 /* Non-zero means don't pause redisplay for pending input. (This is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
189 for debugging and for a future implementation of EDT-like
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
190 scrolling. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
191
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
192 int redisplay_dont_pause;
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
193
554
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
194 /* Nonzero upon entry to redisplay means do not assume anything about
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
195 current contents of actual terminal frame; clear and redraw it. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
196
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
197 int frame_garbaged;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
198
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
199 /* Nonzero means last display completed. Zero means it was preempted. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
200
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
201 int display_completed;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
202
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
203 /* Lisp variable visible-bell; enables use of screen-flash instead of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
204 audible bell. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
205
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
206 int visible_bell;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
207
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
208 /* Invert the color of the whole frame, at a low level. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
209
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
210 int inverse_video;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
211
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
212 /* Line speed of the terminal. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
213
43713
f92c4d87863a Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42835
diff changeset
214 EMACS_INT baud_rate;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
215
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
216 /* Either nil or a symbol naming the window system under which Emacs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
217 is running. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
218
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
219 Lisp_Object Vwindow_system;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
220
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
221 /* Version number of X windows: 10, 11 or nil. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
222
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
223 Lisp_Object Vwindow_system_version;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
224
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
225 /* Vector of glyph definitions. Indexed by glyph number, the contents
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
226 are a string which is how to output the glyph.
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
227
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
228 If Vglyph_table is nil, a glyph is output by using its low 8 bits
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
229 as a character code.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
230
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
231 This is an obsolete feature that is no longer used. The variable
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
232 is retained for compatibility. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
233
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
234 Lisp_Object Vglyph_table;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
235
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
236 /* Display table to use for vectors that don't specify their own. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
237
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
238 Lisp_Object Vstandard_display_table;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
239
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
240 /* Nonzero means reading single-character input with prompt so put
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
241 cursor on mini-buffer after the prompt. Positive means at end of
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
242 text in echo area; negative means at beginning of line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
243
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
244 int cursor_in_echo_area;
13220
2e9014617492 (Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13105
diff changeset
245
30720
64f3338f72d8 (Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30713
diff changeset
246 Lisp_Object Qdisplay_table, Qredisplay_dont_pause;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
247
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
248
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
249 /* The currently selected frame. In a single-frame version, this
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
250 variable always equals the_only_frame. */
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
251
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
252 Lisp_Object selected_frame;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
253
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
254 /* A frame which is not just a mini-buffer, or 0 if there are no such
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
255 frames. This is usually the most recent such frame that was
9572
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9303
diff changeset
256 selected. In a single-frame version, this variable always holds
b36d5e88cccc *** empty log message ***
Morten Welinder <terra@diku.dk>
parents: 9303
diff changeset
257 the address of the_only_frame. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
258
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
259 struct frame *last_nonminibuf_frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
260
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
261 /* Stdio stream being used for copy of all output. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
262
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
263 FILE *termscript;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
264
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
265 /* Structure for info on cursor positioning. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
266
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
267 struct cm Wcm;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
268
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
269 /* 1 means SIGWINCH happened when not safe. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
270
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
271 int delayed_size_change;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
272
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
273 /* 1 means glyph initialization has been completed at startup. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
274
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
275 static int glyphs_initialized_initially_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
276
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
277 /* Updated window if != 0. Set by update_window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
278
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
279 struct window *updated_window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
280
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
281 /* Glyph row updated in update_window_line, and area that is updated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
282
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
283 struct glyph_row *updated_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
284 int updated_area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
285
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
286 /* A glyph for a space. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
287
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
288 struct glyph space_glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
289
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
290 /* Non-zero means update has been performed directly, so that there's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
291 no need for redisplay_internal to do much work. Set by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
292 direct_output_for_insert. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
293
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
294 int redisplay_performed_directly_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
295
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
296 /* Counts of allocated structures. These counts serve to diagnose
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
297 memory leaks and double frees. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
298
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
299 int glyph_matrix_count;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
300 int glyph_pool_count;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
301
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
302 /* If non-null, the frame whose frame matrices are manipulated. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
303 null, window matrices are worked on. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
304
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
305 static struct frame *frame_matrix_frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
306
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
307 /* Current interface for window-based redisplay. Set from init_xterm.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
308 A null value means we are not using window-based redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
309
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
310 struct redisplay_interface *rif;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
311
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
312 /* Non-zero means that fonts have been loaded since the last glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
313 matrix adjustments. Redisplay must stop, and glyph matrices must
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
314 be adjusted when this flag becomes non-zero during display. The
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
315 reason fonts can be loaded so late is that fonts of fontsets are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
316 loaded on demand. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
317
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
318 int fonts_changed_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
319
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
320 /* Convert vpos and hpos from frame to window and vice versa.
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
321 This may only be used for terminal frames. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
322
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
323 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
324
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
325 static int window_to_frame_vpos P_ ((struct window *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
326 static int window_to_frame_hpos P_ ((struct window *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
327 #define WINDOW_TO_FRAME_VPOS(W, VPOS) window_to_frame_vpos ((W), (VPOS))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
328 #define WINDOW_TO_FRAME_HPOS(W, HPOS) window_to_frame_hpos ((W), (HPOS))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
329
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
330 /* One element of the ring buffer containing redisplay history
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
331 information. */
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
332
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
333 struct redisplay_history
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
334 {
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
335 char trace[512 + 100];
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
336 };
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
337
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
338 /* The size of the history buffer. */
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
339
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
340 #define REDISPLAY_HISTORY_SIZE 30
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
341
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
342 /* The redisplay history buffer. */
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
343
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
344 static struct redisplay_history redisplay_history[REDISPLAY_HISTORY_SIZE];
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
345
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
346 /* Next free entry in redisplay_history. */
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
347
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
348 static int history_idx;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
349
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
350 /* A tick that's incremented each time something is added to the
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
351 history. */
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
352
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
353 static unsigned history_tick;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
354
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
355 static void add_frame_display_history P_ ((struct frame *, int));
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
356 static void add_window_display_history P_ ((struct window *, char *, int));
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
357
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
358
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
359 /* Add to the redisplay history how window W has been displayed.
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
360 MSG is a trace containing the information how W's glyph matrix
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
361 has been constructed. PAUSED_P non-zero means that the update
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
362 has been interrupted for pending input. */
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
363
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
364 static void
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
365 add_window_display_history (w, msg, paused_p)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
366 struct window *w;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
367 char *msg;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
368 int paused_p;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
369 {
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
370 char *buf;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
371
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
372 if (history_idx >= REDISPLAY_HISTORY_SIZE)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
373 history_idx = 0;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
374 buf = redisplay_history[history_idx].trace;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
375 ++history_idx;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
376
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
377 sprintf (buf, "%d: window %p (`%s')%s\n",
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
378 history_tick++,
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
379 w,
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
380 ((BUFFERP (w->buffer)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
381 && STRINGP (XBUFFER (w->buffer)->name))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
382 ? (char *) SDATA (XBUFFER (w->buffer)->name)
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
383 : "???"),
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
384 paused_p ? " ***paused***" : "");
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
385 strcat (buf, msg);
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
386 }
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
387
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
388
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
389 /* Add to the redisplay history that frame F has been displayed.
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
390 PAUSED_P non-zero means that the update has been interrupted for
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
391 pending input. */
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
392
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
393 static void
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
394 add_frame_display_history (f, paused_p)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
395 struct frame *f;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
396 int paused_p;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
397 {
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
398 char *buf;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
399
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
400 if (history_idx >= REDISPLAY_HISTORY_SIZE)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
401 history_idx = 0;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
402 buf = redisplay_history[history_idx].trace;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
403 ++history_idx;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
404
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
405 sprintf (buf, "%d: update frame %p%s",
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
406 history_tick++,
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
407 f, paused_p ? " ***paused***" : "");
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
408 }
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
409
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
410
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
411 DEFUN ("dump-redisplay-history", Fdump_redisplay_history,
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
412 Sdump_redisplay_history, 0, 0, "",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
413 doc: /* Dump redisplay history to stderr. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
414 ()
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
415 {
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
416 int i;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
417
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
418 for (i = history_idx - 1; i != history_idx; --i)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
419 {
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
420 if (i < 0)
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
421 i = REDISPLAY_HISTORY_SIZE - 1;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
422 fprintf (stderr, "%s\n", redisplay_history[i].trace);
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
423 }
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
424
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
425 return Qnil;
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
426 }
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
427
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
428
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
429 #else /* GLYPH_DEBUG == 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
430
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
431 #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
432 #define WINDOW_TO_FRAME_HPOS(W, HPOS) ((HPOS) + WINDOW_LEFT_EDGE_COL (W))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
433
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
434 #endif /* GLYPH_DEBUG == 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
435
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
436
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
437 /* Like bcopy except never gets confused by overlap. Let this be the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
438 first function defined in this file, or change emacs.c where the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
439 address of this function is used. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
440
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
441 void
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
442 safe_bcopy (from, to, size)
46551
227785e3e29f (safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents: 46370
diff changeset
443 const char *from;
227785e3e29f (safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents: 46370
diff changeset
444 char *to;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
445 int size;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
446 {
1588
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
447 if (size <= 0 || from == to)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
448 return;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
449
1588
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
450 /* If the source and destination don't overlap, then bcopy can
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
451 handle it. If they do overlap, but the destination is lower in
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
452 memory than the source, we'll assume bcopy can handle that. */
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
453 if (to < from || from + size <= to)
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
454 bcopy (from, to, size);
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
455
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
456 /* Otherwise, we'll copy from the end. */
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
457 else
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
458 {
46551
227785e3e29f (safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents: 46370
diff changeset
459 register const char *endf = from + size;
1588
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
460 register char *endt = to + size;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
461
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
462 /* If TO - FROM is large, then we should break the copy into
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
463 nonoverlapping chunks of TO - FROM bytes each. However, if
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
464 TO - FROM is small, then the bcopy function call overhead
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
465 makes this not worth it. The crossover point could be about
1588
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
466 anywhere. Since I don't think the obvious copy loop is too
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
467 bad, I'm trying to err in its favor. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
468 if (to - from < 64)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
469 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
470 do
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
471 *--endt = *--endf;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
472 while (endf != from);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
473 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
474 else
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
475 {
1588
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
476 for (;;)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
477 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
478 endt -= (to - from);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
479 endf -= (to - from);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
480
1588
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
481 if (endt < to)
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
482 break;
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
483
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
484 bcopy (endf, endt, to - from);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
485 }
1588
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
486
732a88db381f * dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents: 1495
diff changeset
487 /* If SIZE wasn't a multiple of TO - FROM, there will be a
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
488 little left over. The amount left over is (endt + (to -
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
489 from)) - to, which is endt - from. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
490 bcopy (from, to, endt - from);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
491 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
492 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
493 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
494
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
495
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
496
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
497 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
498 Glyph Matrices
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
499 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
500
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
501 /* Allocate and return a glyph_matrix structure. POOL is the glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
502 pool from which memory for the matrix should be allocated, or null
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
503 for window-based redisplay where no glyph pools are used. The
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
504 member `pool' of the glyph matrix structure returned is set to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
505 POOL, the structure is otherwise zeroed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
506
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
507 struct glyph_matrix *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
508 new_glyph_matrix (pool)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
509 struct glyph_pool *pool;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
510 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
511 struct glyph_matrix *result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
512
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
513 /* Allocate and clear. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
514 result = (struct glyph_matrix *) xmalloc (sizeof *result);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
515 bzero (result, sizeof *result);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
516
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
517 /* Increment number of allocated matrices. This count is used
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
518 to detect memory leaks. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
519 ++glyph_matrix_count;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
520
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
521 /* Set pool and return. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
522 result->pool = pool;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
523 return result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
524 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
525
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
526
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
527 /* Free glyph matrix MATRIX. Passing in a null MATRIX is allowed.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
528
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
529 The global counter glyph_matrix_count is decremented when a matrix
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
530 is freed. If the count gets negative, more structures were freed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
531 than allocated, i.e. one matrix was freed more than once or a bogus
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
532 pointer was passed to this function.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
533
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
534 If MATRIX->pool is null, this means that the matrix manages its own
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
535 glyph memory---this is done for matrices on X frames. Freeing the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
536 matrix also frees the glyph memory in this case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
537
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
538 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
539 free_glyph_matrix (matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
540 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
541 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
542 if (matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
543 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
544 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
545
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
546 /* Detect the case that more matrices are freed than were
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
547 allocated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
548 if (--glyph_matrix_count < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
549 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
550
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
551 /* Free glyph memory if MATRIX owns it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
552 if (matrix->pool == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
553 for (i = 0; i < matrix->rows_allocated; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
554 xfree (matrix->rows[i].glyphs[LEFT_MARGIN_AREA]);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
555
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
556 /* Free row structures and the matrix itself. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
557 xfree (matrix->rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
558 xfree (matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
559 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
560 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
561
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
562
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
563 /* Return the number of glyphs to reserve for a marginal area of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
564 window W. TOTAL_GLYPHS is the number of glyphs in a complete
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
565 display line of window W. MARGIN gives the width of the marginal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
566 area in canonical character units. MARGIN should be an integer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
567 or a float. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
568
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
569 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
570 margin_glyphs_to_reserve (w, total_glyphs, margin)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
571 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
572 int total_glyphs;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
573 Lisp_Object margin;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
574 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
575 int n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
576
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
577 if (NUMBERP (margin))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
578 {
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
579 int width = XFASTINT (w->total_cols);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
580 double d = max (0, XFLOATINT (margin));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
581 d = min (width / 2 - 1, d);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
582 n = (int) ((double) total_glyphs / width * d);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
583 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
584 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
585 n = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
586
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
587 return n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
588 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
589
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
590
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
591 /* Adjust glyph matrix MATRIX on window W or on a frame to changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
592 window sizes.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
593
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
594 W is null if the function is called for a frame glyph matrix.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
595 Otherwise it is the window MATRIX is a member of. X and Y are the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
596 indices of the first column and row of MATRIX within the frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
597 matrix, if such a matrix exists. They are zero for purely
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
598 window-based redisplay. DIM is the needed size of the matrix.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
599
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
600 In window-based redisplay, where no frame matrices exist, glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
601 matrices manage their own glyph storage. Otherwise, they allocate
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
602 storage from a common frame glyph pool which can be found in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
603 MATRIX->pool.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
604
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
605 The reason for this memory management strategy is to avoid complete
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
606 frame redraws if possible. When we allocate from a common pool, a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
607 change of the location or size of a sub-matrix within the pool
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
608 requires a complete redisplay of the frame because we cannot easily
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
609 make sure that the current matrices of all windows still agree with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
610 what is displayed on the screen. While this is usually fast, it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
611 leads to screen flickering. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
612
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
613 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
614 adjust_glyph_matrix (w, matrix, x, y, dim)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
615 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
616 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
617 int x, y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
618 struct dim dim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
619 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
620 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
621 int new_rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
622 int marginal_areas_changed_p = 0;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
623 int header_line_changed_p = 0;
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
624 int header_line_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
625 int left = -1, right = -1;
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
626 int window_width = -1, window_height;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
627
52377
a90dea69e764 (adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 51413
diff changeset
628 /* 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
629 Get W's size. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
630 if (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
631 {
52377
a90dea69e764 (adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 51413
diff changeset
632 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
633
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
634 header_line_p = WINDOW_WANTS_HEADER_LINE_P (w);
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
635 header_line_changed_p = header_line_p != matrix->header_line_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
636 }
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
637 matrix->header_line_p = header_line_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
638
52377
a90dea69e764 (adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents: 51413
diff changeset
639 /* 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
640 Do nothing if MATRIX' size, position, vscroll, and marginal areas
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
641 haven't changed. This optimization is important because preserving
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
642 the matrix means preventing redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
643 if (matrix->pool == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
644 {
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
645 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
646 right = margin_glyphs_to_reserve (w, dim.width, w->right_margin_cols);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
647 xassert (left >= 0 && right >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
648 marginal_areas_changed_p = (left != matrix->left_margin_glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
649 || right != matrix->right_margin_glyphs);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
650
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
651 if (!marginal_areas_changed_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
652 && !fonts_changed_p
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
653 && !header_line_changed_p
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
654 && 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
655 && matrix->window_top_line == WINDOW_TOP_EDGE_LINE (w)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
656 && matrix->window_height == window_height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
657 && matrix->window_vscroll == w->vscroll
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
658 && matrix->window_width == window_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
659 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
660 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
661
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
662 /* Enlarge MATRIX->rows if necessary. New rows are cleared. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
663 if (matrix->rows_allocated < dim.height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
664 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
665 int size = dim.height * sizeof (struct glyph_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
666 new_rows = dim.height - matrix->rows_allocated;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
667 matrix->rows = (struct glyph_row *) xrealloc (matrix->rows, size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
668 bzero (matrix->rows + matrix->rows_allocated,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
669 new_rows * sizeof *matrix->rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
670 matrix->rows_allocated = dim.height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
671 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
672 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
673 new_rows = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
674
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
675 /* If POOL is not null, MATRIX is a frame matrix or a window matrix
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
676 on a frame not using window-based redisplay. Set up pointers for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
677 each row into the glyph pool. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
678 if (matrix->pool)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
679 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
680 xassert (matrix->pool->glyphs);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
681
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
682 if (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
683 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
684 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
685 w->left_margin_cols);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
686 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
687 w->right_margin_cols);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
688 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
689 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
690 left = right = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
691
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
692 for (i = 0; i < dim.height; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
693 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
694 struct glyph_row *row = &matrix->rows[i];
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
695
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
696 row->glyphs[LEFT_MARGIN_AREA]
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
697 = (matrix->pool->glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
698 + (y + i) * matrix->pool->ncolumns
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
699 + x);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
700
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
701 if (w == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
702 || row == matrix->rows + dim.height - 1
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
703 || (row == matrix->rows && matrix->header_line_p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
704 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
705 row->glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
706 = row->glyphs[LEFT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
707 row->glyphs[RIGHT_MARGIN_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
708 = row->glyphs[TEXT_AREA] + dim.width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
709 row->glyphs[LAST_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
710 = row->glyphs[RIGHT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
711 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
712 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
713 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
714 row->glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
715 = row->glyphs[LEFT_MARGIN_AREA] + left;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
716 row->glyphs[RIGHT_MARGIN_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
717 = row->glyphs[TEXT_AREA] + dim.width - left - right;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
718 row->glyphs[LAST_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
719 = row->glyphs[LEFT_MARGIN_AREA] + dim.width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
720 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
721 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
722
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
723 matrix->left_margin_glyphs = left;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
724 matrix->right_margin_glyphs = right;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
725 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
726 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
727 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
728 /* 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
729 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
730 Allocate glyph memory from the heap. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
731 if (dim.width > matrix->matrix_w
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
732 || new_rows
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
733 || header_line_changed_p
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
734 || marginal_areas_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
735 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
736 struct glyph_row *row = matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
737 struct glyph_row *end = row + matrix->rows_allocated;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
738
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
739 while (row < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
740 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
741 row->glyphs[LEFT_MARGIN_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
742 = (struct glyph *) xrealloc (row->glyphs[LEFT_MARGIN_AREA],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
743 (dim.width
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
744 * sizeof (struct glyph)));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
745
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
746 /* The mode line never has marginal areas. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
747 if (row == matrix->rows + dim.height - 1
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
748 || (row == matrix->rows && matrix->header_line_p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
749 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
750 row->glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
751 = row->glyphs[LEFT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
752 row->glyphs[RIGHT_MARGIN_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
753 = row->glyphs[TEXT_AREA] + dim.width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
754 row->glyphs[LAST_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
755 = row->glyphs[RIGHT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
756 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
757 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
758 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
759 row->glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
760 = row->glyphs[LEFT_MARGIN_AREA] + left;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
761 row->glyphs[RIGHT_MARGIN_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
762 = row->glyphs[TEXT_AREA] + dim.width - left - right;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
763 row->glyphs[LAST_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
764 = row->glyphs[LEFT_MARGIN_AREA] + dim.width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
765 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
766 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
767 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
768 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
769
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
770 xassert (left >= 0 && right >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
771 matrix->left_margin_glyphs = left;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
772 matrix->right_margin_glyphs = right;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
773 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
774
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
775 /* Number of rows to be used by MATRIX. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
776 matrix->nrows = dim.height;
31932
081edde76197 (adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents: 31850
diff changeset
777 xassert (matrix->nrows >= 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
778
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
779 if (w)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
780 {
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
781 if (matrix == w->current_matrix)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
782 {
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
783 /* 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
784 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
785 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
786 building desired matrices when this function runs. */
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
787 if (window_width < 0)
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
788 window_width = window_box_width (w, -1);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
789
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
790 /* 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
791 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
792 of the window. */
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
793 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
794 && !header_line_changed_p
e293840c7332 (adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents: 36697
diff changeset
795 && new_rows == 0
e293840c7332 (adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents: 36697
diff changeset
796 && dim.width == matrix->matrix_w
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
797 && 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
798 && 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
799 && matrix->window_width == window_width)
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
800 {
38528
c867615c6a26 (adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents: 38489
diff changeset
801 /* Find the last row in the window. */
c867615c6a26 (adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents: 38489
diff changeset
802 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
803 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
804 {
38748
bb32ae33769e (adjust_glyph_matrix): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents: 38734
diff changeset
805 ++i;
38528
c867615c6a26 (adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents: 38489
diff changeset
806 break;
c867615c6a26 (adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents: 38489
diff changeset
807 }
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
808
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
809 /* 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
810 are invalidated below. */
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
811 if (INTEGERP (w->window_end_vpos)
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
812 && XFASTINT (w->window_end_vpos) >= i)
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
813 w->window_end_valid = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
814
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
815 while (i < matrix->nrows)
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
816 matrix->rows[i++].enabled_p = 0;
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
817 }
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
818 else
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
819 {
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
820 for (i = 0; i < matrix->nrows; ++i)
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
821 matrix->rows[i].enabled_p = 0;
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
822 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
823 }
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
824 else if (matrix == w->desired_matrix)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
825 {
35609
83f1f7fbe26e (adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 35445
diff changeset
826 /* 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
827 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
828 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
829 redisplays. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
830 for (i = 0; i < matrix->nrows; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
831 matrix->rows[i].enabled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
832 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
833 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
834
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
835
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
836 /* Remember last values to be able to optimize frame redraws. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
837 matrix->matrix_x = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
838 matrix->matrix_y = y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
839 matrix->matrix_w = dim.width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
840 matrix->matrix_h = dim.height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
841
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
842 /* Record the top y location and height of W at the time the matrix
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
843 was last adjusted. This is used to optimize redisplay above. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
844 if (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
845 {
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
846 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
847 matrix->window_top_line = WINDOW_TOP_EDGE_LINE (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
848 matrix->window_height = window_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
849 matrix->window_width = window_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
850 matrix->window_vscroll = w->vscroll;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
851 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
852 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
853
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
854
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
855 /* Reverse the contents of rows in MATRIX between START and END. The
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
856 contents of the row at END - 1 end up at START, END - 2 at START +
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
857 1 etc. This is part of the implementation of rotate_matrix (see
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
858 below). */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
859
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
860 static void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
861 reverse_rows (matrix, start, end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
862 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
863 int start, end;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
864 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
865 int i, j;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
866
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
867 for (i = start, j = end - 1; i < j; ++i, --j)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
868 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
869 /* Non-ISO HP/UX compiler doesn't like auto struct
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
870 initialization. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
871 struct glyph_row temp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
872 temp = matrix->rows[i];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
873 matrix->rows[i] = matrix->rows[j];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
874 matrix->rows[j] = temp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
875 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
876 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
877
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
878
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
879 /* Rotate the contents of rows in MATRIX in the range FIRST .. LAST -
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
880 1 by BY positions. BY < 0 means rotate left, i.e. towards lower
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
881 indices. (Note: this does not copy glyphs, only glyph pointers in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
882 row structures are moved around).
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
883
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
884 The algorithm used for rotating the vector was, I believe, first
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
885 described by Kernighan. See the vector R as consisting of two
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
886 sub-vectors AB, where A has length BY for BY >= 0. The result
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
887 after rotating is then BA. Reverse both sub-vectors to get ArBr
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
888 and reverse the result to get (ArBr)r which is BA. Similar for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
889 rotating right. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
890
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
891 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
892 rotate_matrix (matrix, first, last, by)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
893 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
894 int first, last, by;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
895 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
896 if (by < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
897 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
898 /* Up (rotate left, i.e. towards lower indices). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
899 by = -by;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
900 reverse_rows (matrix, first, first + by);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
901 reverse_rows (matrix, first + by, last);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
902 reverse_rows (matrix, first, last);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
903 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
904 else if (by > 0)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
905 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
906 /* Down (rotate right, i.e. towards higher indices). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
907 reverse_rows (matrix, last - by, last);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
908 reverse_rows (matrix, first, last - by);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
909 reverse_rows (matrix, first, last);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
910 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
911 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
912
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
913
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
914 /* Increment buffer positions in glyph rows of MATRIX. Do it for rows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
915 with indices START <= index < END. Increment positions by DELTA/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
916 DELTA_BYTES. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
917
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
918 void
28708
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
919 increment_matrix_positions (matrix, start, end, delta, delta_bytes)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
920 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
921 int start, end, delta, delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
922 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
923 /* Check that START and END are reasonable values. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
924 xassert (start >= 0 && start <= matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
925 xassert (end >= 0 && end <= matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
926 xassert (start <= end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
927
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
928 for (; start < end; ++start)
28708
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
929 increment_row_positions (matrix->rows + start, delta, delta_bytes);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
930 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
931
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
932
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
933 /* Enable a range of rows in glyph matrix MATRIX. START and END are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
934 the row indices of the first and last + 1 row to enable. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
935 ENABLED_P is non-zero, enabled_p flags in rows will be set to 1. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
936
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
937 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
938 enable_glyph_matrix_rows (matrix, start, end, enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
939 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
940 int start, end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
941 int enabled_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
942 {
31932
081edde76197 (adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents: 31850
diff changeset
943 xassert (start <= end);
081edde76197 (adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents: 31850
diff changeset
944 xassert (start >= 0 && start < matrix->nrows);
081edde76197 (adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents: 31850
diff changeset
945 xassert (end >= 0 && end <= matrix->nrows);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
946
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
947 for (; start < end; ++start)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
948 matrix->rows[start].enabled_p = enabled_p != 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
949 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
950
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
951
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
952 /* Clear MATRIX.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
953
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
954 This empties all rows in MATRIX by setting the enabled_p flag for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
955 all rows of the matrix to zero. The function prepare_desired_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
956 will eventually really clear a row when it sees one with a zero
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
957 enabled_p flag.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
958
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
959 Resets update hints to defaults value. The only update hint
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
960 currently present is the flag MATRIX->no_scrolling_p. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
961
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
962 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
963 clear_glyph_matrix (matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
964 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
965 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
966 if (matrix)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
967 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
968 enable_glyph_matrix_rows (matrix, 0, matrix->nrows, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
969 matrix->no_scrolling_p = 0;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
970 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
971 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
972
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
973
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
974 /* Shift part of the glyph matrix MATRIX of window W up or down.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
975 Increment y-positions in glyph rows between START and END by DY,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
976 and recompute their visible height. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
977
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
978 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
979 shift_glyph_matrix (w, matrix, start, end, dy)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
980 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
981 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
982 int start, end, dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
983 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
984 int min_y, max_y;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
985
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
986 xassert (start <= end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
987 xassert (start >= 0 && start < matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
988 xassert (end >= 0 && end <= matrix->nrows);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
989
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
990 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
991 max_y = WINDOW_BOX_HEIGHT_NO_MODE_LINE (w);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
992
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
993 for (; start < end; ++start)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
994 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
995 struct glyph_row *row = &matrix->rows[start];
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
996
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
997 row->y += dy;
38587
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
998 row->visible_height = row->height;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
999
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1000 if (row->y < min_y)
38587
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1001 row->visible_height -= min_y - row->y;
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1002 if (row->y + row->height > max_y)
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1003 row->visible_height -= row->y + row->height - max_y;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1004 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1005 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1006
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1007
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1008 /* Mark all rows in current matrices of frame F as invalid. Marking
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1009 invalid is done by setting enabled_p to zero for all rows in a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1010 current matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1011
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1012 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1013 clear_current_matrices (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1014 register struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1015 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1016 /* Clear frame current matrix, if we have one. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1017 if (f->current_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1018 clear_glyph_matrix (f->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1019
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1020 /* Clear the matrix of the menu bar window, if such a window exists.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1021 The menu bar window is currently used to display menus on X when
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1022 no toolkit support is compiled in. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1023 if (WINDOWP (f->menu_bar_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1024 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1025
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
1026 /* 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
1027 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
1028 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1029
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1030 /* Clear current window matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1031 xassert (WINDOWP (FRAME_ROOT_WINDOW (f)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1032 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1033 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1034
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1035
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1036 /* Clear out all display lines of F for a coming redisplay. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1037
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
1038 void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1039 clear_desired_matrices (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1040 register struct frame *f;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1041 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1042 if (f->desired_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1043 clear_glyph_matrix (f->desired_matrix);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1044
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1045 if (WINDOWP (f->menu_bar_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1046 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1047
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
1048 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
1049 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->desired_matrix);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1050
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1051 /* Do it for window matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1052 xassert (WINDOWP (FRAME_ROOT_WINDOW (f)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1053 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1054 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1055
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1056
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1057 /* Clear matrices in window tree rooted in W. If DESIRED_P is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1058 non-zero clear desired matrices, otherwise clear current matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1059
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1060 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1061 clear_window_matrices (w, desired_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1062 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1063 int desired_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1064 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1065 while (w)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1066 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1067 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1068 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1069 xassert (WINDOWP (w->hchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1070 clear_window_matrices (XWINDOW (w->hchild), desired_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1071 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1072 else if (!NILP (w->vchild))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1073 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1074 xassert (WINDOWP (w->vchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1075 clear_window_matrices (XWINDOW (w->vchild), desired_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1076 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1077 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1078 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1079 if (desired_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1080 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1081 else
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1082 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1083 clear_glyph_matrix (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1084 w->window_end_valid = Qnil;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1085 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1086 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1087
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1088 w = NILP (w->next) ? 0 : XWINDOW (w->next);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1089 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1090 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1091
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1092
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1093
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1094 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1095 Glyph Rows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1096
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1097 See dispextern.h for an overall explanation of glyph rows.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1098 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1099
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1100 /* Clear glyph row ROW. Do it in a way that makes it robust against
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1101 changes in the glyph_row structure, i.e. addition or removal of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1102 structure members. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1103
33527
c4c7abc48752 (null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents: 33101
diff changeset
1104 static struct glyph_row null_row;
c4c7abc48752 (null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents: 33101
diff changeset
1105
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1106 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1107 clear_glyph_row (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1108 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1109 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1110 struct glyph *p[1 + LAST_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1111
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1112 /* Save pointers. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1113 p[LEFT_MARGIN_AREA] = row->glyphs[LEFT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1114 p[TEXT_AREA] = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1115 p[RIGHT_MARGIN_AREA] = row->glyphs[RIGHT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1116 p[LAST_AREA] = row->glyphs[LAST_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1117
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1118 /* Clear. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1119 *row = null_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1120
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1121 /* Restore pointers. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1122 row->glyphs[LEFT_MARGIN_AREA] = p[LEFT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1123 row->glyphs[TEXT_AREA] = p[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1124 row->glyphs[RIGHT_MARGIN_AREA] = p[RIGHT_MARGIN_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1125 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
1126
b20d72b7aa4b (clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 29980
diff changeset
1127 #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
1128 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
1129 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
1130 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
1131 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
1132 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
1133 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
1134 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
1135 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1136 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1137
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1138
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1139 /* Make ROW an empty, enabled row of canonical character height,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1140 in window W starting at y-position Y. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1141
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1142 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1143 blank_row (w, row, y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1144 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1145 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1146 int y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1147 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1148 int min_y, max_y;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1149
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
1150 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
1151 max_y = WINDOW_BOX_HEIGHT_NO_MODE_LINE (w);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1152
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1153 clear_glyph_row (row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1154 row->y = y;
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
1155 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
1156 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
1157 row->visible_height = row->height;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1158
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1159 if (row->y < min_y)
38587
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1160 row->visible_height -= min_y - row->y;
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1161 if (row->y + row->height > max_y)
42e75caf68ff (shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents: 38528
diff changeset
1162 row->visible_height -= row->y + row->height - max_y;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1163
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1164 row->enabled_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1165 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1166
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1167
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1168 /* Increment buffer positions in glyph row ROW. DELTA and DELTA_BYTES
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1169 are the amounts by which to change positions. Note that the first
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1170 glyph of the text area of a row can have a buffer position even if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1171 the used count of the text area is zero. Such rows display line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1172 ends. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1173
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1174 void
28708
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
1175 increment_row_positions (row, delta, delta_bytes)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1176 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1177 int delta, delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1178 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1179 int area, i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1180
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1181 /* Increment start and end positions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1182 MATRIX_ROW_START_CHARPOS (row) += delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1183 MATRIX_ROW_START_BYTEPOS (row) += delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1184 MATRIX_ROW_END_CHARPOS (row) += delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1185 MATRIX_ROW_END_BYTEPOS (row) += delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1186
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1187 /* Increment positions in glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1188 for (area = 0; area < LAST_AREA; ++area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1189 for (i = 0; i < row->used[area]; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1190 if (BUFFERP (row->glyphs[area][i].object)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1191 && row->glyphs[area][i].charpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1192 row->glyphs[area][i].charpos += delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1193
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1194 /* Capture the case of rows displaying a line end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1195 if (row->used[TEXT_AREA] == 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1196 && MATRIX_ROW_DISPLAYS_TEXT_P (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1197 row->glyphs[TEXT_AREA]->charpos += delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1198 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1199
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1200
29336
5ccfe8a1638f (find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28708
diff changeset
1201 #if 0
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1202 /* Swap glyphs between two glyph rows A and B. This exchanges glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1203 contents, i.e. glyph structure contents are exchanged between A and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1204 B without changing glyph pointers in A and B. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1205
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1206 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1207 swap_glyphs_in_rows (a, b)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1208 struct glyph_row *a, *b;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1209 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1210 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1211
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1212 for (area = 0; area < LAST_AREA; ++area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1213 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1214 /* Number of glyphs to swap. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1215 int max_used = max (a->used[area], b->used[area]);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1216
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1217 /* Start of glyphs in area of row A. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1218 struct glyph *glyph_a = a->glyphs[area];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1219
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1220 /* End + 1 of glyphs in area of row A. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1221 struct glyph *glyph_a_end = a->glyphs[max_used];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1222
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1223 /* Start of glyphs in area of row B. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1224 struct glyph *glyph_b = b->glyphs[area];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1225
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1226 while (glyph_a < glyph_a_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1227 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1228 /* Non-ISO HP/UX compiler doesn't like auto struct
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1229 initialization. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1230 struct glyph temp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1231 temp = *glyph_a;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1232 *glyph_a = *glyph_b;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1233 *glyph_b = temp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1234 ++glyph_a;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1235 ++glyph_b;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1236 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1237 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1238 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1239
29336
5ccfe8a1638f (find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28708
diff changeset
1240 #endif /* 0 */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1241
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1242 /* Exchange pointers to glyph memory between glyph rows A and B. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1243
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1244 static INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1245 swap_glyph_pointers (a, b)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1246 struct glyph_row *a, *b;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1247 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1248 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1249 for (i = 0; i < LAST_AREA + 1; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1250 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1251 struct glyph *temp = a->glyphs[i];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1252 a->glyphs[i] = b->glyphs[i];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1253 b->glyphs[i] = temp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1254 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1255 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1256
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1257
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1258 /* Copy glyph row structure FROM to glyph row structure TO, except
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1259 that glyph pointers in the structures are left unchanged. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1260
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1261 INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1262 copy_row_except_pointers (to, from)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1263 struct glyph_row *to, *from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1264 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1265 struct glyph *pointers[1 + LAST_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1266
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1267 /* Save glyph pointers of TO. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1268 bcopy (to->glyphs, pointers, sizeof to->glyphs);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1269
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1270 /* Do a structure assignment. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1271 *to = *from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1272
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1273 /* Restore original pointers of TO. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1274 bcopy (pointers, to->glyphs, sizeof to->glyphs);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1275 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1276
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1277
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1278 /* Copy contents of glyph row FROM to glyph row TO. Glyph pointers in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1279 TO and FROM are left unchanged. Glyph contents are copied from the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1280 glyph memory of FROM to the glyph memory of TO. Increment buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1281 positions in row TO by DELTA/ DELTA_BYTES. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1282
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1283 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1284 copy_glyph_row_contents (to, from, delta, delta_bytes)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1285 struct glyph_row *to, *from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1286 int delta, delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1287 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1288 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1289
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1290 /* This is like a structure assignment TO = FROM, except that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1291 glyph pointers in the rows are left unchanged. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1292 copy_row_except_pointers (to, from);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1293
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1294 /* Copy glyphs from FROM to TO. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1295 for (area = 0; area < LAST_AREA; ++area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1296 if (from->used[area])
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1297 bcopy (from->glyphs[area], to->glyphs[area],
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1298 from->used[area] * sizeof (struct glyph));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1299
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1300 /* Increment buffer positions in TO by DELTA. */
28708
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
1301 increment_row_positions (to, delta, delta_bytes);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1302 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1303
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1304
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1305 /* Assign glyph row FROM to glyph row TO. This works like a structure
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1306 assignment TO = FROM, except that glyph pointers are not copied but
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1307 exchanged between TO and FROM. Pointers must be exchanged to avoid
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1308 a memory leak. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1309
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1310 static INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1311 assign_row (to, from)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1312 struct glyph_row *to, *from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1313 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1314 swap_glyph_pointers (to, from);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1315 copy_row_except_pointers (to, from);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1316 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1317
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1318
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1319 /* Test whether the glyph memory of the glyph row WINDOW_ROW, which is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1320 a row in a window matrix, is a slice of the glyph memory of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1321 glyph row FRAME_ROW which is a row in a frame glyph matrix. Value
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1322 is non-zero if the glyph memory of WINDOW_ROW is part of the glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1323 memory of FRAME_ROW. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1324
34893
779bd3fa820e Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents: 34866
diff changeset
1325 #if GLYPH_DEBUG
30323
4cd1b8fe118c (direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents: 30307
diff changeset
1326
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1327 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1328 glyph_row_slice_p (window_row, frame_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1329 struct glyph_row *window_row, *frame_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1330 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1331 struct glyph *window_glyph_start = window_row->glyphs[0];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1332 struct glyph *frame_glyph_start = frame_row->glyphs[0];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1333 struct glyph *frame_glyph_end = frame_row->glyphs[LAST_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1334
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1335 return (frame_glyph_start <= window_glyph_start
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1336 && window_glyph_start < frame_glyph_end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1337 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1338
30323
4cd1b8fe118c (direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents: 30307
diff changeset
1339 #endif /* GLYPH_DEBUG */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1340
29336
5ccfe8a1638f (find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28708
diff changeset
1341 #if 0
5ccfe8a1638f (find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28708
diff changeset
1342
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1343 /* Find the row in the window glyph matrix WINDOW_MATRIX being a slice
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1344 of ROW in the frame matrix FRAME_MATRIX. Value is null if no row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1345 in WINDOW_MATRIX is found satisfying the condition. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1346
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1347 static struct glyph_row *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1348 find_glyph_row_slice (window_matrix, frame_matrix, row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1349 struct glyph_matrix *window_matrix, *frame_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1350 int row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1351 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1352 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1353
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1354 xassert (row >= 0 && row < frame_matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1355
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1356 for (i = 0; i < window_matrix->nrows; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1357 if (glyph_row_slice_p (window_matrix->rows + i,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1358 frame_matrix->rows + row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1359 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1360
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1361 return i < window_matrix->nrows ? window_matrix->rows + i : 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1362 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1363
29336
5ccfe8a1638f (find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28708
diff changeset
1364 #endif /* 0 */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1365
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1366 /* Prepare ROW for display. Desired rows are cleared lazily,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1367 i.e. they are only marked as to be cleared by setting their
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1368 enabled_p flag to zero. When a row is to be displayed, a prior
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1369 call to this function really clears it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1370
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1371 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1372 prepare_desired_row (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1373 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1374 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1375 if (!row->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1376 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1377 clear_glyph_row (row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1378 row->enabled_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1379 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1380 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1381
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1382
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1383 /* Return a hash code for glyph row ROW. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1384
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1385 int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1386 line_hash_code (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1387 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1388 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1389 int hash = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1390
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1391 if (row->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1392 {
40075
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1393 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
1394 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
1395
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1396 while (glyph < end)
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1397 {
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1398 int c = glyph->u.ch;
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1399 int face_id = glyph->face_id;
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1400 if (must_write_spaces)
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1401 c -= SPACEGLYPH;
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1402 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
1403 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
1404 ++glyph;
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1405 }
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1406
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1407 if (hash == 0)
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
1408 hash = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1409 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1410
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1411 return hash;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1412 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1413
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1414
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
1415 /* Return the cost of drawing line VPOS in MATRIX. The cost equals
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1416 the number of characters in the line. If must_write_spaces is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1417 zero, leading and trailing spaces are ignored. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1418
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1419 static unsigned int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1420 line_draw_cost (matrix, vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1421 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1422 int vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1423 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1424 struct glyph_row *row = matrix->rows + vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1425 struct glyph *beg = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1426 struct glyph *end = beg + row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1427 int len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1428 Lisp_Object *glyph_table_base = GLYPH_TABLE_BASE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1429 int glyph_table_len = GLYPH_TABLE_LENGTH;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1430
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1431 /* Ignore trailing and leading spaces if we can. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1432 if (!must_write_spaces)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1433 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1434 /* 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
1435 while (end > beg && CHAR_GLYPH_SPACE_P (*(end - 1)))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1436 --end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1437
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1438 /* All blank line. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1439 if (end == beg)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1440 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1441
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1442 /* Skip over leading spaces. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1443 while (CHAR_GLYPH_SPACE_P (*beg))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1444 ++beg;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1445 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1446
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1447 /* If we don't have a glyph-table, each glyph is one character,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1448 so return the number of glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1449 if (glyph_table_base == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1450 len = end - beg;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1451 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1452 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1453 /* Otherwise, scan the glyphs and accumulate their total length
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1454 in LEN. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1455 len = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1456 while (beg < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1457 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1458 GLYPH g = GLYPH_FROM_CHAR_GLYPH (*beg);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1459
26998
02e902f732d1 (line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents: 26902
diff changeset
1460 if (g < 0
02e902f732d1 (line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents: 26902
diff changeset
1461 || GLYPH_SIMPLE_P (glyph_table_base, glyph_table_len, g))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1462 len += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1463 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1464 len += GLYPH_LENGTH (glyph_table_base, g);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1465
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1466 ++beg;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1467 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1468 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1469
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1470 return len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1471 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1472
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1473
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1474 /* Test two glyph rows A and B for equality. Value is non-zero if A
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1475 and B have equal contents. W is the window to which the glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1476 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
1477 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
1478 flags of A and B, too. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1479
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1480 static INLINE int
30152
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
1481 row_equal_p (w, a, b, mouse_face_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1482 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1483 struct glyph_row *a, *b;
30152
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
1484 int mouse_face_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1485 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1486 if (a == b)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1487 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1488 else if (a->hash != b->hash)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1489 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1490 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1491 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1492 struct glyph *a_glyph, *b_glyph, *a_end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1493 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1494
30152
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
1495 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
1496 return 0;
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
1497
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1498 /* Compare glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1499 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1500 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1501 if (a->used[area] != b->used[area])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1502 return 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1503
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1504 a_glyph = a->glyphs[area];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1505 a_end = a_glyph + a->used[area];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1506 b_glyph = b->glyphs[area];
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1507
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1508 while (a_glyph < a_end
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1509 && GLYPH_EQUAL_P (a_glyph, b_glyph))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1510 ++a_glyph, ++b_glyph;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1511
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1512 if (a_glyph != a_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1513 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1514 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1515
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1516 if (a->truncated_on_left_p != b->truncated_on_left_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1517 || a->fill_line_p != b->fill_line_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1518 || a->truncated_on_right_p != b->truncated_on_right_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1519 || a->overlay_arrow_p != b->overlay_arrow_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1520 || a->continued_p != b->continued_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1521 || a->indicate_empty_line_p != b->indicate_empty_line_p
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
1522 || a->overlapped_p != b->overlapped_p
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1523 || (MATRIX_ROW_CONTINUATION_LINE_P (a)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1524 != MATRIX_ROW_CONTINUATION_LINE_P (b))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1525 /* Different partially visible characters on left margin. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1526 || a->x != b->x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1527 /* Different height. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1528 || a->ascent != b->ascent
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
1529 || a->phys_ascent != b->phys_ascent
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
1530 || a->phys_height != b->phys_height
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1531 || a->visible_height != b->visible_height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1532 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1533 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1534
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1535 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1536 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1537
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1538
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1539
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1540 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1541 Glyph Pool
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1542
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1543 See dispextern.h for an overall explanation of glyph pools.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1544 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1545
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1546 /* Allocate a glyph_pool structure. The structure returned is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1547 initialized with zeros. The global variable glyph_pool_count is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1548 incremented for each pool allocated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1549
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1550 static struct glyph_pool *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1551 new_glyph_pool ()
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1552 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1553 struct glyph_pool *result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1554
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1555 /* Allocate a new glyph_pool and clear it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1556 result = (struct glyph_pool *) xmalloc (sizeof *result);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1557 bzero (result, sizeof *result);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1558
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1559 /* For memory leak and double deletion checking. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1560 ++glyph_pool_count;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1561
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1562 return result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1563 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1564
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1565
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1566 /* Free a glyph_pool structure POOL. The function may be called with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1567 a null POOL pointer. The global variable glyph_pool_count is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1568 decremented with every pool structure freed. If this count gets
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1569 negative, more structures were freed than allocated, i.e. one
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1570 structure must have been freed more than once or a bogus pointer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1571 was passed to free_glyph_pool. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1572
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1573 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1574 free_glyph_pool (pool)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1575 struct glyph_pool *pool;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1576 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1577 if (pool)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1578 {
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
1579 /* More freed than allocated? */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1580 --glyph_pool_count;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1581 xassert (glyph_pool_count >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1582
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1583 xfree (pool->glyphs);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1584 xfree (pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1585 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1586 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1587
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1588
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1589 /* Enlarge a glyph pool POOL. MATRIX_DIM gives the number of rows and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1590 columns we need. This function never shrinks a pool. The only
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1591 case in which this would make sense, would be when a frame's size
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1592 is changed from a large value to a smaller one. But, if someone
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1593 does it once, we can expect that he will do it again.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1594
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1595 Value is non-zero if the pool changed in a way which makes
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1596 re-adjusting window glyph matrices necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1597
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1598 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1599 realloc_glyph_pool (pool, matrix_dim)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1600 struct glyph_pool *pool;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1601 struct dim matrix_dim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1602 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1603 int needed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1604 int changed_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1605
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1606 changed_p = (pool->glyphs == 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1607 || matrix_dim.height != pool->nrows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1608 || matrix_dim.width != pool->ncolumns);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1609
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1610 /* Enlarge the glyph pool. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1611 needed = matrix_dim.width * matrix_dim.height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1612 if (needed > pool->nglyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1613 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1614 int size = needed * sizeof (struct glyph);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1615
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1616 if (pool->glyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1617 pool->glyphs = (struct glyph *) xrealloc (pool->glyphs, size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1618 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1619 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1620 pool->glyphs = (struct glyph *) xmalloc (size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1621 bzero (pool->glyphs, size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1622 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1623
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1624 pool->nglyphs = needed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1625 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1626
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
1627 /* Remember the number of rows and columns because (a) we use them
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1628 to do sanity checks, and (b) the number of columns determines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1629 where rows in the frame matrix start---this must be available to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1630 determine pointers to rows of window sub-matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1631 pool->nrows = matrix_dim.height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1632 pool->ncolumns = matrix_dim.width;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1633
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1634 return changed_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1635 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1636
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1637
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1638
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1639 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1640 Debug Code
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1641 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1642
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1643 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1644
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1645
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1646 /* Flush standard output. This is sometimes useful to call from
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1647 the debugger. */
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1648
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1649 void
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1650 flush_stdout ()
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1651 {
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1652 fflush (stdout);
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1653 }
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1654
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
1655
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1656 /* Check that no glyph pointers have been lost in MATRIX. If a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1657 pointer has been lost, e.g. by using a structure assignment between
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1658 rows, at least one pointer must occur more than once in the rows of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1659 MATRIX. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1660
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1661 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1662 check_matrix_pointer_lossage (matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1663 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1664 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1665 int i, j;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1666
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1667 for (i = 0; i < matrix->nrows; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1668 for (j = 0; j < matrix->nrows; ++j)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1669 xassert (i == j
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1670 || (matrix->rows[i].glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1671 != matrix->rows[j].glyphs[TEXT_AREA]));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1672 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1673
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1674
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1675 /* Get a pointer to glyph row ROW in MATRIX, with bounds checks. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1676
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1677 struct glyph_row *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1678 matrix_row (matrix, row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1679 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1680 int row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1681 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1682 xassert (matrix && matrix->rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1683 xassert (row >= 0 && row < matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1684
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1685 /* That's really too slow for normal testing because this function
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1686 is called almost everywhere. Although---it's still astonishingly
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1687 fast, so it is valuable to have for debugging purposes. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1688 #if 0
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1689 check_matrix_pointer_lossage (matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1690 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1691
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1692 return matrix->rows + row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1693 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1694
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1695
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1696 #if 0 /* This function makes invalid assumptions when text is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1697 partially invisible. But it might come handy for debugging
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1698 nevertheless. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1699
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1700 /* Check invariants that must hold for an up to date current matrix of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1701 window W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1702
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1703 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1704 check_matrix_invariants (w)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1705 struct window *w;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1706 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1707 struct glyph_matrix *matrix = w->current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1708 int yb = window_text_bottom_y (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1709 struct glyph_row *row = matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1710 struct glyph_row *last_text_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1711 struct buffer *saved = current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1712 struct buffer *buffer = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1713 int c;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1714
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1715 /* This can sometimes happen for a fresh window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1716 if (matrix->nrows < 2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1717 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1718
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1719 set_buffer_temp (buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1720
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1721 /* Note: last row is always reserved for the mode line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1722 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1723 && MATRIX_ROW_BOTTOM_Y (row) < yb)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1724 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1725 struct glyph_row *next = row + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1726
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1727 if (MATRIX_ROW_DISPLAYS_TEXT_P (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1728 last_text_row = row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1729
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1730 /* Check that character and byte positions are in sync. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1731 xassert (MATRIX_ROW_START_BYTEPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1732 == CHAR_TO_BYTE (MATRIX_ROW_START_CHARPOS (row)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1733
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1734 /* CHAR_TO_BYTE aborts when invoked for a position > Z. We can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1735 have such a position temporarily in case of a minibuffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1736 displaying something like `[Sole completion]' at its end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1737 if (MATRIX_ROW_END_CHARPOS (row) < BUF_ZV (current_buffer))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1738 xassert (MATRIX_ROW_END_BYTEPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1739 == CHAR_TO_BYTE (MATRIX_ROW_END_CHARPOS (row)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1740
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1741 /* Check that end position of `row' is equal to start position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1742 of next row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1743 if (next->enabled_p && MATRIX_ROW_DISPLAYS_TEXT_P (next))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1744 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1745 xassert (MATRIX_ROW_END_CHARPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1746 == MATRIX_ROW_START_CHARPOS (next));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1747 xassert (MATRIX_ROW_END_BYTEPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1748 == MATRIX_ROW_START_BYTEPOS (next));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1749 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1750 row = next;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1751 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1752
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1753 xassert (w->current_matrix->nrows == w->desired_matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1754 xassert (w->desired_matrix->rows != NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1755 set_buffer_temp (saved);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1756 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1757
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1758 #endif /* 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1759
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1760 #endif /* GLYPH_DEBUG != 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1761
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1762
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1763
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1764 /**********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1765 Allocating/ Adjusting Glyph Matrices
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1766 **********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1767
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1768 /* Allocate glyph matrices over a window tree for a frame-based
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1769 redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1770
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1771 X and Y are column/row within the frame glyph matrix where
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1772 sub-matrices for the window tree rooted at WINDOW must be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1773 allocated. CH_DIM contains the dimensions of the smallest
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1774 character that could be used during display. DIM_ONLY_P non-zero
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1775 means that the caller of this function is only interested in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1776 result matrix dimension, and matrix adjustments should not be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1777 performed.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1778
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1779 The function returns the total width/height of the sub-matrices of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1780 the window tree. If called on a frame root window, the computation
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1781 will take the mini-buffer window into account.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1782
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1783 *WINDOW_CHANGE_FLAGS is set to a bit mask with bits
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1784
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1785 NEW_LEAF_MATRIX set if any window in the tree did not have a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1786 glyph matrices yet, and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1787
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1788 CHANGED_LEAF_MATRIX set if the dimension or location of a matrix of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1789 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
1790 DIM_ONLY_P)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1791
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1792 *WINDOW_CHANGE_FLAGS must be initialized by the caller of this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1793 function.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1794
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1795 Windows are arranged into chains of windows on the same level
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1796 through the next fields of window structures. Such a level can be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1797 either a sequence of horizontally adjacent windows from left to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1798 right, or a sequence of vertically adjacent windows from top to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1799 bottom. Each window in a horizontal sequence can be either a leaf
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1800 window or a vertical sequence; a window in a vertical sequence can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1801 be either a leaf or a horizontal sequence. All windows in a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1802 horizontal sequence have the same height, and all windows in a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1803 vertical sequence have the same width.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1804
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1805 This function uses, for historical reasons, a more general
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1806 algorithm to determine glyph matrix dimensions that would be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1807 necessary.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1808
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1809 The matrix height of a horizontal sequence is determined by the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1810 maximum height of any matrix in the sequence. The matrix width of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1811 a horizontal sequence is computed by adding up matrix widths of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1812 windows in the sequence.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1813
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1814 |<------- result width ------->|
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1815 +---------+----------+---------+ ---
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1816 | | | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1817 | | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1818 +---------+ | | result height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1819 | +---------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1820 | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1821 +----------+ ---
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1822
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1823 The matrix width of a vertical sequence is the maximum matrix width
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1824 of any window in the sequence. Its height is computed by adding up
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1825 matrix heights of windows in the sequence.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1826
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1827 |<---- result width -->|
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1828 +---------+ ---
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1829 | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1830 | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1831 +---------+--+ |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1832 | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1833 | | result height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1834 | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1835 +------------+---------+ |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1836 | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1837 | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1838 +------------+---------+ --- */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1839
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1840 /* Bit indicating that a new matrix will be allocated or has been
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1841 allocated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1842
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1843 #define NEW_LEAF_MATRIX (1 << 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1844
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1845 /* Bit indicating that a matrix will or has changed its location or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1846 size. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1847
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1848 #define CHANGED_LEAF_MATRIX (1 << 1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1849
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1850 static struct dim
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1851 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
1852 window_change_flags)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1853 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1854 int x, y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1855 int dim_only_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1856 int *window_change_flags;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1857 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1858 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1859 int x0 = x, y0 = y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1860 int wmax = 0, hmax = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1861 struct dim total;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1862 struct dim dim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1863 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1864 int in_horz_combination_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1865
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1866 /* What combination is WINDOW part of? Compute this once since the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1867 result is the same for all windows in the `next' chain. The
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1868 special case of a root window (parent equal to nil) is treated
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1869 like a vertical combination because a root window's `next'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1870 points to the mini-buffer window, if any, which is arranged
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1871 vertically below other windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1872 in_horz_combination_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1873 = (!NILP (XWINDOW (window)->parent)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1874 && !NILP (XWINDOW (XWINDOW (window)->parent)->hchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1875
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1876 /* For WINDOW and all windows on the same level. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1877 do
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1878 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1879 w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1880
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1881 /* 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
1882 on whether this is a combination or a leaf window. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1883 if (!NILP (w->hchild))
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1884 dim = allocate_matrices_for_frame_redisplay (w->hchild, x, y,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1885 dim_only_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1886 window_change_flags);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1887 else if (!NILP (w->vchild))
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1888 dim = allocate_matrices_for_frame_redisplay (w->vchild, x, y,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1889 dim_only_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1890 window_change_flags);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1891 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1892 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1893 /* If not already done, allocate sub-matrix structures. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1894 if (w->desired_matrix == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1895 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1896 w->desired_matrix = new_glyph_matrix (f->desired_pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1897 w->current_matrix = new_glyph_matrix (f->current_pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1898 *window_change_flags |= NEW_LEAF_MATRIX;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1899 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1900
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1901 /* Width and height MUST be chosen so that there are no
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1902 holes in the frame matrix. */
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1903 dim.width = required_matrix_width (w);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1904 dim.height = required_matrix_height (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1905
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1906 /* Will matrix be re-allocated? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1907 if (x != w->desired_matrix->matrix_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1908 || y != w->desired_matrix->matrix_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1909 || dim.width != w->desired_matrix->matrix_w
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1910 || dim.height != w->desired_matrix->matrix_h
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1911 || (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
1912 w->right_margin_cols)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1913 != w->desired_matrix->left_margin_glyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1914 || (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
1915 w->left_margin_cols)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1916 != w->desired_matrix->right_margin_glyphs))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1917 *window_change_flags |= CHANGED_LEAF_MATRIX;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1918
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1919 /* Actually change matrices, if allowed. Do not consider
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1920 CHANGED_LEAF_MATRIX computed above here because the pool
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1921 may have been changed which we don't now here. We trust
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1922 that we only will be called with DIM_ONLY_P != 0 when
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1923 necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1924 if (!dim_only_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1925 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1926 adjust_glyph_matrix (w, w->desired_matrix, x, y, dim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1927 adjust_glyph_matrix (w, w->current_matrix, x, y, dim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1928 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1929 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1930
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1931 /* If we are part of a horizontal combination, advance x for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1932 windows to the right of W; otherwise advance y for windows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1933 below W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1934 if (in_horz_combination_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1935 x += dim.width;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1936 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1937 y += dim.height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1938
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1939 /* Remember maximum glyph matrix dimensions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1940 wmax = max (wmax, dim.width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1941 hmax = max (hmax, dim.height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1942
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1943 /* Next window on same level. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1944 window = w->next;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1945 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1946 while (!NILP (window));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1947
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1948 /* Set `total' to the total glyph matrix dimension of this window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1949 level. In a vertical combination, the width is the width of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1950 widest window; the height is the y we finally reached, corrected
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1951 by the y we started with. In a horizontal combination, the total
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1952 height is the height of the tallest window, and the width is the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1953 x we finally reached, corrected by the x we started with. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1954 if (in_horz_combination_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1955 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1956 total.width = x - x0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1957 total.height = hmax;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1958 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1959 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1960 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1961 total.width = wmax;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1962 total.height = y - y0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1963 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1964
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1965 return total;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1966 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1967
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
1968
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1969 /* 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
1970
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1971 int
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1972 required_matrix_height (w)
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1973 struct window *w;
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1974 {
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1975 #ifdef HAVE_WINDOW_SYSTEM
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1976 struct frame *f = XFRAME (w->frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1977
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1978 if (FRAME_WINDOW_P (f))
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1979 {
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1980 int ch_height = FRAME_SMALLEST_FONT_HEIGHT (f);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1981 int window_pixel_height = window_box_height (w) + abs (w->vscroll);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1982 return (((window_pixel_height + ch_height - 1)
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1983 / ch_height)
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1984 /* 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
1985 bottom of the window. */
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1986 + 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
1987 /* 2 for header and mode line. */
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1988 + 2);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1989 }
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1990 #endif /* HAVE_WINDOW_SYSTEM */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
1991
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
1992 return WINDOW_TOTAL_LINES (w);
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1993 }
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1994
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1995
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1996 /* 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
1997
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1998 int
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
1999 required_matrix_width (w)
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2000 struct window *w;
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2001 {
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2002 #ifdef HAVE_WINDOW_SYSTEM
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2003 struct frame *f = XFRAME (w->frame);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2004 if (FRAME_WINDOW_P (f))
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2005 {
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2006 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
2007 int window_pixel_width = WINDOW_TOTAL_WIDTH (w);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2008
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2009 /* 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
2010 return (((window_pixel_width + ch_width - 1)
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2011 / ch_width)
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2012 /* 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
2013 + 2
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2014 /* One partially visible column at the right
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2015 edge of each marginal area. */
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2016 + 1 + 1);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2017 }
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2018 #endif /* HAVE_WINDOW_SYSTEM */
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2019
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2020 return XINT (w->total_cols);
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2021 }
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2022
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2023
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2024 /* Allocate window matrices for window-based redisplay. W is the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2025 window whose matrices must be allocated/reallocated. CH_DIM is the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2026 size of the smallest character that could potentially be used on W. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2027
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2028 static void
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2029 allocate_matrices_for_window_redisplay (w)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2030 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2031 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2032 while (w)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2033 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2034 if (!NILP (w->vchild))
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2035 allocate_matrices_for_window_redisplay (XWINDOW (w->vchild));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2036 else if (!NILP (w->hchild))
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2037 allocate_matrices_for_window_redisplay (XWINDOW (w->hchild));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2038 else
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2039 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2040 /* W is a leaf window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2041 struct dim dim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2042
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2043 /* If matrices are not yet allocated, allocate them now. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2044 if (w->desired_matrix == NULL)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2045 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2046 w->desired_matrix = new_glyph_matrix (NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2047 w->current_matrix = new_glyph_matrix (NULL);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2048 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2049
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2050 dim.width = required_matrix_width (w);
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2051 dim.height = required_matrix_height (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2052 adjust_glyph_matrix (w, w->desired_matrix, 0, 0, dim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2053 adjust_glyph_matrix (w, w->current_matrix, 0, 0, dim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2054 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2055
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2056 w = NILP (w->next) ? NULL : XWINDOW (w->next);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2057 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2058 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2059
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2060
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2061 /* Re-allocate/ re-compute glyph matrices on frame F. If F is null,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2062 do it for all frames; otherwise do it just for the given frame.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2063 This function must be called when a new frame is created, its size
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2064 changes, or its window configuration changes. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2065
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2066 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2067 adjust_glyphs (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2068 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2069 {
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
2070 /* 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
2071 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
2072 BLOCK_INPUT;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
2073
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2074 if (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2075 adjust_frame_glyphs (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2076 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2077 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2078 Lisp_Object tail, lisp_frame;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2079
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2080 FOR_EACH_FRAME (tail, lisp_frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2081 adjust_frame_glyphs (XFRAME (lisp_frame));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2082 }
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
2083
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
2084 UNBLOCK_INPUT;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2085 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2086
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2087
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2088 /* Adjust frame glyphs when Emacs is initialized.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2089
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2090 To be called from init_display.
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2091
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2092 We need a glyph matrix because redraw will happen soon.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2093 Unfortunately, window sizes on selected_frame are not yet set to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2094 meaningful values. I believe we can assume that there are only two
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2095 windows on the frame---the mini-buffer and the root window. Frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2096 height and width seem to be correct so far. So, set the sizes of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2097 windows to estimated values. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2098
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2099 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2100 adjust_frame_glyphs_initially ()
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2101 {
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
2102 struct frame *sf = SELECTED_FRAME ();
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
2103 struct window *root = XWINDOW (sf->root_window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2104 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
2105 int frame_lines = FRAME_LINES (sf);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2106 int frame_cols = FRAME_COLS (sf);
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
2107 int top_margin = FRAME_TOP_MARGIN (sf);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2108
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2109 /* 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
2110 XSETFASTINT (root->top_line, top_margin);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2111 XSETFASTINT (root->total_cols, frame_cols);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2112 set_window_height (sf->root_window, frame_lines - 1 - top_margin, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2113
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2114 /* 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
2115 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
2116 XSETFASTINT (mini->total_cols, frame_cols);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2117 set_window_height (root->next, 1, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2118
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
2119 adjust_frame_glyphs (sf);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2120 glyphs_initialized_initially_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2121 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2122
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2123
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2124 /* Allocate/reallocate glyph matrices of a single frame F. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2125
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2126 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2127 adjust_frame_glyphs (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2128 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2129 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2130 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2131 adjust_frame_glyphs_for_window_redisplay (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2132 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2133 adjust_frame_glyphs_for_frame_redisplay (f);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2134
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2135 /* Don't forget the message buffer and the buffer for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2136 decode_mode_spec. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2137 adjust_frame_message_buffer (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2138 adjust_decode_mode_spec_buffer (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2139
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2140 f->glyphs_initialized_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2141 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2142
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2143
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2144 /* 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
2145 windows from the frame's current matrix. */
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2146
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2147 static void
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2148 fake_current_matrices (window)
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2149 Lisp_Object window;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2150 {
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2151 struct window *w;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2152
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2153 for (; !NILP (window); window = w->next)
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2154 {
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2155 w = XWINDOW (window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2156
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2157 if (!NILP (w->hchild))
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2158 fake_current_matrices (w->hchild);
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2159 else if (!NILP (w->vchild))
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2160 fake_current_matrices (w->vchild);
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2161 else
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2162 {
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2163 int i;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2164 struct frame *f = XFRAME (w->frame);
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2165 struct glyph_matrix *m = w->current_matrix;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2166 struct glyph_matrix *fm = f->current_matrix;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2167
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2168 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
2169 xassert (m->matrix_w == WINDOW_TOTAL_COLS (w));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2170
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2171 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
2172 {
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2173 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
2174 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
2175
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2176 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
2177 && 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
2178
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2179 r->enabled_p = fr->enabled_p;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2180 if (r->enabled_p)
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2181 {
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2182 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
2183 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
2184 r->used[TEXT_AREA] = (m->matrix_w
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2185 - r->used[LEFT_MARGIN_AREA]
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2186 - r->used[RIGHT_MARGIN_AREA]);
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2187 r->mode_line_p = 0;
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2188 }
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2189 }
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2190 }
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2191 }
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2192 }
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2193
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2194
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2195 /* 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
2196 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
2197
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2198 static struct glyph_matrix *
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2199 save_current_matrix (f)
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2200 struct frame *f;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2201 {
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2202 int i;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2203 struct glyph_matrix *saved;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2204
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2205 saved = (struct glyph_matrix *) xmalloc (sizeof *saved);
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2206 bzero (saved, sizeof *saved);
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2207 saved->nrows = f->current_matrix->nrows;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2208 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
2209 * sizeof *saved->rows);
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2210 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
2211
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2212 for (i = 0; i < saved->nrows; ++i)
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2213 {
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2214 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
2215 struct glyph_row *to = saved->rows + i;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2216 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
2217 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
2218 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
2219 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
2220 }
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2221
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2222 return saved;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2223 }
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2224
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2225
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2226 /* 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
2227 and free memory associated with SAVED. */
34849
eac70be4cb58 (save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34788
diff changeset
2228
eac70be4cb58 (save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34788
diff changeset
2229 static void
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2230 restore_current_matrix (f, saved)
34849
eac70be4cb58 (save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34788
diff changeset
2231 struct frame *f;
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2232 struct glyph_matrix *saved;
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2233 {
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2234 int i;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2235
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2236 for (i = 0; i < saved->nrows; ++i)
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2237 {
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2238 struct glyph_row *from = saved->rows + i;
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2239 struct glyph_row *to = f->current_matrix->rows + i;
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2240 size_t nbytes = from->used[TEXT_AREA] * sizeof (struct glyph);
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2241 bcopy (from->glyphs[TEXT_AREA], to->glyphs[TEXT_AREA], nbytes);
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2242 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
2243 xfree (from->glyphs[TEXT_AREA]);
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2244 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2245
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2246 xfree (saved->rows);
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2247 xfree (saved);
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2248 }
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2249
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2250
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2251
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2252 /* Allocate/reallocate glyph matrices of a single frame F for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2253 frame-based redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2254
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2255 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2256 adjust_frame_glyphs_for_frame_redisplay (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2257 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2258 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2259 struct dim ch_dim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2260 struct dim matrix_dim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2261 int pool_changed_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2262 int window_change_flags;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2263 int top_window_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2264
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2265 if (!FRAME_LIVE_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2266 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2267
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2268 /* Determine the smallest character in any font for F. On
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2269 console windows, all characters have dimension (1, 1). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2270 ch_dim.width = ch_dim.height = 1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2271
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2272 top_window_y = FRAME_TOP_MARGIN (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2273
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2274 /* Allocate glyph pool structures if not already done. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2275 if (f->desired_pool == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2276 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2277 f->desired_pool = new_glyph_pool ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2278 f->current_pool = new_glyph_pool ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2279 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2280
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2281 /* Allocate frames matrix structures if needed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2282 if (f->desired_matrix == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2283 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2284 f->desired_matrix = new_glyph_matrix (f->desired_pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2285 f->current_matrix = new_glyph_matrix (f->current_pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2286 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2287
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2288 /* Compute window glyph matrices. (This takes the mini-buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2289 window into account). The result is the size of the frame glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2290 matrix needed. The variable window_change_flags is set to a bit
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2291 mask indicating whether new matrices will be allocated or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2292 existing matrices change their size or location within the frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2293 matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2294 window_change_flags = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2295 matrix_dim
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2296 = allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2297 0, top_window_y,
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2298 1,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2299 &window_change_flags);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2300
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2301 /* Add in menu bar lines, if any. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2302 matrix_dim.height += top_window_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2303
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2304 /* Enlarge pools as necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2305 pool_changed_p = realloc_glyph_pool (f->desired_pool, matrix_dim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2306 realloc_glyph_pool (f->current_pool, matrix_dim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2307
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2308 /* Set up glyph pointers within window matrices. Do this only if
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2309 absolutely necessary since it requires a frame redraw. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2310 if (pool_changed_p || window_change_flags)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2311 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2312 /* Do it for window matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2313 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
2314 0, top_window_y, 0,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2315 &window_change_flags);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2316
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2317 /* Size of frame matrices must equal size of frame. Note
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2318 that we are called for X frames with window widths NOT equal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2319 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
2320 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
2321 && matrix_dim.height == FRAME_LINES (f));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2322
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2323 /* Pointers to glyph memory in glyph rows are exchanged during
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2324 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
2325 frame's current matrix consists of pointers into both the
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2326 desired and current glyph pool of the frame. Adjusting a
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2327 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
2328 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
2329 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
2330 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
2331 matrix' contents from that copy. */
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2332 if (display_completed
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2333 && !FRAME_GARBAGED_P (f)
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2334 && matrix_dim.width == f->current_matrix->matrix_w
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2335 && matrix_dim.height == f->current_matrix->matrix_h)
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2336 {
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2337 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
2338 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
2339 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
2340 restore_current_matrix (f, copy);
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2341 fake_current_matrices (FRAME_ROOT_WINDOW (f));
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2342 }
34736
51a0fe34dfc6 (fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents: 34715
diff changeset
2343 else
34788
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2344 {
35307
8e3c6f1a31ab (save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents: 35269
diff changeset
2345 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
2346 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
2347 SET_FRAME_GARBAGED (f);
9512f05b60d1 (ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 34736
diff changeset
2348 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2349 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2350 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2351
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2352
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2353 /* Allocate/reallocate glyph matrices of a single frame F for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2354 window-based redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2355
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2356 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2357 adjust_frame_glyphs_for_window_redisplay (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2358 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2359 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2360 struct dim ch_dim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2361 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2362
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2363 xassert (FRAME_WINDOW_P (f) && FRAME_LIVE_P (f));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2364
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2365 /* Get minimum sizes. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2366 #ifdef HAVE_WINDOW_SYSTEM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2367 ch_dim.width = FRAME_SMALLEST_CHAR_WIDTH (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2368 ch_dim.height = FRAME_SMALLEST_FONT_HEIGHT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2369 #else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2370 ch_dim.width = ch_dim.height = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2371 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2372
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2373 /* Allocate/reallocate window matrices. */
39448
b74c165ef22f (required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents: 39254
diff changeset
2374 allocate_matrices_for_window_redisplay (XWINDOW (FRAME_ROOT_WINDOW (f)));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2375
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2376 /* Allocate/ reallocate matrices of the dummy window used to display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2377 the menu bar under X when no X toolkit support is available. */
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 46551
diff changeset
2378 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2379 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2380 /* Allocate a dummy window if not already done. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2381 if (NILP (f->menu_bar_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2382 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2383 f->menu_bar_window = make_window ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2384 w = XWINDOW (f->menu_bar_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2385 XSETFRAME (w->frame, f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2386 w->pseudo_window_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2387 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2388 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2389 w = XWINDOW (f->menu_bar_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2390
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2391 /* Set window dimensions to frame dimensions and allocate or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2392 adjust glyph matrices of W. */
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2393 XSETFASTINT (w->top_line, 0);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2394 XSETFASTINT (w->left_col, 0);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2395 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
2396 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
2397 allocate_matrices_for_window_redisplay (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2398 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2399 #endif /* not USE_X_TOOLKIT */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2400
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 46551
diff changeset
2401 #ifndef USE_GTK
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2402 /* 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
2403 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
2404 if (NILP (f->tool_bar_window))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2405 {
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2406 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
2407 w = XWINDOW (f->tool_bar_window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2408 XSETFRAME (w->frame, f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2409 w->pseudo_window_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2410 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2411 else
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2412 w = XWINDOW (f->tool_bar_window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2413
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2414 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
2415 XSETFASTINT (w->left_col, 0);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
2416 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
2417 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
2418 allocate_matrices_for_window_redisplay (w);
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 46551
diff changeset
2419 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2420 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2421
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2422
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2423 /* Adjust/ allocate message buffer of frame F.
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2424
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2425 Note that the message buffer is never freed. Since I could not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2426 find a free in 19.34, I assume that freeing it would be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2427 problematic in some way and don't do it either.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2428
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2429 (Implementation note: It should be checked if we can free it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2430 eventually without causing trouble). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2431
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2432 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2433 adjust_frame_message_buffer (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2434 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2435 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2436 int size = FRAME_MESSAGE_BUF_SIZE (f) + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2437
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2438 if (FRAME_MESSAGE_BUF (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2439 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2440 char *buffer = FRAME_MESSAGE_BUF (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2441 char *new_buffer = (char *) xrealloc (buffer, size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2442 FRAME_MESSAGE_BUF (f) = new_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2443 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2444 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2445 FRAME_MESSAGE_BUF (f) = (char *) xmalloc (size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2446 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2447
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2448
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2449 /* Re-allocate buffer for decode_mode_spec on frame F. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2450
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2451 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2452 adjust_decode_mode_spec_buffer (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2453 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2454 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2455 f->decode_mode_spec_buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2456 = (char *) xrealloc (f->decode_mode_spec_buffer,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2457 FRAME_MESSAGE_BUF_SIZE (f) + 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2458 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2459
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2460
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2461
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2462 /**********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2463 Freeing Glyph Matrices
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2464 **********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2465
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2466 /* Free glyph memory for a frame F. F may be null. This function can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2467 be called for the same frame more than once. The root window of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2468 F may be nil when this function is called. This is the case when
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2469 the function is called when F is destroyed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2470
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2471 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2472 free_glyphs (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2473 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2474 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2475 if (f && f->glyphs_initialized_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2476 {
27968
7634011b93f3 (free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 27855
diff changeset
2477 /* 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
2478 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
2479 BLOCK_INPUT;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2480 f->glyphs_initialized_p = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2481
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2482 /* Release window sub-matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2483 if (!NILP (f->root_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2484 free_window_matrices (XWINDOW (f->root_window));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2485
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2486 /* Free the dummy window for menu bars without X toolkit and its
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2487 glyph matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2488 if (!NILP (f->menu_bar_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2489 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2490 struct window *w = XWINDOW (f->menu_bar_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2491 free_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2492 free_glyph_matrix (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2493 w->desired_matrix = w->current_matrix = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2494 f->menu_bar_window = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2495 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2496
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2497 /* 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
2498 if (!NILP (f->tool_bar_window))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2499 {
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
2500 struct window *w = XWINDOW (f->tool_bar_window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2501 free_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2502 free_glyph_matrix (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2503 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
2504 f->tool_bar_window = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2505 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2506
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2507 /* Release frame glyph matrices. Reset fields to zero in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2508 case we are called a second time. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2509 if (f->desired_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2510 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2511 free_glyph_matrix (f->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2512 free_glyph_matrix (f->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2513 f->desired_matrix = f->current_matrix = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2514 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2515
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2516 /* Release glyph pools. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2517 if (f->desired_pool)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2518 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2519 free_glyph_pool (f->desired_pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2520 free_glyph_pool (f->current_pool);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2521 f->desired_pool = f->current_pool = NULL;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2522 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2523
27968
7634011b93f3 (free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents: 27855
diff changeset
2524 UNBLOCK_INPUT;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2525 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2526 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2527
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2528
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2529 /* Free glyph sub-matrices in the window tree rooted at W. This
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2530 function may be called with a null pointer, and it may be called on
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2531 the same tree more than once. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2532
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2533 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2534 free_window_matrices (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2535 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2536 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2537 while (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2538 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2539 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2540 free_window_matrices (XWINDOW (w->hchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2541 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2542 free_window_matrices (XWINDOW (w->vchild));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2543 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2544 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2545 /* This is a leaf window. Free its memory and reset fields
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2546 to zero in case this function is called a second time for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2547 W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2548 free_glyph_matrix (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2549 free_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2550 w->current_matrix = w->desired_matrix = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2551 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2552
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2553 /* Next window on same level. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2554 w = NILP (w->next) ? 0 : XWINDOW (w->next);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2555 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2556 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2557
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2558
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2559 /* Check glyph memory leaks. This function is called from
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2560 shut_down_emacs. Note that frames are not destroyed when Emacs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2561 exits. We therefore free all glyph memory for all active frames
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2562 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
2563
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2564 void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2565 check_glyph_memory ()
6620
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2566 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2567 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2568
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2569 /* Free glyph memory for all frames. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2570 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2571 free_glyphs (XFRAME (frame));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2572
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2573 /* Check that nothing is left allocated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2574 if (glyph_matrix_count)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2575 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2576 if (glyph_pool_count)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2577 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2578 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2579
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2580
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2581
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2582 /**********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2583 Building a Frame Matrix
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2584 **********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2585
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2586 /* Most of the redisplay code works on glyph matrices attached to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2587 windows. This is a good solution most of the time, but it is not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2588 suitable for terminal code. Terminal output functions cannot rely
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2589 on being able to set an arbitrary terminal window. Instead they
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2590 must be provided with a view of the whole frame, i.e. the whole
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2591 screen. We build such a view by constructing a frame matrix from
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2592 window matrices in this section.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2593
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2594 Windows that must be updated have their must_be_update_p flag set.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2595 For all such windows, their desired matrix is made part of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2596 desired frame matrix. For other windows, their current matrix is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2597 made part of the desired frame matrix.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2598
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2599 +-----------------+----------------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2600 | desired | desired |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2601 | | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2602 +-----------------+----------------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2603 | current |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2604 | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2605 +----------------------------------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2606
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2607 Desired window matrices can be made part of the frame matrix in a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2608 cheap way: We exploit the fact that the desired frame matrix and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2609 desired window matrices share their glyph memory. This is not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2610 possible for current window matrices. Their glyphs are copied to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2611 the desired frame matrix. The latter is equivalent to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2612 preserve_other_columns in the old redisplay.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2613
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2614 Used glyphs counters for frame matrix rows are the result of adding
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2615 up glyph lengths of the window matrices. A line in the frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2616 matrix is enabled, if a corresponding line in a window matrix is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2617 enabled.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2618
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2619 After building the desired frame matrix, it will be passed to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2620 terminal code, which will manipulate both the desired and current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2621 frame matrix. Changes applied to the frame's current matrix have
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2622 to be visible in current window matrices afterwards, of course.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2623
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2624 This problem is solved like this:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2625
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2626 1. Window and frame matrices share glyphs. Window matrices are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2627 constructed in a way that their glyph contents ARE the glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2628 contents needed in a frame matrix. Thus, any modification of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2629 glyphs done in terminal code will be reflected in window matrices
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2630 automatically.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2631
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2632 2. Exchanges of rows in a frame matrix done by terminal code are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2633 intercepted by hook functions so that corresponding row operations
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2634 on window matrices can be performed. This is necessary because we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2635 use pointers to glyphs in glyph row structures. To satisfy the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2636 assumption of point 1 above that glyphs are updated implicitly in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2637 window matrices when they are manipulated via the frame matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2638 window and frame matrix must of course agree where to find the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2639 glyphs for their rows. Possible manipulations that must be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2640 mirrored are assignments of rows of the desired frame matrix to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2641 current frame matrix and scrolling the current frame matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2642
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2643 /* Build frame F's desired matrix from window matrices. Only windows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2644 which have the flag must_be_updated_p set have to be updated. Menu
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2645 bar lines of a frame are not covered by window matrices, so make
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2646 sure not to touch them in this function. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2647
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2648 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2649 build_frame_matrix (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2650 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2651 {
6620
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2652 int i;
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2653
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2654 /* F must have a frame matrix when this function is called. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2655 xassert (!FRAME_WINDOW_P (f));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2656
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2657 /* Clear all rows in the frame matrix covered by window matrices.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2658 Menu bar lines are not covered by windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2659 for (i = FRAME_TOP_MARGIN (f); i < f->desired_matrix->nrows; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2660 clear_glyph_row (MATRIX_ROW (f->desired_matrix, i));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2661
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2662 /* Build the matrix by walking the window tree. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2663 build_frame_matrix_from_window_tree (f->desired_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2664 XWINDOW (FRAME_ROOT_WINDOW (f)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2665 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2666
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2667
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2668 /* Walk a window tree, building a frame matrix MATRIX from window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2669 matrices. W is the root of a window tree. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2670
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2671 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2672 build_frame_matrix_from_window_tree (matrix, w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2673 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2674 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2675 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2676 while (w)
6620
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2677 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2678 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2679 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->hchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2680 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2681 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->vchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2682 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2683 build_frame_matrix_from_leaf_window (matrix, w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2684
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2685 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
2686 }
990d7d5095dc (adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6617
diff changeset
2687 }
6642
2fda5dd17356 (verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6627
diff changeset
2688
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2689
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2690 /* Add a window's matrix to a frame matrix. FRAME_MATRIX is the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2691 desired frame matrix built. W is a leaf window whose desired or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2692 current matrix is to be added to FRAME_MATRIX. W's flag
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2693 must_be_updated_p determines which matrix it contributes to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2694 FRAME_MATRIX. If must_be_updated_p is non-zero, W's desired matrix
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2695 is added to FRAME_MATRIX, otherwise W's current matrix is added.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2696 Adding a desired matrix means setting up used counters and such in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2697 frame rows, while adding a current window matrix to FRAME_MATRIX
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2698 means copying glyphs. The latter case corresponds to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2699 preserve_other_columns in the old redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2700
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2701 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2702 build_frame_matrix_from_leaf_window (frame_matrix, w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2703 struct glyph_matrix *frame_matrix;
6642
2fda5dd17356 (verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6627
diff changeset
2704 struct window *w;
2fda5dd17356 (verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6627
diff changeset
2705 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2706 struct glyph_matrix *window_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2707 int window_y, frame_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2708 /* If non-zero, a glyph to insert at the right border of W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2709 GLYPH right_border_glyph = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2710
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2711 /* Set window_matrix to the matrix we have to add to FRAME_MATRIX. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2712 if (w->must_be_updated_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2713 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2714 window_matrix = w->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2715
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2716 /* Decide whether we want to add a vertical border glyph. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2717 if (!WINDOW_RIGHTMOST_P (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2718 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2719 struct Lisp_Char_Table *dp = window_display_table (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2720 right_border_glyph = (dp && INTEGERP (DISP_BORDER_GLYPH (dp))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2721 ? XINT (DISP_BORDER_GLYPH (dp))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2722 : '|');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2723 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2724 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2725 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2726 window_matrix = w->current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2727
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2728 /* For all rows in the window matrix and corresponding rows in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2729 frame matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2730 window_y = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2731 frame_y = window_matrix->matrix_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2732 while (window_y < window_matrix->nrows)
6642
2fda5dd17356 (verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6627
diff changeset
2733 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2734 struct glyph_row *frame_row = frame_matrix->rows + frame_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2735 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
2736 int current_row_p = window_matrix == w->current_matrix;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2737
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2738 /* Fill up the frame row with spaces up to the left margin of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2739 window row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2740 fill_up_frame_row_with_spaces (frame_row, window_matrix->matrix_x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2741
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2742 /* Fill up areas in the window matrix row with spaces. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2743 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
2744
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2745 /* 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
2746 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
2747 row instead. */
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2748 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
2749 && !window_row->enabled_p)
6682
16ab14205588 (verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents: 6648
diff changeset
2750 {
31271
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2751 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
2752 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
2753 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2754
31271
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2755 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
2756 {
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2757 /* Copy window row to frame row. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2758 bcopy (window_row->glyphs[0],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2759 frame_row->glyphs[TEXT_AREA] + window_matrix->matrix_x,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2760 window_matrix->matrix_w * sizeof (struct glyph));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2761 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2762 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2763 {
31271
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2764 xassert (window_row->enabled_p);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2765
31271
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
2766 /* 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
2767 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
2768 frame_row->enabled_p = 1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2769
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2770 /* Maybe insert a vertical border between horizontally adjacent
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2771 windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2772 if (right_border_glyph)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2773 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2774 struct glyph *border = window_row->glyphs[LAST_AREA] - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2775 SET_CHAR_GLYPH_FROM_GLYPH (*border, right_border_glyph);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2776 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2777
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
2778 /* 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
2779 frame_y. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2780 xassert (glyph_row_slice_p (window_row, frame_row));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2781
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2782 /* If rows are in sync, we don't have to copy glyphs because
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2783 frame and window share glyphs. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2784
25241
35674d7c4136 (mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents: 25190
diff changeset
2785 #if GLYPH_DEBUG
35674d7c4136 (mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents: 25190
diff changeset
2786 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
2787 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
2788 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2789 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2790
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2791 /* Set number of used glyphs in the frame matrix. Since we fill
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2792 up with spaces, and visit leaf windows from left to right it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2793 can be done simply. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2794 frame_row->used[TEXT_AREA]
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2795 = window_matrix->matrix_x + window_matrix->matrix_w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2796
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2797 /* Next row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2798 ++window_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2799 ++frame_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2800 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2801 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2802
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2803
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2804 /* Add spaces to a glyph row ROW in a window matrix.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2805
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2806 Each row has the form:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2807
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2808 +---------+-----------------------------+------------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2809 | left | text | right |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2810 +---------+-----------------------------+------------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2811
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2812 Left and right marginal areas are optional. This function adds
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2813 spaces to areas so that there are no empty holes between areas.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2814 In other words: If the right area is not empty, the text area
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2815 is filled up with spaces up to the right area. If the text area
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2816 is not empty, the left area is filled up.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2817
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2818 To be called for frame-based redisplay, only. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2819
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2820 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2821 fill_up_glyph_row_with_spaces (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2822 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2823 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2824 fill_up_glyph_row_area_with_spaces (row, LEFT_MARGIN_AREA);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2825 fill_up_glyph_row_area_with_spaces (row, TEXT_AREA);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2826 fill_up_glyph_row_area_with_spaces (row, RIGHT_MARGIN_AREA);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2827 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2828
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2829
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2830 /* Fill area AREA of glyph row ROW with spaces. To be called for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2831 frame-based redisplay only. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2832
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2833 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2834 fill_up_glyph_row_area_with_spaces (row, area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2835 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2836 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2837 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2838 if (row->glyphs[area] < row->glyphs[area + 1])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2839 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2840 struct glyph *end = row->glyphs[area + 1];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2841 struct glyph *text = row->glyphs[area] + row->used[area];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2842
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2843 while (text < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2844 *text++ = space_glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2845 row->used[area] = text - row->glyphs[area];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2846 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2847 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2848
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2849
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2850 /* Add spaces to the end of ROW in a frame matrix until index UPTO is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2851 reached. In frame matrices only one area, TEXT_AREA, is used. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2852
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2853 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2854 fill_up_frame_row_with_spaces (row, upto)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2855 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2856 int upto;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2857 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2858 int i = row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2859 struct glyph *glyph = row->glyphs[TEXT_AREA];
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2860
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2861 while (i < upto)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2862 glyph[i++] = space_glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2863
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2864 row->used[TEXT_AREA] = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2865 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2866
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2867
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2868
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2869 /**********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2870 Mirroring operations on frame matrices in window matrices
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2871 **********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2872
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2873 /* Set frame being updated via frame-based redisplay to F. This
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2874 function must be called before updates to make explicit that we are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2875 working on frame matrices or not. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2876
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2877 static INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2878 set_frame_matrix_frame (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2879 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2880 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2881 frame_matrix_frame = f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2882 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2883
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2884
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2885 /* Make sure glyph row ROW in CURRENT_MATRIX is up to date.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2886 DESIRED_MATRIX is the desired matrix corresponding to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2887 CURRENT_MATRIX. The update is done by exchanging glyph pointers
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2888 between rows in CURRENT_MATRIX and DESIRED_MATRIX. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2889 frame_matrix_frame is non-null, this indicates that the exchange is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2890 done in frame matrices, and that we have to perform analogous
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2891 operations in window matrices of frame_matrix_frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2892
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2893 static INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2894 make_current (desired_matrix, current_matrix, row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2895 struct glyph_matrix *desired_matrix, *current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2896 int row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2897 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2898 struct glyph_row *current_row = MATRIX_ROW (current_matrix, row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2899 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
2900 int mouse_face_p = current_row->mouse_face_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2901
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2902 /* Do current_row = desired_row. This exchanges glyph pointers
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2903 between both rows, and does a structure assignment otherwise. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2904 assign_row (current_row, desired_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2905
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2906 /* Enable current_row to mark it as valid. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2907 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
2908 current_row->mouse_face_p = mouse_face_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2909
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2910 /* If we are called on frame matrices, perform analogous operations
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2911 for window matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2912 if (frame_matrix_frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2913 mirror_make_current (XWINDOW (frame_matrix_frame->root_window), row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2914 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2915
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2916
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2917 /* W is the root of a window tree. FRAME_ROW is the index of a row in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2918 W's frame which has been made current (by swapping pointers between
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2919 current and desired matrix). Perform analogous operations in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2920 matrices of leaf windows in the window tree rooted at W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2921
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2922 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2923 mirror_make_current (w, frame_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2924 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2925 int frame_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2926 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2927 while (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2928 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2929 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2930 mirror_make_current (XWINDOW (w->hchild), frame_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2931 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2932 mirror_make_current (XWINDOW (w->vchild), frame_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2933 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2934 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2935 /* Row relative to window W. Don't use FRAME_TO_WINDOW_VPOS
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2936 here because the checks performed in debug mode there
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2937 will not allow the conversion. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2938 int row = frame_row - w->desired_matrix->matrix_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2939
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2940 /* If FRAME_ROW is within W, assign the desired row to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2941 current row (exchanging glyph pointers). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2942 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
2943 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2944 struct glyph_row *current_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2945 = MATRIX_ROW (w->current_matrix, row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2946 struct glyph_row *desired_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2947 = 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
2948
35674d7c4136 (mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents: 25190
diff changeset
2949 if (desired_row->enabled_p)
35674d7c4136 (mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents: 25190
diff changeset
2950 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
2951 else
35674d7c4136 (mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents: 25190
diff changeset
2952 swap_glyph_pointers (desired_row, current_row);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2953 current_row->enabled_p = 1;
6682
16ab14205588 (verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents: 6648
diff changeset
2954 }
16ab14205588 (verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents: 6648
diff changeset
2955 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
2956
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2957 w = NILP (w->next) ? 0 : XWINDOW (w->next);
6642
2fda5dd17356 (verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6627
diff changeset
2958 }
2fda5dd17356 (verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents: 6627
diff changeset
2959 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2960
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2961
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2962 /* Perform row dance after scrolling. We are working on the range of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2963 lines UNCHANGED_AT_TOP + 1 to UNCHANGED_AT_TOP + NLINES (not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2964 including) in MATRIX. COPY_FROM is a vector containing, for each
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2965 row I in the range 0 <= I < NLINES, the index of the original line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2966 to move to I. This index is relative to the row range, i.e. 0 <=
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2967 index < NLINES. RETAINED_P is a vector containing zero for each
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2968 row 0 <= I < NLINES which is empty.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2969
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2970 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
2971
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2972 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2973 mirrored_line_dance (matrix, unchanged_at_top, nlines, copy_from,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2974 retained_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2975 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2976 int unchanged_at_top, nlines;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2977 int *copy_from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2978 char *retained_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2979 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2980 /* A copy of original rows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2981 struct glyph_row *old_rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2982
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2983 /* Rows to assign to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2984 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
2985
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2986 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2987
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2988 /* Make a copy of the original rows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2989 old_rows = (struct glyph_row *) alloca (nlines * sizeof *old_rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2990 bcopy (new_rows, old_rows, nlines * sizeof *old_rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2991
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2992 /* Assign new rows, maybe clear lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2993 for (i = 0; i < nlines; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2994 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2995 int enabled_before_p = new_rows[i].enabled_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2996
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2997 xassert (i + unchanged_at_top < matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2998 xassert (unchanged_at_top + copy_from[i] < matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
2999 new_rows[i] = old_rows[copy_from[i]];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3000 new_rows[i].enabled_p = enabled_before_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3001
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3002 /* RETAINED_P is zero for empty lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3003 if (!retained_p[copy_from[i]])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3004 new_rows[i].enabled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3005 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3006
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
3007 /* Do the same for window matrices, if MATRIX is a frame matrix. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3008 if (frame_matrix_frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3009 mirror_line_dance (XWINDOW (frame_matrix_frame->root_window),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3010 unchanged_at_top, nlines, copy_from, retained_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3011 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3013
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3014 /* 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
3015 the current frame matrix. */
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3016
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3017 static void
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3018 sync_window_with_frame_matrix_rows (w)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3019 struct window *w;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3020 {
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3021 struct frame *f = XFRAME (w->frame);
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3022 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
3023 int left, right, x, width;
40214
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3024
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3025 /* 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
3026 xassert (NILP (w->hchild) && NILP (w->vchild));
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3027 xassert (!FRAME_WINDOW_P (f));
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3028
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
3029 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
3030 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
3031 x = w->current_matrix->matrix_x;
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3032 width = w->current_matrix->matrix_w;
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3033
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3034 window_row = w->current_matrix->rows;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3035 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
3036 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
3037
40214
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3038 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
3039 {
40214
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3040 window_row->glyphs[LEFT_MARGIN_AREA]
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3041 = frame_row->glyphs[0] + x;
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3042 window_row->glyphs[TEXT_AREA]
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3043 = window_row->glyphs[LEFT_MARGIN_AREA] + left;
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3044 window_row->glyphs[LAST_AREA]
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3045 = window_row->glyphs[LEFT_MARGIN_AREA] + width;
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3046 window_row->glyphs[RIGHT_MARGIN_AREA]
a87bf217f5a6 (sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents: 40075
diff changeset
3047 = window_row->glyphs[LAST_AREA] - right;
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3048 }
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3049 }
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3050
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3051
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3052 /* 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
3053 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
3054
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3055 struct window *
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3056 frame_row_to_window (w, row)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3057 struct window *w;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3058 int row;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3059 {
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3060 struct window *found = NULL;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3061
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3062 while (w && !found)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3063 {
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3064 if (!NILP (w->hchild))
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3065 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
3066 else if (!NILP (w->vchild))
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3067 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
3068 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
3069 && row < WINDOW_BOTTOM_EDGE_LINE (w))
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3070 found = w;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3071
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3072 w = NILP (w->next) ? 0 : XWINDOW (w->next);
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3073 }
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3074
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3075 return found;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3076 }
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3077
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3078
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3079 /* Perform a line dance in the window tree rooted at W, after
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3080 scrolling a frame matrix in mirrored_line_dance.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3081
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3082 We are working on the range of lines UNCHANGED_AT_TOP + 1 to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3083 UNCHANGED_AT_TOP + NLINES (not including) in W's frame matrix.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3084 COPY_FROM is a vector containing, for each row I in the range 0 <=
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3085 I < NLINES, the index of the original line to move to I. This
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3086 index is relative to the row range, i.e. 0 <= index < NLINES.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3087 RETAINED_P is a vector containing zero for each row 0 <= I < NLINES
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3088 which is empty. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3089
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3090 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3091 mirror_line_dance (w, unchanged_at_top, nlines, copy_from, retained_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3092 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3093 int unchanged_at_top, nlines;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3094 int *copy_from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3095 char *retained_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3096 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3097 while (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3098 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3099 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3100 mirror_line_dance (XWINDOW (w->hchild), unchanged_at_top,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3101 nlines, copy_from, retained_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3102 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3103 mirror_line_dance (XWINDOW (w->vchild), unchanged_at_top,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3104 nlines, copy_from, retained_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3105 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3106 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3107 /* W is a leaf window, and we are working on its current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3108 matrix m. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3109 struct glyph_matrix *m = w->current_matrix;
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3110 int i, sync_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3111 struct glyph_row *old_rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3112
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3113 /* Make a copy of the original rows of matrix m. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3114 old_rows = (struct glyph_row *) alloca (m->nrows * sizeof *old_rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3115 bcopy (m->rows, old_rows, m->nrows * sizeof *old_rows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3116
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3117 for (i = 0; i < nlines; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3118 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3119 /* Frame relative line assigned to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3120 int frame_to = i + unchanged_at_top;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3121
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3122 /* Frame relative line assigned. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3123 int frame_from = copy_from[i] + unchanged_at_top;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3124
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3125 /* Window relative line assigned to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3126 int window_to = frame_to - m->matrix_y;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3127
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3128 /* Window relative line assigned. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3129 int window_from = frame_from - m->matrix_y;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3130
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3131 /* Is assigned line inside window? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3132 int from_inside_window_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3133 = window_from >= 0 && window_from < m->matrix_h;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3134
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3135 /* Is assigned to line inside window? */
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3136 int to_inside_window_p
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3137 = window_to >= 0 && window_to < m->matrix_h;
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 if (from_inside_window_p && to_inside_window_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3140 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3141 /* Enabled setting before assignment. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3142 int enabled_before_p;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3143
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3144 /* Do the assignment. The enabled_p flag is saved
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3145 over the assignment because the old redisplay did
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3146 that. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3147 enabled_before_p = m->rows[window_to].enabled_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3148 m->rows[window_to] = old_rows[window_from];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3149 m->rows[window_to].enabled_p = enabled_before_p;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3150
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3151 /* If frame line is empty, window line is empty, too. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3152 if (!retained_p[copy_from[i]])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3153 m->rows[window_to].enabled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3154 }
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3155 else if (to_inside_window_p)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3156 {
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3157 /* A copy between windows. This is an infrequent
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3158 case not worth optimizing. */
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3159 struct frame *f = XFRAME (w->frame);
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3160 struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f));
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3161 struct window *w2;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3162 struct glyph_matrix *m2;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3163 int m2_from;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3164
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3165 w2 = frame_row_to_window (root, frame_to);
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3166 m2 = w2->current_matrix;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3167 m2_from = frame_from - m2->matrix_y;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3168 copy_row_except_pointers (m->rows + window_to,
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3169 m2->rows + m2_from);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3170
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3171 /* If frame line is empty, window line is empty, too. */
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3172 if (!retained_p[copy_from[i]])
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3173 m->rows[window_to].enabled_p = 0;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3174 sync_p = 1;
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3175 }
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3176 else if (from_inside_window_p)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3177 sync_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3178 }
27855
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3179
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3180 /* 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
3181 pointers are in sync with the frame matrix. */
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3182 if (sync_p)
ecfe912fd73c (flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
3183 sync_window_with_frame_matrix_rows (w);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3184
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3185 /* Check that no pointers are lost. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3186 CHECK_MATRIX (m);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3187 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3188
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3189 /* Next window on same level. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3190 w = NILP (w->next) ? 0 : XWINDOW (w->next);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3191 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3192 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3193
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3194
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3195 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3196
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3197 /* Check that window and frame matrices agree about their
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3198 understanding where glyphs of the rows are to find. For each
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3199 window in the window tree rooted at W, check that rows in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3200 matrices of leaf window agree with their frame matrices about
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3201 glyph pointers. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3202
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
3203 void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3204 check_window_matrix_pointers (w)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3205 struct window *w;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3206 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3207 while (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3208 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3209 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3210 check_window_matrix_pointers (XWINDOW (w->hchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3211 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3212 check_window_matrix_pointers (XWINDOW (w->vchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3213 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3214 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3215 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3216 check_matrix_pointers (w->desired_matrix, f->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3217 check_matrix_pointers (w->current_matrix, f->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3218 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3219
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3220 w = NILP (w->next) ? 0 : XWINDOW (w->next);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3221 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3222 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3223
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3224
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3225 /* Check that window rows are slices of frame rows. WINDOW_MATRIX is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3226 a window and FRAME_MATRIX is the corresponding frame matrix. For
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3227 each row in WINDOW_MATRIX check that it's a slice of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3228 corresponding frame row. If it isn't, abort. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3229
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3230 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3231 check_matrix_pointers (window_matrix, frame_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3232 struct glyph_matrix *window_matrix, *frame_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3233 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3234 /* Row number in WINDOW_MATRIX. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3235 int i = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3236
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3237 /* Row number corresponding to I in FRAME_MATRIX. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3238 int j = window_matrix->matrix_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3239
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3240 /* For all rows check that the row in the window matrix is a
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3241 slice of the row in the frame matrix. If it isn't we didn't
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3242 mirror an operation on the frame matrix correctly. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3243 while (i < window_matrix->nrows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3244 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3245 if (!glyph_row_slice_p (window_matrix->rows + i,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3246 frame_matrix->rows + j))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3247 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3248 ++i, ++j;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3249 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3250 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3251
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3252 #endif /* GLYPH_DEBUG != 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3253
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3254
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3255
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3256 /**********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3257 VPOS and HPOS translations
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3258 **********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3259
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3260 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3261
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3262 /* Translate vertical position VPOS which is relative to window W to a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3263 vertical position relative to W's frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3264
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3265 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3266 window_to_frame_vpos (w, vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3267 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3268 int vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3269 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3270 struct frame *f = XFRAME (w->frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3271
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3272 xassert (!FRAME_WINDOW_P (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3273 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
3274 vpos += WINDOW_TOP_EDGE_LINE (w);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
3275 xassert (vpos >= 0 && vpos <= FRAME_LINES (f));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3276 return vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3277 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3278
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3279
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3280 /* 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
3281 a horizontal position relative to W's frame. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3282
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3283 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3284 window_to_frame_hpos (w, hpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3285 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3286 int hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3287 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3288 struct frame *f = XFRAME (w->frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3289
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3290 xassert (!FRAME_WINDOW_P (f));
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
3291 hpos += WINDOW_LEFT_EDGE_COL (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3292 return hpos;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3293 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3294
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3295 #endif /* GLYPH_DEBUG */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3296
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3297
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3298
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3299 /**********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3300 Redrawing Frames
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3301 **********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3302
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3303 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
3304 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
3305 (frame)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3306 Lisp_Object frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3307 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3308 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3309
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40512
diff changeset
3310 CHECK_LIVE_FRAME (frame);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3311 f = XFRAME (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3312
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3313 /* Ignore redraw requests, if frame has no glyphs yet.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3314 (Implementation note: It still has to be checked why we are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3315 called so early here). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3316 if (!glyphs_initialized_initially_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3317 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3318
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3319 update_begin (f);
35445
9af454aee182 (Fredraw_frame): Remove reference to
Andrew Innes <andrewi@gnu.org>
parents: 35374
diff changeset
3320 if (FRAME_MSDOS_P (f))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3321 set_terminal_modes ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3322 clear_frame ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3323 clear_current_matrices (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3324 update_end (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3325 fflush (stdout);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3326 windows_or_buffers_changed++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3327 /* Mark all windows as inaccurate, so that every window will have
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3328 its redisplay done. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3329 mark_window_display_accurate (FRAME_ROOT_WINDOW (f), 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3330 set_window_update_flags (XWINDOW (FRAME_ROOT_WINDOW (f)), 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3331 f->garbaged = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3332 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3333 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3334
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3335
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3336 /* Redraw frame F. This is nothing more than a call to the Lisp
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3337 function redraw-frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3338
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3339 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3340 redraw_frame (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3341 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3342 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3343 Lisp_Object frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3344 XSETFRAME (frame, f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3345 Fredraw_frame (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3346 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3347
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3348
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3349 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
3350 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
3351 ()
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3352 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3353 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3354
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3355 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3356 if (FRAME_VISIBLE_P (XFRAME (frame)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3357 Fredraw_frame (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3358
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3359 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3360 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3361
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3362
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3363 /* This is used when frame_garbaged is set. Call Fredraw_frame on all
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3364 visible frames marked as garbaged. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3365
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3366 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3367 redraw_garbaged_frames ()
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3368 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3369 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3370
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3371 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3372 if (FRAME_VISIBLE_P (XFRAME (frame))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3373 && FRAME_GARBAGED_P (XFRAME (frame)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3374 Fredraw_frame (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3375 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3376
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3377
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3378
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3379 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3380 Direct Operations
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3381 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3382
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3383 /* Try to update display and current glyph matrix directly.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3384
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3385 This function is called after a character G has been inserted into
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3386 current_buffer. It tries to update the current glyph matrix and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3387 perform appropriate screen output to reflect the insertion. If it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3388 succeeds, the global flag redisplay_performed_directly_p will be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3389 set to 1, and thereby prevent the more costly general redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3390 from running (see redisplay_internal).
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3391
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3392 This function is not called for `hairy' character insertions.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3393 In particular, it is not called when after or before change
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3394 functions exist, like they are used by font-lock. See keyboard.c
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3395 for details where this function is called. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3396
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3397 int
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3398 direct_output_for_insert (g)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3399 int g;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3400 {
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3401 register struct frame *f = SELECTED_FRAME ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3402 struct window *w = XWINDOW (selected_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3403 struct it it, it2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3404 struct glyph_row *glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3405 struct glyph *glyphs, *glyph, *end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3406 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
3407 /* Non-null means that redisplay of W is based on window matrices. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3408 int window_redisplay_p = FRAME_WINDOW_P (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3409 /* Non-null means we are in overwrite mode. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3410 int overwrite_p = !NILP (current_buffer->overwrite_mode);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3411 int added_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3412 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3413 int delta, delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3414
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3415 /* Not done directly. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3416 redisplay_performed_directly_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3417
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3418 /* Quickly give up for some common cases. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3419 if (cursor_in_echo_area
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3420 /* Give up if fonts have changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3421 || fonts_changed_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3422 /* Give up if face attributes have been changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3423 || face_change_count
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3424 /* Give up if cursor position not really known. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3425 || !display_completed
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3426 /* Give up if buffer appears in two places. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3427 || buffer_shared > 1
34715
fc3693bea815 (direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents: 34622
diff changeset
3428 /* 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
3429 minibuffer contents. */
fc3693bea815 (direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents: 34622
diff changeset
3430 || (EQ (selected_window, minibuf_window)
fc3693bea815 (direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents: 34622
diff changeset
3431 && EQ (minibuf_window, echo_area_window))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3432 /* Give up for hscrolled mini-buffer because display of the prompt
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3433 is handled specially there (see display_line). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3434 || (MINI_WINDOW_P (w) && XFASTINT (w->hscroll))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3435 /* Give up if overwriting in the middle of a line. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3436 || (overwrite_p
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3437 && PT != ZV
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3438 && FETCH_BYTE (PT) != '\n')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3439 /* Give up for tabs and line ends. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3440 || g == '\t'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3441 || g == '\n'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3442 || g == '\r'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3443 /* Give up if unable to display the cursor in the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3444 || 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
3445 /* 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
3446 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
3447 || !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
3448 || !NILP (echo_area_buffer[1])
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3449 || (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
3450 /* 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
3451 lines would change. */
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3452 (glyph_row->continued_p
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3453 /* 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
3454 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
3455 have to be redisplayed. */
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3456 || glyph_row->overlapping_p
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3457 || glyph_row->overlapped_p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3458 /* Can't do it for partial width windows on terminal frames
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3459 because we can't clear to eol in such a window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3460 || (!window_redisplay_p && !WINDOW_FULL_WIDTH_P (w)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3461 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3462
35374
3fc8f4c6ed56 (direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents: 35336
diff changeset
3463 /* 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
3464 at the end of a line. */
3fc8f4c6ed56 (direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents: 35336
diff changeset
3465 if (!char_ins_del_ok)
3fc8f4c6ed56 (direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents: 35336
diff changeset
3466 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
3467 return 0;
3fc8f4c6ed56 (direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents: 35336
diff changeset
3468
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3469 /* Set up a display iterator structure for W. Glyphs will be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3470 produced in scratch_glyph_row. Current position is W's cursor
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3471 position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3472 clear_glyph_row (&scratch_glyph_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3473 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
3474 DEC_TEXT_POS (pos, !NILP (current_buffer->enable_multibyte_characters));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3475 init_iterator (&it, w, CHARPOS (pos), BYTEPOS (pos), &scratch_glyph_row,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3476 DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3477
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3478 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
3479 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
3480 return 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3481
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3482 /* Give up if highlighting trailing whitespace and we have trailing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3483 whitespace in glyph_row. We would have to remove the trailing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3484 whitespace face in that case. */
25304
4b75c26bd356 (direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25241
diff changeset
3485 if (!NILP (Vshow_trailing_whitespace)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3486 && glyph_row->used[TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3487 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3488 struct glyph *last;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3489
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3490 last = glyph_row->glyphs[TEXT_AREA] + glyph_row->used[TEXT_AREA] - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3491 if (last->type == STRETCH_GLYPH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3492 || (last->type == CHAR_GLYPH
26998
02e902f732d1 (line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents: 26902
diff changeset
3493 && last->u.ch == ' '))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3494 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3495 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3496
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3497 /* Give up if there are overlay strings at pos. This would fail
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3498 if the overlay string has newlines in it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3499 if (STRINGP (it.string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3500 return 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3501
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3502 it.hpos = w->cursor.hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3503 it.vpos = w->cursor.vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3504 it.current_x = w->cursor.x + it.first_visible_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3505 it.current_y = w->cursor.y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3506 it.end_charpos = PT;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3507 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
3508 it.stop_charpos = max (IT_CHARPOS (it), it.stop_charpos);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3509
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3510 /* More than one display element may be returned for PT - 1 if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3511 (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
3512 `^C', or (ii) it has a display table entry, or (iii) it's a
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3513 combination of both. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3514 delta = delta_bytes = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3515 while (get_next_display_element (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3516 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3517 PRODUCE_GLYPHS (&it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3518
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3519 /* Give up if glyph doesn't fit completely on the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3520 if (it.current_x >= it.last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3521 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3522
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3523 /* Give up if new glyph has different ascent or descent than
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3524 the original row, or if it is not a character glyph. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3525 if (glyph_row->ascent != it.ascent
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3526 || 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
3527 || glyph_row->phys_ascent != it.phys_ascent
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3528 || glyph_row->phys_height != it.phys_ascent + it.phys_descent
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3529 || it.what != IT_CHARACTER)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3530 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3531
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3532 delta += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3533 delta_bytes += it.len;
32468
20788c8274cd (direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents: 31932
diff changeset
3534 set_iterator_to_next (&it, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3535 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3536
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3537 /* Give up if we hit the right edge of the window. We would have
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3538 to insert truncation or continuation glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3539 added_width = it.current_x - (w->cursor.x + it.first_visible_x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3540 if (glyph_row->pixel_width + added_width >= it.last_visible_x)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3541 return 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3542
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3543 /* Give up if there is a \t following in the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3544 it2 = it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3545 it2.end_charpos = ZV;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3546 it2.stop_charpos = min (it2.stop_charpos, ZV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3547 while (get_next_display_element (&it2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3548 && !ITERATOR_AT_END_OF_LINE_P (&it2))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3549 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3550 if (it2.c == '\t')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3551 return 0;
32468
20788c8274cd (direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents: 31932
diff changeset
3552 set_iterator_to_next (&it2, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3553 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3554
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3555 /* Number of new glyphs produced. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3556 n = it.glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3557
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3558 /* Start and end of glyphs in original row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3559 glyphs = glyph_row->glyphs[TEXT_AREA] + w->cursor.hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3560 end = glyph_row->glyphs[1 + TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3561
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3562 /* Make room for new glyphs, then insert them. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3563 xassert (end - glyphs - n >= 0);
25781
e5579bc77d9e (direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents: 25735
diff changeset
3564 safe_bcopy ((char *) glyphs, (char *) (glyphs + n),
e5579bc77d9e (direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents: 25735
diff changeset
3565 (end - glyphs - n) * sizeof (*end));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3566 bcopy (it.glyph_row->glyphs[TEXT_AREA], glyphs, n * sizeof *glyphs);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3567 glyph_row->used[TEXT_AREA] = min (glyph_row->used[TEXT_AREA] + n,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3568 end - glyph_row->glyphs[TEXT_AREA]);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3569
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3570 /* Compute new line width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3571 glyph = glyph_row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3572 end = glyph + glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3573 glyph_row->pixel_width = glyph_row->x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3574 while (glyph < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3575 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3576 glyph_row->pixel_width += glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3577 ++glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3578 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3579
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3580 /* Increment buffer positions for glyphs following the newly
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3581 inserted ones. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3582 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
3583 if (glyph->charpos > 0 && BUFFERP (glyph->object))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3584 glyph->charpos += delta;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3585
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3586 if (MATRIX_ROW_END_CHARPOS (glyph_row) > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3587 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3588 MATRIX_ROW_END_CHARPOS (glyph_row) += delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3589 MATRIX_ROW_END_BYTEPOS (glyph_row) += delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3590 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3591
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3592 /* 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
3593 increment_matrix_positions (w->current_matrix,
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
3594 w->cursor.vpos + 1,
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
3595 w->current_matrix->nrows,
4e2497e6757e (increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 28682
diff changeset
3596 delta, delta_bytes);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3597
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3598 glyph_row->contains_overlapping_glyphs_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3599 |= it.glyph_row->contains_overlapping_glyphs_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3600
26591
f7c7ef351f04 (direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents: 26546
diff changeset
3601 glyph_row->displays_text_p = 1;
f7c7ef351f04 (direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents: 26546
diff changeset
3602 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
3603 XFASTINT (w->window_end_vpos)));
f7c7ef351f04 (direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents: 26546
diff changeset
3604
25304
4b75c26bd356 (direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25241
diff changeset
3605 if (!NILP (Vshow_trailing_whitespace))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3606 highlight_trailing_whitespace (it.f, glyph_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3607
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3608 /* Write glyphs. If at end of row, we can simply call write_glyphs.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3609 In the middle, we have to insert glyphs. Note that this is now
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3610 implemented for X frames. The implementation uses updated_window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3611 and updated_row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3612 updated_row = glyph_row;
38988
53ae5a92e2fc (direct_output_for_insert): Set updated_area
Gerd Moellmann <gerd@gnu.org>
parents: 38748
diff changeset
3613 updated_area = TEXT_AREA;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3614 update_begin (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3615 if (rif)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3616 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3617 rif->update_window_begin_hook (w);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3618
36115
c0fac212cfcc (direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents: 36097
diff changeset
3619 if (glyphs == end - n
c0fac212cfcc (direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents: 36097
diff changeset
3620 /* 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
3621 || (glyphs == end - n - 1
c0fac212cfcc (direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents: 36097
diff changeset
3622 && (end - n)->charpos <= 0))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3623 rif->write_glyphs (glyphs, n);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3624 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3625 rif->insert_glyphs (glyphs, n);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3626 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3627 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3628 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3629 if (glyphs == end - n)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3630 write_glyphs (glyphs, n);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3631 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3632 insert_glyphs (glyphs, n);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3633 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3634
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3635 w->cursor.hpos += n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3636 w->cursor.x = it.current_x - it.first_visible_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3637 xassert (w->cursor.hpos >= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3638 && w->cursor.hpos < w->desired_matrix->matrix_w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3639
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3640 /* How to set the cursor differs depending on whether we are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3641 using a frame matrix or a window matrix. Note that when
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3642 a frame matrix is used, cursor_to expects frame coordinates,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3643 and the X and Y parameters are not used. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3644 if (window_redisplay_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3645 rif->cursor_to (w->cursor.vpos, w->cursor.hpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3646 w->cursor.y, w->cursor.x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3647 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3648 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3649 int x, y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3650 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
3651 + (INTEGERP (w->left_margin_cols)
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
3652 ? XFASTINT (w->left_margin_cols)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3653 : 0));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3654 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3655 cursor_to (y, x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3656 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3657
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3658 if (rif)
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
3659 rif->update_window_end_hook (w, 1, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3660 update_end (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3661 updated_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3662 fflush (stdout);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3663
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3664 TRACE ((stderr, "direct output for insert\n"));
44260
64c67a3eebb2 (direct_output_for_insert): Call
Gerd Moellmann <gerd@gnu.org>
parents: 43729
diff changeset
3665 mark_window_display_accurate (it.window, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3666 redisplay_performed_directly_p = 1;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3667 return 1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3668 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3669
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3670
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3671 /* Perform a direct display update for moving PT by N positions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3672 left or right. N < 0 means a movement backwards. This function
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3673 is currently only called for N == 1 or N == -1. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3674
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3675 int
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3676 direct_output_forward_char (n)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3677 int n;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3678 {
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
3679 struct frame *f = SELECTED_FRAME ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3680 struct window *w = XWINDOW (selected_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3681 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3682
26851
2513566d55fd (direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents: 26729
diff changeset
3683 /* 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
3684 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
3685 current_buffer, PT))
2513566d55fd (direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents: 26729
diff changeset
3686 return 0;
2513566d55fd (direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents: 26729
diff changeset
3687
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3688 /* Give up if face attributes have been changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3689 if (face_change_count)
17015
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
3690 return 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3691
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3692 /* Give up if current matrix is not up to date or we are
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3693 displaying a message. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3694 if (!display_completed || cursor_in_echo_area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3695 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3696
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3697 /* Give up if the buffer's direction is reversed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3698 if (!NILP (XBUFFER (w->buffer)->direction_reversed))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3699 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
3700
2794
9163e4e4752c (direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents: 2778
diff changeset
3701 /* 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
3702 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
3703 return 0;
9163e4e4752c (direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents: 2778
diff changeset
3704
25304
4b75c26bd356 (direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25241
diff changeset
3705 /* Can't use direct output if highlighting trailing whitespace. */
4b75c26bd356 (direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25241
diff changeset
3706 if (!NILP (Vshow_trailing_whitespace))
4b75c26bd356 (direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25241
diff changeset
3707 return 0;
4b75c26bd356 (direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25241
diff changeset
3708
25735
fcb92c26acf2 (direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents: 25725
diff changeset
3709 /* 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
3710 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
3711 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
3712 return 0;
fcb92c26acf2 (direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents: 25725
diff changeset
3713
30152
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
3714 /* 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
3715 minibuffer contents. */
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
3716 if (XWINDOW (minibuf_window) == w
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
3717 && EQ (minibuf_window, echo_area_window))
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
3718 return 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3719
25735
fcb92c26acf2 (direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents: 25725
diff changeset
3720 /* 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
3721 if (w->cursor.vpos < 0)
fcb92c26acf2 (direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents: 25725
diff changeset
3722 return 0;
fcb92c26acf2 (direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents: 25725
diff changeset
3723
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3724 row = MATRIX_ROW (w->current_matrix, w->cursor.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3725
31271
4f0c5eecc5a6 (build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents: 31093
diff changeset
3726 /* 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
3727 if (PT <= MATRIX_ROW_START_CHARPOS (row)
818a84568f83 (direct_output_forward_char): Fix character/byte
Gerd Moellmann <gerd@gnu.org>
parents: 41025
diff changeset
3728 || 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
3729 return 0;
4384
98605d0ea3cf (direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents: 4290
diff changeset
3730
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3731 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
3732
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3733 w->last_cursor = w->cursor;
16039
855c8d8ba0f0 Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents: 15896
diff changeset
3734 XSETFASTINT (w->last_point, PT);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3735
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3736 xassert (w->cursor.hpos >= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3737 && w->cursor.hpos < w->desired_matrix->matrix_w);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3738
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3739 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3740 rif->cursor_to (w->cursor.vpos, w->cursor.hpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3741 w->cursor.y, w->cursor.x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3742 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3743 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3744 int x, y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3745 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
3746 + (INTEGERP (w->left_margin_cols)
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
3747 ? XFASTINT (w->left_margin_cols)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3748 : 0));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3749 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3750 cursor_to (y, x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3751 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3752
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3753 fflush (stdout);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3754 redisplay_performed_directly_p = 1;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3755 return 1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3756 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3757
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3758
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3759
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3760 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3761 Frame Update
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3762 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3763
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3764 /* Update frame F based on the data in desired matrices.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3765
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3766 If FORCE_P is non-zero, don't let redisplay be stopped by detecting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3767 pending input. If INHIBIT_HAIRY_ID_P is non-zero, don't try
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3768 scrolling.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3769
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3770 Value is non-zero if redisplay was stopped due to pending input. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3771
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3772 int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3773 update_frame (f, force_p, inhibit_hairy_id_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3774 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3775 int force_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3776 int inhibit_hairy_id_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3777 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3778 /* 1 means display has been paused because of pending input. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3779 int paused_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3780 struct window *root_window = XWINDOW (f->root_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3781
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3782 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3783 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3784 /* We are working on window matrix basis. All windows whose
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3785 flag must_be_updated_p is set have to be updated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3786
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3787 /* Record that we are not working on frame matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3788 set_frame_matrix_frame (NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3789
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3790 /* Update all windows in the window tree of F, maybe stopping
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3791 when pending input is detected. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3792 update_begin (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3793
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3794 /* Update the menu bar on X frames that don't have toolkit
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3795 support. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3796 if (WINDOWP (f->menu_bar_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3797 update_window (XWINDOW (f->menu_bar_window), 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3798
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3799 /* 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
3800 if (WINDOWP (f->tool_bar_window))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3801 {
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
3802 struct window *w = XWINDOW (f->tool_bar_window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3803
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3804 /* Update tool-bar window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3805 if (w->must_be_updated_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3806 {
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
3807 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
3808
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3809 update_window (w, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3810 w->must_be_updated_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3811
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3812 /* Swap tool-bar strings. We swap because we want to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3813 reuse strings. */
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
3814 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
3815 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
3816 f->desired_tool_bar_string = tem;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3817 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3818 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3819
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3820
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3821 /* Update windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3822 paused_p = update_window_tree (root_window, force_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3823 update_end (f);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3824
31295
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3825 #if 0 /* This flush is a performance bottleneck under X,
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3826 and it doesn't seem to be necessary anyway. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3827 rif->flush_display (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3828 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3829 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3830 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3831 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3832 /* We are working on frame matrix basis. Set the frame on whose
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3833 frame matrix we operate. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3834 set_frame_matrix_frame (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3835
31295
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3836 /* Build F's desired matrix from window matrices. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3837 build_frame_matrix (f);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3838
31295
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3839 /* Update the display */
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3840 update_begin (f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3841 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
3842 update_end (f);
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3843
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3844 if (termscript)
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3845 fflush (termscript);
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3846 fflush (stdout);
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3847
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3848 /* 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
3849 #if GLYPH_DEBUG
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
3850 check_window_matrix_pointers (root_window);
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
3851 add_frame_display_history (f, paused_p);
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
3852 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3853 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3854
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3855 /* Reset flags indicating that a window should be updated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3856 set_window_update_flags (root_window, 0);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3857
31295
d4f918f0b184 (update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents: 31271
diff changeset
3858 display_completed = !paused_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3859 return paused_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3860 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3861
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3862
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3863
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3864 /************************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3865 Window-based updates
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3866 ************************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3867
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3868 /* Perform updates in window tree rooted at W. FORCE_P non-zero means
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3869 don't stop updating when input is pending. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3870
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3871 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3872 update_window_tree (w, force_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3873 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3874 int force_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3875 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3876 int paused_p = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3877
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3878 while (w && !paused_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3879 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3880 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3881 paused_p |= update_window_tree (XWINDOW (w->hchild), force_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3882 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3883 paused_p |= update_window_tree (XWINDOW (w->vchild), force_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3884 else if (w->must_be_updated_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3885 paused_p |= update_window (w, force_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3886
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3887 w = NILP (w->next) ? 0 : XWINDOW (w->next);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3888 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3889
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3890 return paused_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3891 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3892
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3893
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3894 /* Update window W if its flag must_be_updated_p is non-zero. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3895 FORCE_P is non-zero, don't stop updating if input is pending. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3896
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3897 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3898 update_single_window (w, force_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3899 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3900 int force_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3901 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3902 if (w->must_be_updated_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3903 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3904 struct frame *f = XFRAME (WINDOW_FRAME (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3905
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3906 /* Record that this is not a frame-based redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3907 set_frame_matrix_frame (NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3908
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3909 /* Update W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3910 update_begin (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3911 update_window (w, force_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3912 update_end (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3913
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3914 /* Reset flag in W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3915 w->must_be_updated_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3916 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3917 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3918
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
3919
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3920 /* 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
3921 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
3922
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3923 static void
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3924 redraw_overlapped_rows (w, yb)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3925 struct window *w;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3926 int yb;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3927 {
30165
d7ec5b3caccc (redraw_overlapped_rows): Add missing local.
Gerd Moellmann <gerd@gnu.org>
parents: 30161
diff changeset
3928 int i;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3929
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3930 /* 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
3931 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
3932 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
3933 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
3934 current rows is 0. */
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3935 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
3936 {
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
3937 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
3938
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3939 if (!row->enabled_p)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3940 break;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3941 else if (row->mode_line_p)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3942 continue;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3943
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3944 if (row->overlapped_p)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3945 {
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3946 enum glyph_row_area area;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3947
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3948 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
3949 {
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3950 updated_row = row;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3951 updated_area = area;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3952 rif->cursor_to (i, 0, row->y, area == TEXT_AREA ? row->x : 0);
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3953 if (row->used[area])
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3954 rif->write_glyphs (row->glyphs[area], row->used[area]);
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3955 rif->clear_end_of_line (-1);
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3956 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3957
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3958 row->overlapped_p = 0;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3959 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3960
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
3961 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
3962 break;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3963 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3964 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3965
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3966
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3967 /* 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
3968 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
3969
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3970 static void
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3971 redraw_overlapping_rows (w, yb)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3972 struct window *w;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3973 int yb;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3974 {
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3975 int i, bottom_y;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3976 struct glyph_row *row;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3977
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3978 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
3979 {
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3980 row = w->current_matrix->rows + i;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3981
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3982 if (!row->enabled_p)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3983 break;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3984 else if (row->mode_line_p)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3985 continue;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3986
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3987 bottom_y = MATRIX_ROW_BOTTOM_Y (row);
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3988
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3989 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
3990 {
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3991 if (row->used[LEFT_MARGIN_AREA])
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3992 rif->fix_overlapping_area (w, row, LEFT_MARGIN_AREA);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3993
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3994 if (row->used[TEXT_AREA])
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3995 rif->fix_overlapping_area (w, row, TEXT_AREA);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
3996
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3997 if (row->used[RIGHT_MARGIN_AREA])
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3998 rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA);
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
3999
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
4000 /* Record in neighbour rows that ROW overwrites part of their
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4001 display. */
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4002 if (row->phys_ascent > row->ascent && i > 0)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4003 MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4004 if ((row->phys_height - row->phys_ascent
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4005 > row->height - row->ascent)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4006 && bottom_y < yb)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4007 MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p = 1;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4008 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4009
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4010 if (bottom_y >= yb)
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4011 break;
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4012 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4013 }
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4014
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4015
34929
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4016 #ifdef GLYPH_DEBUG
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4017
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4018 /* 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
4019 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
4020
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4021 void
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4022 check_current_matrix_flags (w)
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4023 struct window *w;
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4024 {
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4025 int last_seen_p = 0;
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4026 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
4027
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4028 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
4029 {
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4030 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
4031 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
4032 last_seen_p = 1;
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4033 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
4034 abort ();
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4035 }
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4036 }
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4037
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4038 #endif /* GLYPH_DEBUG */
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4039
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4040
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4041 /* Update display of window W. FORCE_P non-zero means that we should
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4042 not stop when detecting pending input. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4043
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4044 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4045 update_window (w, force_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4046 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4047 int force_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4048 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4049 struct glyph_matrix *desired_matrix = w->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4050 int paused_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4051 int preempt_count = baud_rate / 2400 + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4052 extern int input_pending;
34517
7c8d2cec3d08 (update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents: 34279
diff changeset
4053 extern Lisp_Object do_mouse_tracking;
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4054 #if GLYPH_DEBUG
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4055 struct frame *f = XFRAME (WINDOW_FRAME (w));
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4056 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4057
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4058 /* Check that W's frame doesn't have glyph matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4059 xassert (FRAME_WINDOW_P (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4060 xassert (updating_frame != NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4061
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4062 /* Check pending input the first time so that we can quickly return. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4063 if (redisplay_dont_pause)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4064 force_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4065 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4066 detect_input_pending ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4067
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4068 /* If forced to complete the update, or if no input is pending, do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4069 the update. */
34517
7c8d2cec3d08 (update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents: 34279
diff changeset
4070 if (force_p || !input_pending || !NILP (do_mouse_tracking))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4071 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4072 struct glyph_row *row, *end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4073 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
4074 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
4075 int yb, changed_p = 0, mouse_face_overwritten_p = 0, n_updated;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4076
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4077 rif->update_window_begin_hook (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4078 yb = window_text_bottom_y (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4079
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
4080 /* 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
4081 Adjust y-positions of other rows by the header line height. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4082 row = desired_matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4083 end = row + desired_matrix->nrows - 1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4084
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4085 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
4086 {
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4087 header_line_row = row;
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4088 ++row;
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4089 }
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4090 else
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4091 header_line_row = NULL;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4092
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4093 /* Update the mode line, if necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4094 mode_line_row = MATRIX_MODE_LINE_ROW (desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4095 if (mode_line_row->mode_line_p && mode_line_row->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4096 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4097 mode_line_row->y = yb;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4098 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
4099 desired_matrix),
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4100 &mouse_face_overwritten_p);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4101 changed_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4102 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4103
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4104 /* Find first enabled row. Optimizations in redisplay_internal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4105 may lead to an update with only one row enabled. There may
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4106 be also completely empty matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4107 while (row < end && !row->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4108 ++row;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4109
31825
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4110 /* Try reusing part of the display by copying. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4111 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
4112 {
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4113 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
4114 if (rc < 0)
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4115 {
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4116 /* 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
4117 paused_p = 0;
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4118 goto set_cursor;
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4119 }
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4120 else if (rc > 0)
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4121 /* We've scrolled the display. */
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4122 force_p = 1;
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4123 changed_p = 1;
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4124 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4125
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
4126 /* Update the header line after scrolling because a new header
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4127 line would otherwise overwrite lines at the top of the window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4128 that can be scrolled. */
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
4129 if (header_line_row && header_line_row->enabled_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4130 {
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
4131 header_line_row->y = 0;
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4132 update_window_line (w, 0, &mouse_face_overwritten_p);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4133 changed_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4134 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4135
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4136 /* 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
4137 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
4138 if (row->enabled_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4139 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4140 int vpos = MATRIX_ROW_VPOS (row, desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4141 int i;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4142
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
4143 /* We'll have to play a little bit with when to
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4144 detect_input_pending. If it's done too often,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4145 scrolling large windows with repeated scroll-up
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4146 commands will too quickly pause redisplay. */
34622
877ed6cab304 (update_window): Detect pending input every nth line
Gerd Moellmann <gerd@gnu.org>
parents: 34517
diff changeset
4147 if (!force_p && ++n_updated % preempt_count == 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4148 detect_input_pending ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4149
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4150 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
4151 &mouse_face_overwritten_p);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4152
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4153 /* Mark all rows below the last visible one in the current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4154 matrix as invalid. This is necessary because of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4155 variable line heights. Consider the case of three
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4156 successive redisplays, where the first displays 5
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4157 lines, the second 3 lines, and the third 5 lines again.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4158 If the second redisplay wouldn't mark rows in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4159 current matrix invalid, the third redisplay might be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4160 tempted to optimize redisplay based on lines displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4161 in the first redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4162 if (MATRIX_ROW_BOTTOM_Y (row) >= yb)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4163 for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4164 MATRIX_ROW (w->current_matrix, i)->enabled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4165 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4166
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4167 /* Was display preempted? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4168 paused_p = row < end;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4169
38489
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4170 set_cursor:
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4171
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
4172 /* Fix the appearance of overlapping/overlapped rows. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4173 if (!paused_p && !w->pseudo_window_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4174 {
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4175 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
4176 {
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4177 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
4178 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
4179 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4180
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4181 /* Make cursor visible at cursor position of W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4182 set_window_cursor_after_update (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4183
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4184 #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
4185 for debugging only. See the comment of check_matrix_invariants. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4186 IF_DEBUG (check_matrix_invariants (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4187 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4188 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4189
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4190 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4191 /* Remember the redisplay method used to display the matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4192 strcpy (w->current_matrix->method, w->desired_matrix->method);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4193 #endif
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4194
38489
19cb32759a2a (update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents: 38354
diff changeset
4195 /* 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
4196 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
4197 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
4198 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
4199 rif->update_window_end_hook (w, !paused_p, mouse_face_overwritten_p);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4200 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4201 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4202 paused_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4203
34893
779bd3fa820e Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents: 34866
diff changeset
4204 #if GLYPH_DEBUG
34944
4fc804373f2a (update_window): Don't check_current_matrix_flags.
Gerd Moellmann <gerd@gnu.org>
parents: 34929
diff changeset
4205 /* check_current_matrix_flags (w); */
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
4206 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
4207 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4208
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4209 clear_glyph_matrix (desired_matrix);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4210
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4211 return paused_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4212 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4213
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4214
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4215 /* Update the display of area AREA in window W, row number VPOS.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4216 AREA can be either LEFT_MARGIN_AREA or RIGHT_MARGIN_AREA. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4217
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4218 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4219 update_marginal_area (w, area, vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4220 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4221 int area, vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4222 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4223 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4224
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4225 /* Let functions in xterm.c know what area subsequent X positions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4226 will be relative to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4227 updated_area = area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4228
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4229 /* Set cursor to start of glyphs, write them, and clear to the end
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4230 of the area. I don't think that something more sophisticated is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4231 necessary here, since marginal areas will not be the default. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4232 rif->cursor_to (vpos, 0, desired_row->y, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4233 if (desired_row->used[area])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4234 rif->write_glyphs (desired_row->glyphs[area], desired_row->used[area]);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4235 rif->clear_end_of_line (-1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4236 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4237
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4238
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4239 /* 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
4240 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
4241
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4242 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4243 update_text_area (w, vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4244 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4245 int vpos;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4246 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4247 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4248 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4249 int changed_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4250
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4251 /* Let functions in xterm.c know what area subsequent X positions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4252 will be relative to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4253 updated_area = TEXT_AREA;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4254
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4255 /* If rows are at different X or Y, or rows have different height,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4256 or the current row is marked invalid, write the entire line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4257 if (!current_row->enabled_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4258 || desired_row->y != current_row->y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4259 || desired_row->ascent != current_row->ascent
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4260 || 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
4261 || desired_row->phys_height != current_row->phys_height
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4262 || 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
4263 || current_row->overlapped_p
30307
faf4e303bab7 (update_text_area): Write the whole row if it
Gerd Moellmann <gerd@gnu.org>
parents: 30165
diff changeset
4264 || current_row->mouse_face_p
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4265 || current_row->x != desired_row->x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4266 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4267 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
4268
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4269 if (desired_row->used[TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4270 rif->write_glyphs (desired_row->glyphs[TEXT_AREA],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4271 desired_row->used[TEXT_AREA]);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4272
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4273 /* Clear to end of window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4274 rif->clear_end_of_line (-1);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4275 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
4276
cf2454d3a103 (update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents: 44580
diff changeset
4277 /* 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
4278 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
4279 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
4280 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
4281 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
4282 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
4283 redisplay. */
cf2454d3a103 (update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents: 44580
diff changeset
4284 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
4285 w->phys_cursor_on_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4286 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4287 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4288 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4289 int stop, i, x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4290 struct glyph *current_glyph = current_row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4291 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
4292 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
4293 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
4294
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4295 /* If the desired row extends its face to the text area end,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4296 make sure we write at least one glyph, so that the face
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4297 extension actually takes place. */
35269
ec15c68b25ba Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 35268
diff changeset
4298 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row))
35268
d93bf580d166 (update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents: 35006
diff changeset
4299 --desired_stop_pos;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4300
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4301 stop = min (current_row->used[TEXT_AREA], desired_stop_pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4302 i = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4303 x = desired_row->x;
36097
1dfaaf6d6166 (update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents: 35924
diff changeset
4304
1dfaaf6d6166 (update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents: 35924
diff changeset
4305 /* 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
4306 in common. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4307 while (i < stop)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4308 {
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4309 int can_skip_p = 1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4310
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4311 /* 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
4312 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
4313 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
4314 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
4315 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
4316 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
4317 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
4318 `f' on the screen. */
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4319 if (overlapping_glyphs_p && i > 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4320 {
33596
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4321 struct glyph *glyph = &current_row->glyphs[TEXT_AREA][i - 1];
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4322 int left, right;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4323
33596
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4324 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
4325 &left, &right);
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4326 can_skip_p = right == 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4327 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4328
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4329 if (can_skip_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4330 {
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4331 while (i < stop
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4332 && GLYPH_EQUAL_P (desired_glyph, current_glyph))
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4333 {
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4334 x += desired_glyph->pixel_width;
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4335 ++desired_glyph, ++current_glyph, ++i;
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4336 }
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4337
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4338 /* 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
4339 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
4340 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
4341 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
4342 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
4343 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
4344 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
4345 taken care of by draw_glyphs. */
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4346 if (overlapping_glyphs_p
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4347 && i > 0
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4348 && i < current_row->used[TEXT_AREA]
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4349 && (current_row->used[TEXT_AREA]
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4350 != desired_row->used[TEXT_AREA]))
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4351 {
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4352 int left, right;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4353
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4354 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
4355 &left, &right);
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4356 while (left > 0 && i > 0)
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4357 {
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4358 --i, --desired_glyph, --current_glyph;
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4359 x -= desired_glyph->pixel_width;
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4360 left -= desired_glyph->pixel_width;
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4361 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4362 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4363 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4364
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4365 /* Try to avoid writing the entire rest of the desired row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4366 by looking for a resync point. This mainly prevents
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4367 mode line flickering in the case the mode line is in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4368 fixed-pitch font, which it usually will be. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4369 if (i < desired_row->used[TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4370 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4371 int start_x = x, start_hpos = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4372 struct glyph *start = desired_glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4373 int current_x = x;
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4374 int skip_first_p = !can_skip_p;
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4375
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4376 /* Find the next glyph that's equal again. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4377 while (i < stop
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4378 && (skip_first_p
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4379 || !GLYPH_EQUAL_P (desired_glyph, current_glyph))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4380 && x == current_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4381 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4382 x += desired_glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4383 current_x += current_glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4384 ++desired_glyph, ++current_glyph, ++i;
33603
6697403d3c12 (update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents: 33596
diff changeset
4385 skip_first_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4386 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4387
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4388 if (i == start_hpos || x != current_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4389 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4390 i = start_hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4391 x = start_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4392 desired_glyph = start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4393 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4394 }
33596
680ddd4ab1f9 (update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents: 33527
diff changeset
4395
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4396 rif->cursor_to (vpos, start_hpos, desired_row->y, start_x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4397 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
4398 changed_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4399 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4400 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4401
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4402 /* Write the rest. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4403 if (i < desired_row->used[TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4404 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4405 rif->cursor_to (vpos, i, desired_row->y, x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4406 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
4407 changed_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4408 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4409
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4410 /* Maybe clear to end of line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4411 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4412 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4413 /* If new row extends to the end of the text area, nothing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4414 has to be cleared, if and only if we did a write_glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4415 above. This is made sure by setting desired_stop_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4416 appropriately above. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4417 xassert (i < desired_row->used[TEXT_AREA]);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4418 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4419 else if (MATRIX_ROW_EXTENDS_FACE_P (current_row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4420 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4421 /* If old row extends to the end of the text area, clear. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4422 if (i >= desired_row->used[TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4423 rif->cursor_to (vpos, i, desired_row->y,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4424 desired_row->x + desired_row->pixel_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4425 rif->clear_end_of_line (-1);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4426 changed_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4427 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4428 else if (desired_row->pixel_width < current_row->pixel_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4429 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4430 /* Otherwise clear to the end of the old row. Everything
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4431 after that position should be clear already. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4432 int x;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4433
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4434 if (i >= desired_row->used[TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4435 rif->cursor_to (vpos, i, desired_row->y,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4436 desired_row->x + desired_row->pixel_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4437
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4438 /* If cursor is displayed at the end of the line, make sure
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4439 it's cleared. Nowadays we don't have a phys_cursor_glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4440 with which to erase the cursor (because this method
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4441 doesn't work with lbearing/rbearing), so we must do it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4442 this way. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4443 if (vpos == w->phys_cursor.vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4444 && w->phys_cursor.hpos >= desired_row->used[TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4445 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4446 w->phys_cursor_on_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4447 x = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4448 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4449 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4450 x = current_row->x + current_row->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4451 rif->clear_end_of_line (x);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4452 changed_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4453 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4454 }
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4455
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4456 return changed_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4457 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4458
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4459
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4460 /* 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
4461 changed. */
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4462
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4463 static int
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4464 update_window_line (w, vpos, mouse_face_overwritten_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4465 struct window *w;
30161
8be2bf27e9ad (make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents: 30152
diff changeset
4466 int vpos, *mouse_face_overwritten_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4467 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4468 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4469 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos);
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4470 int changed_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4471
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4472 /* Set the row being updated. This is important to let xterm.c
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4473 know what line height values are in effect. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4474 updated_row = desired_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4475
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4476 /* 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
4477 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
4478 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
4479 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
4480 if (desired_row->mode_line_p
59b455472b56 (update_window_line): Make sure to always draw
Gerd Moellmann <gerd@gnu.org>
parents: 31690
diff changeset
4481 || desired_row->visible_height > 0)
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4482 {
31690
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4483 xassert (desired_row->enabled_p);
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4484
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4485 /* 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
4486 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
4487 && !NILP (w->left_margin_cols))
31690
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4488 {
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4489 changed_p = 1;
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4490 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
4491 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4492
31690
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4493 /* Update the display of the text area. */
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4494 if (update_text_area (w, vpos))
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4495 {
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4496 changed_p = 1;
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4497 if (current_row->mouse_face_p)
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4498 *mouse_face_overwritten_p = 1;
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4499 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4500
31690
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4501 /* 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
4502 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
4503 && !NILP (w->right_margin_cols))
31690
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4504 {
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4505 changed_p = 1;
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4506 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
4507 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4508
31690
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4509 /* Draw truncation marks etc. */
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4510 if (!current_row->enabled_p
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4511 || desired_row->y != current_row->y
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4512 || desired_row->visible_height != current_row->visible_height
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4513 || desired_row->overlay_arrow_p != current_row->overlay_arrow_p
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4514 || desired_row->truncated_on_left_p != current_row->truncated_on_left_p
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4515 || desired_row->truncated_on_right_p != current_row->truncated_on_right_p
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4516 || desired_row->continued_p != current_row->continued_p
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4517 || desired_row->mode_line_p != current_row->mode_line_p
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4518 || (desired_row->indicate_empty_line_p
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4519 != current_row->indicate_empty_line_p)
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4520 || (MATRIX_ROW_CONTINUATION_LINE_P (desired_row)
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4521 != MATRIX_ROW_CONTINUATION_LINE_P (current_row)))
6abff42174ea (update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents: 31653
diff changeset
4522 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
4523 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4524
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4525 /* Update current_row from desired_row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4526 make_current (w->desired_matrix, w->current_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4527 updated_row = NULL;
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
4528 return changed_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4529 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4530
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4531
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4532 /* Set the cursor after an update of window W. This function may only
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4533 be called from update_window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4534
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4535 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4536 set_window_cursor_after_update (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4537 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4538 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4539 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4540 int cx, cy, vpos, hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4541
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4542 /* Not intended for frame matrix updates. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4543 xassert (FRAME_WINDOW_P (f));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4544
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4545 if (cursor_in_echo_area
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4546 && !NILP (echo_area_buffer[0])
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4547 /* 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
4548 show the cursor for the message instead. */
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4549 && XWINDOW (minibuf_window) == w
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4550 && EQ (minibuf_window, echo_area_window)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4551 /* These cases apply only to the frame that contains
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4552 the active mini-buffer window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4553 && FRAME_HAS_MINIBUF_P (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4554 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4555 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4556 cx = cy = vpos = hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4557
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4558 if (cursor_in_echo_area >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4559 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4560 /* If the mini-buffer is several lines high, find the last
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4561 line that has any text on it. Note: either all lines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4562 are enabled or none. Otherwise we wouldn't be able to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4563 determine Y. */
25190
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4564 struct glyph_row *row, *last_row;
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4565 struct glyph *glyph;
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4566 int yb = window_text_bottom_y (w);
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4567
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4568 last_row = NULL;
39254
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4569 row = w->current_matrix->rows;
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4570 while (row->enabled_p
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4571 && (last_row == NULL
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4572 || MATRIX_ROW_BOTTOM_Y (row) <= yb))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4573 {
25190
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4574 if (row->used[TEXT_AREA]
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4575 && row->glyphs[TEXT_AREA][0].charpos >= 0)
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4576 last_row = row;
39254
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4577 ++row;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4578 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4579
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4580 if (last_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4581 {
39254
73dd40615520 (set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents: 39226
diff changeset
4582 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
4583 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
4584
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
4585 while (last > start && last->charpos < 0)
25190
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4586 --last;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4587
25190
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4588 for (glyph = start; glyph < last; ++glyph)
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4589 {
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4590 cx += glyph->pixel_width;
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4591 ++hpos;
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4592 }
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4593
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4594 cy = last_row->y;
25190
a14edd4a5f4a (set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents: 25186
diff changeset
4595 vpos = MATRIX_ROW_VPOS (last_row, w->current_matrix);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4596 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4597 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4598 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4599 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4600 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4601 cx = w->cursor.x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4602 cy = w->cursor.y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4603 hpos = w->cursor.hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4604 vpos = w->cursor.vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4605 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4606
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4607 /* Window cursor can be out of sync for horizontally split windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4608 hpos = max (0, hpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4609 hpos = min (w->current_matrix->matrix_w - 1, hpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4610 vpos = max (0, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4611 vpos = min (w->current_matrix->nrows - 1, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4612 rif->cursor_to (vpos, hpos, cy, cx);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4613 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4614
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4615
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4616 /* 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
4617 tree rooted at W. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4618
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4619 void
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4620 set_window_update_flags (w, on_p)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4621 struct window *w;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4622 int on_p;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4623 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4624 while (w)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4625 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4626 if (!NILP (w->hchild))
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4627 set_window_update_flags (XWINDOW (w->hchild), on_p);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4628 else if (!NILP (w->vchild))
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4629 set_window_update_flags (XWINDOW (w->vchild), on_p);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4630 else
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4631 w->must_be_updated_p = on_p;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4632
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4633 w = NILP (w->next) ? 0 : XWINDOW (w->next);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4634 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4635 }
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4636
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4637
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4638
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4639 /***********************************************************************
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4640 Window-Based Scrolling
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4641 ***********************************************************************/
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4642
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4643 /* Structure describing rows in scrolling_window. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4644
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4645 struct row_entry
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4646 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4647 /* 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
4648 int old_uses, new_uses;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4649
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4650 /* Vpos of row in new matrix. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4651 int new_line_number;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4652
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4653 /* 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
4654 int bucket;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4655
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4656 /* The row described by this entry. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4657 struct glyph_row *row;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4658
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4659 /* Hash collision chain. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4660 struct row_entry *next;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4661 };
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4662
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4663 /* 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
4664 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
4665 that we need a larger one. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4666
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4667 static struct row_entry *row_entry_pool;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4668 static int row_entry_pool_size;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4669
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4670 /* Index of next free entry in row_entry_pool. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4671
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4672 static int row_entry_idx;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4673
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4674 /* 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
4675 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
4676 current matrix. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4677
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4678 static struct row_entry **row_table;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4679 static int row_table_size;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4680
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4681 /* 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
4682 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
4683
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4684 static struct row_entry **old_lines, **new_lines;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4685 static int old_lines_size, new_lines_size;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4686
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4687 /* 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
4688
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4689 static struct run *run_pool;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4690 static int runs_size;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4691
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4692 /* A vector of runs of lines found during scrolling. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4693
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4694 static struct run **runs;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4695
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4696 /* 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
4697 of window W. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4698
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4699 static INLINE struct row_entry *
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4700 add_row_entry (w, row)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4701 struct window *w;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4702 struct glyph_row *row;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4703 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4704 struct row_entry *entry;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4705 int i = row->hash % row_table_size;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4706
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4707 entry = row_table[i];
30152
f6270e5282da (direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents: 30041
diff changeset
4708 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
4709 entry = entry->next;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4710
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4711 if (entry == NULL)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4712 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4713 entry = row_entry_pool + row_entry_idx++;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4714 entry->row = row;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4715 entry->old_uses = entry->new_uses = 0;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4716 entry->new_line_number = 0;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4717 entry->bucket = i;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4718 entry->next = row_table[i];
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4719 row_table[i] = entry;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4720 }
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4721
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4722 return entry;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4723 }
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4724
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4725
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4726 /* 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
4727 HEADER_LINE_P non-zero means W has a header line.
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4728
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4729 The algorithm is taken from Communications of the ACM, Apr78 "A
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4730 Technique for Isolating Differences Between Files." It should take
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4731 O(N) time.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4732
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4733 A short outline of the steps of the algorithm
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4734
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4735 1. Skip lines equal at the start and end of both matrices.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4736
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4737 2. Enter rows in the current and desired matrix into a symbol
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4738 table, counting how often they appear in both matrices.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4739
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4740 3. Rows that appear exactly once in both matrices serve as anchors,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4741 i.e. we assume that such lines are likely to have been moved.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4742
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4743 4. Starting from anchor lines, extend regions to be scrolled both
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4744 forward and backward.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4745
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4746 Value is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4747
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4748 -1 if all rows were found to be equal.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4749 0 to indicate that we did not scroll the display, or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4750 1 if we did scroll. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4751
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4752 static int
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
4753 scrolling_window (w, header_line_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4754 struct window *w;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
4755 int header_line_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4756 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4757 struct glyph_matrix *desired_matrix = w->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4758 struct glyph_matrix *current_matrix = w->current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4759 int yb = window_text_bottom_y (w);
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4760 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
4761 int nruns, nbytes, n, run_idx;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4762 struct row_entry *entry;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4763
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4764 /* 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
4765 for (i = header_line_p ? 1 : 0; i < current_matrix->nrows - 1; ++i)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4766 {
31825
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4767 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
4768 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
4769
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4770 if (c->enabled_p
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4771 && d->enabled_p
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4772 && c->y == d->y
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4773 && MATRIX_ROW_BOTTOM_Y (c) <= yb
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4774 && MATRIX_ROW_BOTTOM_Y (d) <= yb
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4775 && row_equal_p (w, c, d, 1))
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4776 {
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4777 assign_row (c, d);
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4778 d->enabled_p = 0;
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4779 }
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4780 else
62830644b967 (scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents: 31726
diff changeset
4781 break;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4782 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4783
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4784 /* Give up if some rows in the desired matrix are not enabled. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4785 if (!MATRIX_ROW (desired_matrix, i)->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4786 return -1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4787
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4788 first_old = first_new = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4789
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4790 /* Set last_new to the index + 1 of the last enabled row in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4791 desired matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4792 i = first_new + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4793 while (i < desired_matrix->nrows - 1
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4794 && MATRIX_ROW (desired_matrix, i)->enabled_p
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4795 && MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (desired_matrix, i)) <= yb)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4796 ++i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4797
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4798 if (!MATRIX_ROW (desired_matrix, i)->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4799 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4800
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4801 last_new = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4802
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4803 /* Set last_old to the index + 1 of the last enabled row in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4804 current matrix. We don't look at the enabled flag here because
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4805 we plan to reuse part of the display even if other parts are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4806 disabled. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4807 i = first_old + 1;
34929
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4808 while (i < current_matrix->nrows - 1)
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4809 {
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4810 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
4811 if (bottom <= yb)
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4812 ++i;
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4813 if (bottom >= yb)
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4814 break;
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4815 }
b116257b3b28 (check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
4816
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4817 last_old = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4818
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4819 /* Skip over rows equal at the bottom. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4820 i = last_new;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4821 j = last_old;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4822 while (i - 1 > first_new
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4823 && j - 1 > first_old
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4824 && MATRIX_ROW (current_matrix, i - 1)->enabled_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4825 && (MATRIX_ROW (current_matrix, i - 1)->y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4826 == MATRIX_ROW (desired_matrix, j - 1)->y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4827 && row_equal_p (w,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4828 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
4829 MATRIX_ROW (current_matrix, j - 1), 1))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4830 --i, --j;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4831 last_new = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4832 last_old = j;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4833
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4834 /* Nothing to do if all rows are equal. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4835 if (last_new == first_new)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4836 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4837
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4838 /* Reallocate vectors, tables etc. if necessary. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4839
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4840 if (current_matrix->nrows > old_lines_size)
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 old_lines_size = current_matrix->nrows;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4843 nbytes = old_lines_size * sizeof *old_lines;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4844 old_lines = (struct row_entry **) xrealloc (old_lines, nbytes);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4845 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4846
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4847 if (desired_matrix->nrows > new_lines_size)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4848 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4849 new_lines_size = desired_matrix->nrows;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4850 nbytes = new_lines_size * sizeof *new_lines;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4851 new_lines = (struct row_entry **) xrealloc (new_lines, nbytes);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4852 }
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4853
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4854 n = desired_matrix->nrows + current_matrix->nrows;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4855 if (3 * n > row_table_size)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4856 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4857 row_table_size = next_almost_prime (3 * n);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4858 nbytes = row_table_size * sizeof *row_table;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4859 row_table = (struct row_entry **) xrealloc (row_table, nbytes);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4860 bzero (row_table, nbytes);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4861 }
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4862
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4863 if (n > row_entry_pool_size)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4864 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4865 row_entry_pool_size = n;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4866 nbytes = row_entry_pool_size * sizeof *row_entry_pool;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4867 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
4868 }
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 if (desired_matrix->nrows > runs_size)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4871 {
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4872 runs_size = desired_matrix->nrows;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4873 nbytes = runs_size * sizeof *runs;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4874 runs = (struct run **) xrealloc (runs, nbytes);
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4875 nbytes = runs_size * sizeof *run_pool;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4876 run_pool = (struct run *) xrealloc (run_pool, nbytes);
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
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4879 nruns = run_idx = 0;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4880 row_entry_idx = 0;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4881
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4882 /* 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
4883 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
4884
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4885 for (i = first_old; i < last_old; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4886 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4887 if (MATRIX_ROW (current_matrix, i)->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4888 {
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4889 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
4890 old_lines[i] = entry;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4891 ++entry->old_uses;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4892 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4893 else
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4894 old_lines[i] = NULL;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4895 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4896
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4897 for (i = first_new; i < last_new; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4898 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4899 xassert (MATRIX_ROW_ENABLED_P (desired_matrix, i));
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4900 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
4901 ++entry->new_uses;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4902 entry->new_line_number = i;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4903 new_lines[i] = entry;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4904 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4905
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4906 /* Identify moves based on lines that are unique and equal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4907 in both matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4908 for (i = first_old; i < last_old;)
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4909 if (old_lines[i]
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4910 && old_lines[i]->old_uses == 1
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4911 && old_lines[i]->new_uses == 1)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4912 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4913 int j, k;
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4914 int new_line = old_lines[i]->new_line_number;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4915 struct run *run = run_pool + run_idx++;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4916
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4917 /* Record move. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4918 run->current_vpos = i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4919 run->current_y = MATRIX_ROW (current_matrix, i)->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4920 run->desired_vpos = new_line;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4921 run->desired_y = MATRIX_ROW (desired_matrix, new_line)->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4922 run->nrows = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4923 run->height = MATRIX_ROW (current_matrix, i)->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4924
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4925 /* Extend backward. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4926 j = i - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4927 k = new_line - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4928 while (j > first_old
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4929 && k > first_new
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4930 && old_lines[j] == new_lines[k])
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4931 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4932 int h = MATRIX_ROW (current_matrix, j)->height;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4933 --run->current_vpos;
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4934 --run->desired_vpos;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4935 ++run->nrows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4936 run->height += h;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4937 run->desired_y -= h;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4938 run->current_y -= h;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4939 --j, --k;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4940 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4941
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4942 /* Extend forward. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4943 j = i + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4944 k = new_line + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4945 while (j < last_old
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4946 && k < last_new
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
4947 && old_lines[j] == new_lines[k])
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4948 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4949 int h = MATRIX_ROW (current_matrix, j)->height;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
4950 ++run->nrows;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4951 run->height += h;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4952 ++j, ++k;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4953 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4954
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4955 /* Insert run into list of all runs. Order runs by copied
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4956 pixel lines. Note that we record runs that don't have to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4957 be copied because they are already in place. This is done
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4958 because we can avoid calling update_window_line in this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4959 case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4960 for (j = 0; j < nruns && runs[j]->height > run->height; ++j)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4961 ;
34203
e55480843a8e (scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents: 33763
diff changeset
4962 for (k = nruns; k > j; --k)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4963 runs[k] = runs[k - 1];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4964 runs[j] = run;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4965 ++nruns;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4966
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4967 i += run->nrows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4968 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4969 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4970 ++i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4971
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4972 /* Do the moves. Do it in a way that we don't overwrite something
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4973 we want to copy later on. This is not solvable in general
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4974 because there is only one display and we don't have a way to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4975 exchange areas on this display. Example:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4976
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4977 +-----------+ +-----------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4978 | A | | B |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4979 +-----------+ --> +-----------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4980 | B | | A |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4981 +-----------+ +-----------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4982
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4983 Instead, prefer bigger moves, and invalidate moves that would
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4984 copy from where we copied to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4985
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4986 for (i = 0; i < nruns; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4987 if (runs[i]->nrows > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4988 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4989 struct run *r = runs[i];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4990
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4991 /* Copy on the display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4992 if (r->current_y != r->desired_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4993 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4994 rif->scroll_run_hook (w, r);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4995
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4996 /* Invalidate runs that copy from where we copied to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4997 for (j = i + 1; j < nruns; ++j)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4998 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
4999 struct run *p = runs[j];
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5000
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5001 if ((p->current_y >= r->desired_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5002 && p->current_y < r->desired_y + r->height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5003 || (p->current_y + p->height >= r->desired_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5004 && (p->current_y + p->height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5005 < r->desired_y + r->height)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5006 p->nrows = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5007 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5008 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5009
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5010 /* Assign matrix rows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5011 for (j = 0; j < r->nrows; ++j)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5012 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5013 struct glyph_row *from, *to;
25186
d6c941334567 (redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25118
diff changeset
5014 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
5015
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5016 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
5017 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
5018 to_overlapped_p = to->overlapped_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5019 assign_row (to, from);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5020 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
5021 to->overlapped_p = to_overlapped_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5022 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5023 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5024
29980
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
5025 /* Clear the hash table, for the next time. */
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
5026 for (i = 0; i < row_entry_idx; ++i)
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
5027 row_table[row_entry_pool[i].bucket] = NULL;
171ba59e1cb0 (struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents: 29687
diff changeset
5028
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5029 /* Value is non-zero to indicate that we scrolled the display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5030 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5031 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5032
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5033
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5034
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5035 /************************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5036 Frame-Based Updates
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5037 ************************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5038
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5039 /* Update the desired frame matrix of frame F.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5040
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5041 FORCE_P non-zero means that the update should not be stopped by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5042 pending input. INHIBIT_HAIRY_ID_P non-zero means that scrolling
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5043 should not be tried.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5044
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5045 Value is non-zero if update was stopped due to pending input. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5046
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5047 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5048 update_frame_1 (f, force_p, inhibit_id_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5049 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5050 int force_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5051 int inhibit_id_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5052 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5053 /* Frame matrices to work on. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5054 struct glyph_matrix *current_matrix = f->current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5055 struct glyph_matrix *desired_matrix = f->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5056 int i;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5057 int pause;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5058 int preempt_count = baud_rate / 2400 + 1;
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
5059 extern int input_pending;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5060
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5061 xassert (current_matrix && desired_matrix);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5062
10122
3de6776ae141 (update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents: 9963
diff changeset
5063 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
5064 calculate_costs (f);
3de6776ae141 (update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents: 9963
diff changeset
5065
3357
d9523a958b3c (update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents: 3317
diff changeset
5066 if (preempt_count <= 0)
d9523a958b3c (update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents: 3317
diff changeset
5067 preempt_count = 1;
d9523a958b3c (update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents: 3317
diff changeset
5068
30720
64f3338f72d8 (Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30713
diff changeset
5069 if (redisplay_dont_pause)
64f3338f72d8 (Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30713
diff changeset
5070 force_p = 1;
64f3338f72d8 (Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30713
diff changeset
5071 else if (!force_p && detect_input_pending ())
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5072 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5073 pause = 1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5074 goto do_pause;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5075 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5076
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5077 /* If we cannot insert/delete lines, it's no use trying it. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5078 if (!line_ins_del_ok)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5079 inhibit_id_p = 1;
7188
7da4ad9a2a8f (update_frame): Move those assignments even farther down.
Richard M. Stallman <rms@gnu.org>
parents: 7179
diff changeset
5080
493
8b101799ff37 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 451
diff changeset
5081 /* See if any of the desired lines are enabled; don't compute for
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5082 i/d line if just want cursor motion. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5083 for (i = 0; i < desired_matrix->nrows; i++)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5084 if (MATRIX_ROW_ENABLED_P (desired_matrix, i))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5085 break;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5086
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5087 /* Try doing i/d line, if not yet inhibited. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5088 if (!inhibit_id_p && i < desired_matrix->nrows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5089 force_p |= scrolling (f);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5090
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5091 /* Update the individual lines as needed. Do bottom line first. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5092 if (MATRIX_ROW_ENABLED_P (desired_matrix, desired_matrix->nrows - 1))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5093 update_frame_line (f, desired_matrix->nrows - 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5094
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5095 /* Now update the rest of the lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5096 for (i = 0; i < desired_matrix->nrows - 1 && (force_p || !input_pending); i++)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5097 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5098 if (MATRIX_ROW_ENABLED_P (desired_matrix, i))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5099 {
960
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5100 if (FRAME_TERMCAP_P (f))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5101 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5102 /* Flush out every so many lines.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5103 Also flush out if likely to have more than 1k buffered
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5104 otherwise. I'm told that some telnet connections get
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5105 really screwed by more than 1k output at once. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5106 int outq = PENDING_OUTPUT_COUNT (stdout);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5107 if (outq > 900
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5108 || (outq > 20 && ((i - 1) % preempt_count == 0)))
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5109 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5110 fflush (stdout);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5111 if (preempt_count == 1)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5112 {
554
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
5113 #ifdef EMACS_OUTQSIZE
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
5114 if (EMACS_OUTQSIZE (0, &outq) < 0)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5115 /* Probably not a tty. Ignore the error and reset
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
5116 the outq count. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5117 outq = PENDING_OUTPUT_COUNT (stdout);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5118 #endif
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5119 outq *= 10;
7530
57c2345a9002 (update_frame): Fix test of outq and baud_rate some more.
Richard M. Stallman <rms@gnu.org>
parents: 7529
diff changeset
5120 if (baud_rate <= outq && baud_rate > 0)
3357
d9523a958b3c (update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents: 3317
diff changeset
5121 sleep (outq / baud_rate);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5122 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5123 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5124 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5125
16822
483e137d5384 (update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents: 16589
diff changeset
5126 if ((i - 1) % preempt_count == 0)
483e137d5384 (update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents: 16589
diff changeset
5127 detect_input_pending ();
483e137d5384 (update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents: 16589
diff changeset
5128
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5129 update_frame_line (f, i);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5130 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5131 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5132
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5133 pause = (i < FRAME_LINES (f) - 1) ? i : 0;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5134
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5135 /* Now just clean up termcap drivers and set cursor, etc. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5136 if (!pause)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5137 {
12409
6e374b28ecc3 (update_frame): Pretend cursor is in echo area
Richard M. Stallman <rms@gnu.org>
parents: 12193
diff changeset
5138 if ((cursor_in_echo_area
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5139 /* 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
5140 show the cursor for the message instead of for the
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5141 (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
5142 || (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
5143 && EQ (minibuf_window, echo_area_window)
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5144 && !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
5145 /* These cases apply only to the frame that contains
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5146 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
5147 && FRAME_HAS_MINIBUF_P (f)
14459
c1d25453a95f (update_frame): Compare FRAME_MINIBUF_WINDOW(f)
Richard M. Stallman <rms@gnu.org>
parents: 14286
diff changeset
5148 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window))
708
030fb4635335 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 687
diff changeset
5149 {
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5150 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
5151 int row, col;
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5152
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5153 if (cursor_in_echo_area < 0)
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5154 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5155 /* Negative value of cursor_in_echo_area means put
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5156 cursor at beginning of line. */
1042
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5157 row = top;
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5158 col = 0;
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5159 }
708
030fb4635335 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 687
diff changeset
5160 else
1042
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5161 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5162 /* Positive value of cursor_in_echo_area means put
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5163 cursor at the end of the prompt. If the mini-buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5164 is several lines high, find the last line that has
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5165 any text on it. */
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5166 row = FRAME_LINES (f);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5167 do
1042
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5168 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5169 --row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5170 col = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5171
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5172 if (MATRIX_ROW_ENABLED_P (current_matrix, row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5173 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5174 /* Frame rows are filled up with spaces that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5175 must be ignored here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5176 struct glyph_row *r = MATRIX_ROW (current_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5177 row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5178 struct glyph *start = r->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5179 struct glyph *last = start + r->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5180
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5181 while (last > start
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5182 && (last - 1)->charpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5183 --last;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5184
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5185 col = last - start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5186 }
1042
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5187 }
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5188 while (row > top && col == 0);
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5189
21757
629f6df4a329 (update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
5190 /* 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
5191 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
5192 {
21757
629f6df4a329 (update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
5193 /* 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
5194 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
5195 {
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5196 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
5197 row++;
629f6df4a329 (update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
5198 }
629f6df4a329 (update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
5199 /* 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
5200 else
21763
b685f9451792 (change_frame_size_1): Use FRAME_CURSOR_X_LIMIT.
Richard M. Stallman <rms@gnu.org>
parents: 21757
diff changeset
5201 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
5202 }
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5203 }
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5204
41b77a76b885 * dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents: 1003
diff changeset
5205 cursor_to (row, col);
708
030fb4635335 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 687
diff changeset
5206 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5207 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5208 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5209 /* We have only one cursor on terminal frames. Use it to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5210 display the cursor of the selected window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5211 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
5212 if (w->cursor.vpos >= 0
5d67ef29764b (update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents: 29437
diff changeset
5213 /* 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
5214 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
5215 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
5216 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
5217 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
5218 && w->cursor.vpos < WINDOW_TOTAL_LINES (w))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5219 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5220 int x = WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5221 int y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5222
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5223 if (INTEGERP (w->left_margin_cols))
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5224 x += XFASTINT (w->left_margin_cols);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5225
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5226 /* x = max (min (x, FRAME_TOTAL_COLS (f) - 1), 0); */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5227 cursor_to (y, x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5228 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5229 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5230 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5231
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5232 do_pause:
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5233
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5234 clear_desired_matrices (f);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5235 return pause;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5236 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5237
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5238
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5239 /* Do line insertions/deletions on frame F for frame-based redisplay. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5240
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
5241 int
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5242 scrolling (frame)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5243 struct frame *frame;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5244 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5245 int unchanged_at_top, unchanged_at_bottom;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5246 int window_size;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5247 int changed_lines;
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5248 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
5249 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
5250 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
5251 int *old_draw_cost = (int *) alloca (FRAME_LINES (frame) * sizeof (int));
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5252 register int i;
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5253 int free_at_end_vpos = FRAME_LINES (frame);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5254 struct glyph_matrix *current_matrix = frame->current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5255 struct glyph_matrix *desired_matrix = frame->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5256
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5257 if (!current_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5258 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5259
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5260 /* Compute hash codes of all the lines. Also calculate number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5261 changed lines, number of unchanged lines at the beginning, and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5262 number of unchanged lines at the end. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5263 changed_lines = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5264 unchanged_at_top = 0;
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5265 unchanged_at_bottom = FRAME_LINES (frame);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5266 for (i = 0; i < FRAME_LINES (frame); i++)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5267 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5268 /* Give up on this scrolling if some old lines are not enabled. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5269 if (!MATRIX_ROW_ENABLED_P (current_matrix, i))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5270 return 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5271 old_hash[i] = line_hash_code (MATRIX_ROW (current_matrix, i));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5272 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
5273 {
934a44a3b34f (scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents: 17961
diff changeset
5274 /* 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
5275 new_hash[i] = old_hash[i];
934a44a3b34f (scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents: 17961
diff changeset
5276 #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
5277 draw_cost[i] = INFINITY;
934a44a3b34f (scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents: 17961
diff changeset
5278 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5279 else
18015
934a44a3b34f (scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents: 17961
diff changeset
5280 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5281 new_hash[i] = line_hash_code (MATRIX_ROW (desired_matrix, i));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5282 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
5283 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5284
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5285 if (old_hash[i] != new_hash[i])
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5286 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5287 changed_lines++;
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5288 unchanged_at_bottom = FRAME_LINES (frame) - i - 1;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5289 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5290 else if (i == unchanged_at_top)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5291 unchanged_at_top++;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5292 old_draw_cost[i] = line_draw_cost (current_matrix, i);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5293 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5294
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5295 /* If changed lines are few, don't allow preemption, don't scroll. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5296 if ((!scroll_region_ok && changed_lines < baud_rate / 2400)
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5297 || unchanged_at_bottom == FRAME_LINES (frame))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5298 return 1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5299
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5300 window_size = (FRAME_LINES (frame) - unchanged_at_top
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5301 - unchanged_at_bottom);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5302
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5303 if (scroll_region_ok)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5304 free_at_end_vpos -= unchanged_at_bottom;
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5305 else if (memory_below_frame)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5306 free_at_end_vpos = -1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5307
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5308 /* If large window, fast terminal and few lines in common between
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5309 current frame and desired frame, don't bother with i/d calc. */
10259
48e4dfc6bb43 (scrolling): Fewer restrictions if scroll_region_ok is
Richard M. Stallman <rms@gnu.org>
parents: 10122
diff changeset
5310 if (!scroll_region_ok && window_size >= 18 && baud_rate > 2400
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5311 && (window_size >=
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5312 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
5313 FRAME_LINES (frame) - unchanged_at_bottom,
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5314 old_hash, new_hash, draw_cost)))
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5315 return 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5316
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5317 if (window_size < 2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5318 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5319
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5320 scrolling_1 (frame, window_size, unchanged_at_top, unchanged_at_bottom,
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5321 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
5322 old_draw_cost + unchanged_at_top - 1,
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5323 old_hash + unchanged_at_top - 1,
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5324 new_hash + unchanged_at_top - 1,
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5325 free_at_end_vpos - unchanged_at_top);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5326
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5327 return 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5328 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5329
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5330
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5331 /* Count the number of blanks at the start of the vector of glyphs R
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5332 which is LEN glyphs long. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5333
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5334 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5335 count_blanks (r, len)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5336 struct glyph *r;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5337 int len;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5338 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5339 int i;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5340
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5341 for (i = 0; i < len; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5342 if (!CHAR_GLYPH_SPACE_P (r[i]))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5343 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5344
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5345 return i;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5346 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5347
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5348
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5349 /* Count the number of glyphs in common at the start of the glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5350 vectors STR1 and STR2. END1 is the end of STR1 and END2 is the end
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5351 of STR2. Value is the number of equal glyphs equal at the start. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5352
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5353 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5354 count_match (str1, end1, str2, end2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5355 struct glyph *str1, *end1, *str2, *end2;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5356 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5357 struct glyph *p1 = str1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5358 struct glyph *p2 = str2;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5359
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5360 while (p1 < end1
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5361 && p2 < end2
26998
02e902f732d1 (line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents: 26902
diff changeset
5362 && GLYPH_CHAR_AND_FACE_EQUAL_P (p1, p2))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5363 ++p1, ++p2;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5364
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5365 return p1 - str1;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5366 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5367
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5368
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5369 /* Char insertion/deletion cost vector, from term.c */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5370
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5371 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
5372 #define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_TOTAL_COLS((f))])
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5373
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5374
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5375 /* Perform a frame-based update on line VPOS in frame FRAME. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5376
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5377 static void
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5378 update_frame_line (f, vpos)
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5379 struct frame *f;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5380 int vpos;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5381 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5382 struct glyph *obody, *nbody, *op1, *op2, *np1, *nend;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5383 int tem;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5384 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
5385 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
5386 struct glyph_matrix *desired_matrix = f->desired_matrix;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5387 struct glyph_row *current_row = MATRIX_ROW (current_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5388 struct glyph_row *desired_row = MATRIX_ROW (desired_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5389 int must_write_whole_line_p;
33101
39cd5f99c67d (update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
5390 int write_spaces_p = must_write_spaces;
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5391 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
5392 != FACE_TTY_DEFAULT_BG_COLOR);
39cd5f99c67d (update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
5393
39cd5f99c67d (update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
5394 if (colored_spaces_p)
39cd5f99c67d (update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
5395 write_spaces_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5396
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5397 /* 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
5398 write the whole desired line in that case. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5399 must_write_whole_line_p = !current_row->enabled_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5400 if (must_write_whole_line_p)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5401 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5402 obody = 0;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5403 olen = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5404 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5405 else
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5406 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5407 obody = MATRIX_ROW_GLYPH_START (current_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5408 olen = current_row->used[TEXT_AREA];
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5409
40075
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
5410 /* 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
5411 if (!write_spaces_p)
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
5412 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
5413 olen--;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5414 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5415
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5416 current_row->enabled_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5417 current_row->used[TEXT_AREA] = desired_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5418
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5419 /* If desired line is empty, just clear the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5420 if (!desired_row->enabled_p)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5421 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5422 nlen = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5423 goto just_erase;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5424 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5425
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5426 nbody = desired_row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5427 nlen = desired_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5428 nend = nbody + nlen;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5429
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5430 /* If display line has unknown contents, write the whole line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5431 if (must_write_whole_line_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5432 {
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5433 /* 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
5434 if (!write_spaces_p)
25313
6b4475fbef86 (update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents: 25304
diff changeset
5435 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
5436 --nlen;
6b4475fbef86 (update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents: 25304
diff changeset
5437
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5438 /* 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
5439 if (nlen)
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5440 {
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5441 cursor_to (vpos, 0);
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5442 write_glyphs (nbody, nlen);
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5443 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5444
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5445 /* 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
5446 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
5447 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
5448 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
5449 {
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5450 cursor_to (vpos, nlen);
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5451 clear_end_of_line (FRAME_TOTAL_COLS (f));
25725
b7468dc89ccb (update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents: 25666
diff changeset
5452 }
28682
f05d48759416 (update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
5453 else
f05d48759416 (update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
5454 /* 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
5455 with cmgoto might use `ch' in the wrong row. */
f05d48759416 (update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
5456 cursor_to (vpos, 0);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5457
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5458 make_current (desired_matrix, current_matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5459 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5460 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5461
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5462 /* Pretend trailing spaces are not there at all,
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5463 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
5464 if (!write_spaces_p)
c1d88076fa85 (update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents: 39988
diff changeset
5465 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
5466 nlen--;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5467
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5468 /* If there's no i/d char, quickly do the best we can without it. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5469 if (!char_ins_del_ok)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5470 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5471 int i, j;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5472
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5473 /* Find the first glyph in desired row that doesn't agree with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5474 a glyph in the current row, and write the rest from there on. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5475 for (i = 0; i < nlen; i++)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5476 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5477 if (i >= olen || !GLYPH_EQUAL_P (nbody + i, obody + i))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5478 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5479 /* Find the end of the run of different glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5480 j = i + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5481 while (j < nlen
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5482 && (j >= olen
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5483 || !GLYPH_EQUAL_P (nbody + j, obody + j)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5484 || CHAR_GLYPH_PADDING_P (nbody[j])))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5485 ++j;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5486
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5487 /* Output this run of non-matching chars. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5488 cursor_to (vpos, i);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5489 write_glyphs (nbody + i, j - i);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5490 i = j - 1;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5491
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5492 /* Now find the next non-match. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5493 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5494 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5495
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5496 /* Clear the rest of the line, or the non-clear part of it. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5497 if (olen > nlen)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5498 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5499 cursor_to (vpos, nlen);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5500 clear_end_of_line (olen);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5501 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5502
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5503 /* Make current row = desired row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5504 make_current (desired_matrix, current_matrix, vpos);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5505 return;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5506 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5507
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5508 /* Here when CHAR_INS_DEL_OK != 0, i.e. we can insert or delete
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5509 characters in a row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5510
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5511 if (!olen)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5512 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5513 /* If current line is blank, skip over initial spaces, if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5514 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
5515 if (write_spaces_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5516 nsp = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5517 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5518 nsp = count_blanks (nbody, nlen);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5519
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5520 if (nlen > nsp)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5521 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5522 cursor_to (vpos, nsp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5523 write_glyphs (nbody + nsp, nlen - nsp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5524 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5525
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5526 /* Exchange contents between current_frame and new_frame. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5527 make_current (desired_matrix, current_matrix, vpos);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5528 return;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5529 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5530
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5531 /* Compute number of leading blanks in old and new contents. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5532 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
5533 nsp = (colored_spaces_p ? 0 : count_blanks (nbody, nlen));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5534
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5535 /* Compute number of matching chars starting with first non-blank. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5536 begmatch = count_match (obody + osp, obody + olen,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5537 nbody + nsp, nbody + nlen);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5538
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5539 /* Spaces in new match implicit space past the end of old. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5540 /* 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
5541 if (!write_spaces_p && osp + begmatch == olen)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5542 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5543 np1 = nbody + nsp;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5544 while (np1 + begmatch < nend && CHAR_GLYPH_SPACE_P (np1[begmatch]))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5545 ++begmatch;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5546 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5547
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5548 /* Avoid doing insert/delete char
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5549 just cause number of leading spaces differs
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5550 when the following text does not match. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5551 if (begmatch == 0 && osp != nsp)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5552 osp = nsp = min (osp, nsp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5553
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5554 /* Find matching characters at end of line */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5555 op1 = obody + olen;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5556 np1 = nbody + nlen;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5557 op2 = op1 + begmatch - min (olen - osp, nlen - nsp);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5558 while (op1 > op2
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5559 && GLYPH_EQUAL_P (op1 - 1, np1 - 1))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5560 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5561 op1--;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5562 np1--;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5563 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5564 endmatch = obody + olen - op1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5565
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5566 /* tem gets the distance to insert or delete.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5567 endmatch is how many characters we save by doing so.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5568 Is it worth it? */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5569
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5570 tem = (nlen - nsp) - (olen - osp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5571 if (endmatch && tem
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5572 && (!char_ins_del_ok || endmatch <= char_ins_del_cost (f)[tem]))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5573 endmatch = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5574
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5575 /* nsp - osp is the distance to insert or delete.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5576 If that is nonzero, begmatch is known to be nonzero also.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5577 begmatch + endmatch is how much we save by doing the ins/del.
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5578 Is it worth it? */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5579
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5580 if (nsp != osp
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5581 && (!char_ins_del_ok
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5582 || begmatch + endmatch <= char_ins_del_cost (f)[nsp - osp]))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5583 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5584 begmatch = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5585 endmatch = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5586 osp = nsp = min (osp, nsp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5587 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5588
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5589 /* Now go through the line, inserting, writing and
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5590 deleting as appropriate. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5591
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5592 if (osp > nsp)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5593 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5594 cursor_to (vpos, nsp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5595 delete_glyphs (osp - nsp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5596 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5597 else if (nsp > osp)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5598 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5599 /* If going to delete chars later in line
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5600 and insert earlier in the line,
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5601 must delete first to avoid losing data in the insert */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5602 if (endmatch && nlen < olen + nsp - osp)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5603 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5604 cursor_to (vpos, nlen - endmatch + osp - nsp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5605 delete_glyphs (olen + nsp - osp - nlen);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5606 olen = nlen - (nsp - osp);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5607 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5608 cursor_to (vpos, osp);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5609 insert_glyphs (0, nsp - osp);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5610 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5611 olen += nsp - osp;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5612
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5613 tem = nsp + begmatch + endmatch;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5614 if (nlen != tem || olen != tem)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5615 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5616 if (!endmatch || nlen == olen)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5617 {
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5618 /* 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
5619 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
5620 (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
5621 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
5622 if (nlen == FRAME_TOTAL_COLS (f))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5623 olen = 0;
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5624
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5625 /* 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
5626 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
5627 unnecessary cursor movement. */
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5628 if (nlen - tem > 0)
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5629 {
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5630 cursor_to (vpos, nsp + begmatch);
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5631 write_glyphs (nbody + nsp + begmatch, nlen - tem);
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5632 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5633 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5634 else if (nlen > olen)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5635 {
17015
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5636 /* 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
5637 ----------------------------------------
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5638 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
5639 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
5640 ----------------------------------------
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5641 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
5642 is a padding glyph. */
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5643 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
5644 int del;
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5645
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5646 cursor_to (vpos, nsp + begmatch);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5647
17015
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5648 /* 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
5649 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
5650 out--;
17015
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5651 write_glyphs (nbody + nsp + begmatch, out);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5652
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5653 /* 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
5654 del = olen - tem - out;
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5655 if (del > 0)
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5656 delete_glyphs (del);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5657
17015
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5658 /* At last, we insert columns not yet written out. */
fe0b3661b584 (direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents: 16896
diff changeset
5659 insert_glyphs (nbody + nsp + begmatch + out, nlen - olen + del);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5660 olen = nlen;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5661 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5662 else if (olen > nlen)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5663 {
35924
32198b7c21e1 (update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents: 35609
diff changeset
5664 cursor_to (vpos, nsp + begmatch);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5665 write_glyphs (nbody + nsp + begmatch, nlen - tem);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5666 delete_glyphs (olen - nlen);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5667 olen = nlen;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5668 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5669 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5670
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5671 just_erase:
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5672 /* If any unerased characters remain after the new line, erase them. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5673 if (olen > nlen)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5674 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5675 cursor_to (vpos, nlen);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5676 clear_end_of_line (olen);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5677 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5678
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5679 /* Exchange contents between current_frame and new_frame. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5680 make_current (desired_matrix, current_matrix, vpos);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5681 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5682
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5683
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5684
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5685 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5686 X/Y Position -> Buffer Position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5687 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5688
36697
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5689 /* Determine what's under window-relative pixel position (*X, *Y).
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5690 Return in *OBJECT the object (string or buffer) that's there.
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5691 Return in *POS the position in that object. Adjust *X and *Y
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5692 to character boundaries. */
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5693
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5694 void
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5695 buffer_posn_from_coords (w, x, y, object, pos)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5696 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5697 int *x, *y;
36697
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5698 Lisp_Object *object;
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5699 struct display_pos *pos;
7810
15c0bf73737e (Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7808
diff changeset
5700 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5701 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5702 struct buffer *old_current_buffer = current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5703 struct text_pos startp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5704 int left_area_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5705
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5706 current_buffer = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5707 SET_TEXT_POS_FROM_MARKER (startp, w->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5708 CHARPOS (startp) = min (ZV, max (BEGV, CHARPOS (startp)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5709 BYTEPOS (startp) = min (ZV_BYTE, max (BEGV_BYTE, BYTEPOS (startp)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5710 start_display (&it, w, startp);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5711
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5712 left_area_width = WINDOW_LEFT_MARGIN_WIDTH (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5713 move_it_to (&it, -1, *x + it.first_visible_x - left_area_width, *y, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5714 MOVE_TO_X | MOVE_TO_Y);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5715
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5716 *x = it.current_x - it.first_visible_x + left_area_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5717 *y = it.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5718 current_buffer = old_current_buffer;
36697
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5719
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5720 *object = STRINGP (it.string) ? it.string : w->buffer;
7526acd3385c (buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents: 36590
diff changeset
5721 *pos = it.current;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5722 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5723
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5724
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5725 /* Value is the string under window-relative coordinates X/Y in the
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
5726 mode or header line of window W, or nil if none. MODE_LINE_P non-zero
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5727 means look at the mode line. *CHARPOS is set to the position in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5728 the string returned. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5729
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5730 Lisp_Object
50218
06f75553f0a4 (mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents: 49600
diff changeset
5731 mode_line_string (w, x, y, part, charpos)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5732 struct window *w;
50218
06f75553f0a4 (mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents: 49600
diff changeset
5733 int x, y;
06f75553f0a4 (mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents: 49600
diff changeset
5734 enum window_part part;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5735 int *charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5736 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5737 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5738 struct glyph *glyph, *end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5739 int x0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5740 Lisp_Object string = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5741
50218
06f75553f0a4 (mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents: 49600
diff changeset
5742 if (part == ON_MODE_LINE)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5743 row = MATRIX_MODE_LINE_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5744 else
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25544
diff changeset
5745 row = MATRIX_HEADER_LINE_ROW (w->current_matrix);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5746
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5747 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
5748 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5749 /* Find the glyph under X. If we find one with a string object,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5750 it's the one we were looking for. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5751 glyph = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5752 end = glyph + row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5753 for (x0 = 0; glyph < end; x0 += glyph->pixel_width, ++glyph)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5754 if (x >= x0 && x < x0 + glyph->pixel_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5755 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5756 string = glyph->object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5757 *charpos = glyph->charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5758 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5759 }
7810
15c0bf73737e (Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7808
diff changeset
5760 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5761
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5762 return string;
7810
15c0bf73737e (Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7808
diff changeset
5763 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5764
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5765
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5766 /* 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
5767 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
5768 the string returned. */
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5769
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5770 Lisp_Object
50218
06f75553f0a4 (mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents: 49600
diff changeset
5771 marginal_area_string (w, x, y, part, charpos)
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5772 struct window *w;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5773 int x, y;
50218
06f75553f0a4 (mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents: 49600
diff changeset
5774 enum window_part part;
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5775 int *charpos;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5776 {
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5777 struct glyph_row *row = w->current_matrix->rows;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5778 struct glyph *glyph, *end;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5779 int x0, i, wy = y;
50218
06f75553f0a4 (mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents: 49600
diff changeset
5780 int area;
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5781 Lisp_Object string = Qnil;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5782
50218
06f75553f0a4 (mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents: 49600
diff changeset
5783 if (part == ON_LEFT_MARGIN)
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5784 area = LEFT_MARGIN_AREA;
50218
06f75553f0a4 (mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents: 49600
diff changeset
5785 else if (part == ON_RIGHT_MARGIN)
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5786 area = RIGHT_MARGIN_AREA;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5787 else
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5788 abort ();
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5789
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5790 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
5791 if (wy >= row->y && wy < MATRIX_ROW_BOTTOM_Y (row))
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5792 break;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5793
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5794 if (row->enabled_p)
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5795 {
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5796 /* 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
5797 it's the one we were looking for. */
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5798 glyph = row->glyphs[area];
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5799 end = glyph + row->used[area];
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5800
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5801 if (area == RIGHT_MARGIN_AREA)
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5802 x0 = ((WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5803 ? WINDOW_LEFT_FRINGE_WIDTH (w)
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5804 : WINDOW_TOTAL_FRINGE_WIDTH (w))
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5805 + 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
5806 + window_box_width (w, TEXT_AREA));
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5807 else
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5808 x0 = (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5809 ? WINDOW_LEFT_FRINGE_WIDTH (w)
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5810 : 0);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5811
44536
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5812 for (; glyph < end; x0 += glyph->pixel_width, ++glyph)
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5813 if (x >= x0 && x < x0 + glyph->pixel_width)
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5814 {
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5815 string = glyph->object;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5816 *charpos = glyph->charpos;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5817 break;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5818 }
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5819 }
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5820
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5821 return string;
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5822 }
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5823
f7b9d913406b (marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents: 44261
diff changeset
5824
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5825 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5826 Changing Frame Sizes
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5827 ***********************************************************************/
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5828
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5829 #ifdef SIGWINCH
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5830
493
8b101799ff37 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 451
diff changeset
5831 SIGTYPE
10745
a553a08f5785 (window_change_signal): Add ignored argument.
Richard M. Stallman <rms@gnu.org>
parents: 10259
diff changeset
5832 window_change_signal (signalnum) /* If we don't have an argument, */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5833 int signalnum; /* some compilers complain in signal calls. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5834 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5835 int width, height;
31093
6da961dff718 Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30720
diff changeset
5836 #ifndef USE_CRT_DLL
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5837 extern int errno;
31093
6da961dff718 Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30720
diff changeset
5838 #endif
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5839 int old_errno = errno;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5840
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5841 get_frame_size (&width, &height);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5842
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5843 /* The frame size change obviously applies to a termcap-controlled
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5844 frame. Find such a frame in the list, and assume it's the only
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5845 one (since the redisplay code always writes to stdout, not a
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5846 FILE * specified in the frame structure). Record the new size,
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5847 but don't reallocate the data structures now. Let that be done
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5848 later outside of the signal handler. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5849
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5850 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2198
diff changeset
5851 Lisp_Object tail, frame;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5852
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2198
diff changeset
5853 FOR_EACH_FRAME (tail, frame)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5854 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2198
diff changeset
5855 if (FRAME_TERMCAP_P (XFRAME (frame)))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5856 {
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5857 change_frame_size (XFRAME (frame), height, width, 0, 1, 0);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5858 break;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5859 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5860 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5861 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5862
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5863 signal (SIGWINCH, window_change_signal);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5864 errno = old_errno;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5865 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5866 #endif /* SIGWINCH */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5867
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5868
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5869 /* 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
5870 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
5871 safe to change frame sizes while a redisplay is in progress. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5872
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
5873 void
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5874 do_pending_window_change (safe)
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5875 int safe;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5876 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5877 /* 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
5878 if (redisplaying_p && !safe)
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5879 return;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
5880
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5881 while (delayed_size_change)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5882 {
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2198
diff changeset
5883 Lisp_Object tail, frame;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5884
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5885 delayed_size_change = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5886
2252
9793d8654e23 * frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents: 2198
diff changeset
5887 FOR_EACH_FRAME (tail, frame)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5888 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5889 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
5890
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5891 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
5892 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
5893 0, 0, safe);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5894 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5895 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5896 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5897
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5898
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5899 /* 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
5900 indicate no change is to take place.
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5901
960
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5902 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
5903 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
5904 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
5905 from a signal handler.
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5906
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5907 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
5908 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
5909
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
5910 void
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5911 change_frame_size (f, newheight, newwidth, pretend, delay, safe)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5912 register struct frame *f;
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5913 int newheight, newwidth, pretend, delay, safe;
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5914 {
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5915 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
5916
15395
b584c2db055f (change_frame_size, remake_frame_glyphs): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15394
diff changeset
5917 if (! FRAME_WINDOW_P (f))
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5918 {
15394
8d01f71c4797 (Fredraw_frame, remake_frame_glyphs)
Richard M. Stallman <rms@gnu.org>
parents: 15282
diff changeset
5919 /* When using termcap, or on MS-DOS, all frames use
8d01f71c4797 (Fredraw_frame, remake_frame_glyphs)
Richard M. Stallman <rms@gnu.org>
parents: 15282
diff changeset
5920 the same screen, so a change in size affects all frames. */
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5921 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
5922 if (! FRAME_WINDOW_P (XFRAME (frame)))
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5923 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
5924 pretend, delay, safe);
10770
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5925 }
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5926 else
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5927 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
5928 }
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5929
79745e047484 (change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 10745
diff changeset
5930 static void
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5931 change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5932 register struct frame *f;
25345
ca828f89fd6e (do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents: 25318
diff changeset
5933 int newheight, newwidth, pretend, delay, safe;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5934 {
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5935 int new_frame_total_cols;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 44890
diff changeset
5936 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
5937
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5938 /* 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
5939 if (delay || (redisplaying_p && !safe))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5940 {
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5941 f->new_text_lines = newheight;
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5942 f->new_text_cols = newwidth;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5943 delayed_size_change = 1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5944 return;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5945 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5946
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5947 /* 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
5948 f->new_text_lines = 0;
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5949 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
5950
3449
ad455da9b789 (do_pending_window_change): No need to clear
Richard M. Stallman <rms@gnu.org>
parents: 3357
diff changeset
5951 /* 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
5952 if (newheight == 0)
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5953 newheight = FRAME_LINES (f);
15896
3a3c30116313 (change_frame_size_1): Clean up conditional.
Erik Naggum <erik@naggum.no>
parents: 15687
diff changeset
5954 if (newwidth == 0)
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5955 newwidth = FRAME_COLS (f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5956
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5957 /* Compute width of windows in F.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5958 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
5959 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
5960
960
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5961 /* Round up to the smallest acceptable size. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5962 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
5963
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
5964 /* 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
5965 if (newheight == FRAME_LINES (f)
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5966 && new_frame_total_cols == FRAME_TOTAL_COLS (f))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5967 return;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5968
15078
a295c26b5d67 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 15065
diff changeset
5969 BLOCK_INPUT;
a295c26b5d67 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 15065
diff changeset
5970
14286
5d42664b4e74 (change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
5971 #ifdef MSDOS
5d42664b4e74 (change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
5972 /* 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
5973 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
5974 or equal to the requested dimensions. */
5d42664b4e74 (change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
5975 dos_set_window_size (&newheight, &newwidth);
5d42664b4e74 (change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
5976 #endif
5d42664b4e74 (change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
5977
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5978 if (newheight != FRAME_LINES (f))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5979 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5980 if (FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5981 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5982 /* 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
5983 XSETFASTINT (XWINDOW (FRAME_ROOT_WINDOW (f))->top_line,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5984 FRAME_TOP_MARGIN (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5985 set_window_height (FRAME_ROOT_WINDOW (f),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5986 (newheight
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5987 - 1
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5988 - FRAME_TOP_MARGIN (f)),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5989 0);
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
5990 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
5991 newheight - 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5992 set_window_height (FRAME_MINIBUF_WINDOW (f), 1, 0);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5993 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5994 else
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5995 /* Frame has just one top-level window. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5996 set_window_height (FRAME_ROOT_WINDOW (f),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5997 newheight - FRAME_TOP_MARGIN (f), 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5998
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
5999 if (FRAME_TERMCAP_P (f) && !pretend)
960
17986889d3b6 * dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
6000 FrameRows = newheight;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6001 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6002
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
6003 if (new_frame_total_cols != FRAME_TOTAL_COLS (f))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6004 {
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
6005 set_window_width (FRAME_ROOT_WINDOW (f), new_frame_total_cols, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6006 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
6007 set_window_width (FRAME_MINIBUF_WINDOW (f), new_frame_total_cols, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6008
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6009 if (FRAME_TERMCAP_P (f) && !pretend)
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
6010 FrameCols = newwidth;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6011
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25514
diff changeset
6012 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
6013 XSETFASTINT (XWINDOW (f->tool_bar_window)->total_cols, newwidth);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6014 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6015
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
6016 FRAME_LINES (f) = newheight;
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
6017 SET_FRAME_COLS (f, newwidth);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6018
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6019 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6020 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6021 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
6022
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6023 window_box (w, TEXT_AREA, &text_area_x, &text_area_y, &text_area_width,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6024 &text_area_height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6025 if (w->cursor.x >= text_area_x + text_area_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6026 w->cursor.hpos = w->cursor.x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6027 if (w->cursor.y >= text_area_y + text_area_height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6028 w->cursor.vpos = w->cursor.y = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6029 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6030
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6031 adjust_glyphs (f);
40512
d256f6fc9c05 (change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents: 40334
diff changeset
6032 calculate_costs (f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6033 SET_FRAME_GARBAGED (f);
40512
d256f6fc9c05 (change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents: 40334
diff changeset
6034 f->resized_p = 1;
15065
270020829d09 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 14964
diff changeset
6035
270020829d09 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 14964
diff changeset
6036 UNBLOCK_INPUT;
17282
5023bea28298 (change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents: 17015
diff changeset
6037
19627
c6343f7a9c6c (change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents: 19063
diff changeset
6038 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
6039
17282
5023bea28298 (change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents: 17015
diff changeset
6040 /* This isn't quite a no-op: it runs window-configuration-change-hook. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6041 Fset_window_buffer (FRAME_SELECTED_WINDOW (f),
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
6042 XWINDOW (FRAME_SELECTED_WINDOW (f))->buffer, Qt);
19627
c6343f7a9c6c (change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents: 19063
diff changeset
6043
c6343f7a9c6c (change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents: 19063
diff changeset
6044 unbind_to (count, Qnil);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6045 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6046
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6047
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6048
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6049 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6050 Terminal Related Lisp Functions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6051 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6052
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6053 DEFUN ("open-termscript", Fopen_termscript, Sopen_termscript,
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6054 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
6055 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
6056 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
6057 (file)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6058 Lisp_Object file;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6059 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6060 if (termscript != 0) fclose (termscript);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6061 termscript = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6062
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6063 if (! NILP (file))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6064 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6065 file = Fexpand_file_name (file, Qnil);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
6066 termscript = fopen (SDATA (file), "w");
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6067 if (termscript == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6068 report_file_error ("Opening termscript", Fcons (file, Qnil));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6069 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6070 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6071 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6072
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6073
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6074 DEFUN ("send-string-to-terminal", Fsend_string_to_terminal,
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6075 Ssend_string_to_terminal, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6076 doc: /* Send STRING to the terminal without alteration.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6077 Control characters in STRING will have terminal-dependent effects. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6078 (string)
14068
a3c83dde295e (Fsend_string_to_terminal, Fsit_for): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents: 13526
diff changeset
6079 Lisp_Object string;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6080 {
20618
d5acac3af6e3 (Fsend_string_to_terminal): Use size_byte.
Richard M. Stallman <rms@gnu.org>
parents: 19627
diff changeset
6081 /* ??? 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
6082 CHECK_STRING (string);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
6083 fwrite (SDATA (string), 1, SBYTES (string), stdout);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6084 fflush (stdout);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6085 if (termscript)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6086 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
6087 fwrite (SDATA (string), 1, SBYTES (string),
21244
50929073a0ba Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents: 20708
diff changeset
6088 termscript);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6089 fflush (termscript);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6090 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6091 return Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6092 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6093
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6094
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6095 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
6096 doc: /* Beep, or flash the screen.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6097 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
6098 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
6099 (arg)
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6100 Lisp_Object arg;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6101 {
493
8b101799ff37 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 451
diff changeset
6102 if (!NILP (arg))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6103 {
649
61deba7b73b6 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 587
diff changeset
6104 if (noninteractive)
61deba7b73b6 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 587
diff changeset
6105 putchar (07);
61deba7b73b6 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 587
diff changeset
6106 else
61deba7b73b6 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 587
diff changeset
6107 ring_bell ();
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6108 fflush (stdout);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6109 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6110 else
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6111 bitch_at_user ();
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6112
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6113 return Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6114 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6115
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
6116 void
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6117 bitch_at_user ()
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6118 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6119 if (noninteractive)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6120 putchar (07);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6121 else if (!INTERACTIVE) /* Stop executing a keyboard macro. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6122 error ("Keyboard macro terminated by a command ringing the bell");
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6123 else
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6124 ring_bell ();
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6125 fflush (stdout);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6126 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6127
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6128
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6129
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6130 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6131 Sleeping, Waiting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6132 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6133
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6134 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
6135 doc: /* Pause, without updating display, for SECONDS seconds.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6136 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
6137 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
6138 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
6139 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
6140 \(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
6141 (seconds, milliseconds)
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6142 Lisp_Object seconds, milliseconds;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6143 {
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6144 int sec, usec;
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6145
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6146 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
6147 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
6148 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40512
diff changeset
6149 CHECK_NUMBER (milliseconds);
2648
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6150 usec = XINT (milliseconds) * 1000;
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6151
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6152 {
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6153 double duration = extract_float (seconds);
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6154 sec = (int) duration;
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6155 usec += (duration - sec) * 1000000;
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6156 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6157
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6158 #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
6159 if (sec == 0 && usec != 0)
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6160 error ("millisecond `sleep-for' not supported on %s", SYSTEM_TYPE);
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6161 #endif
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6162
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6163 /* 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
6164 if (usec < 0)
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6165 {
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
6166 /* 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
6167 if (-1000000 < usec)
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6168 sec--, usec += 1000000;
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6169 else
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6170 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
6171 }
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6172 else
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6173 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
6174
14646
68fe10d1abd0 (Fsleep_for): Accept sub-second intervals.
Erik Naggum <erik@naggum.no>
parents: 14459
diff changeset
6175 if (sec < 0 || (sec == 0 && usec == 0))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6176 return Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6177
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6178 {
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6179 Lisp_Object zero;
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6180
9303
3115ae493c30 (direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents: 9264
diff changeset
6181 XSETFASTINT (zero, 0);
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6182 wait_reading_process_input (sec, usec, zero, 0);
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6183 }
587
1c2d1836941a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 554
diff changeset
6184
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6185 /* We should always have wait_reading_process_input; we have a dummy
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6186 implementation for systems which don't support subprocesses. */
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6187 #if 0
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6188 /* No wait_reading_process_input */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6189 immediate_quit = 1;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6190 QUIT;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6191
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6192 #ifdef VMS
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6193 sys_sleep (sec);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6194 #else /* not VMS */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6195 /* The reason this is done this way
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6196 (rather than defined (H_S) && defined (H_T))
42835
38f2be5a65fd (update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents: 41969
diff changeset
6197 is because the VMS preprocessor doesn't grok `defined'. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6198 #ifdef HAVE_SELECT
554
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
6199 EMACS_GET_TIME (end_time);
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
6200 EMACS_SET_SECS_USECS (timeout, sec, usec);
587
1c2d1836941a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 554
diff changeset
6201 EMACS_ADD_TIME (end_time, end_time, timeout);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6202
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6203 while (1)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6204 {
554
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
6205 EMACS_GET_TIME (timeout);
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
6206 EMACS_SUB_TIME (timeout, end_time, timeout);
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
6207 if (EMACS_TIME_NEG_P (timeout)
e14686fb979e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 543
diff changeset
6208 || !select (1, 0, 0, 0, &timeout))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6209 break;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6210 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6211 #else /* not HAVE_SELECT */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6212 sleep (sec);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6213 #endif /* HAVE_SELECT */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6214 #endif /* not VMS */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6215
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6216 immediate_quit = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6217 #endif /* no subprocesses */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6218
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6219 return Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6220 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6221
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6222
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6223 /* This is just like wait_reading_process_input, except that
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6224 it does the redisplay.
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6225
5223
db2e7e6a488e (Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents: 5218
diff changeset
6226 It's also much like Fsit_for, except that it can be used for
11411
91bcce2fd486 (Fframe_or_buffer_changed_p): Ignore buffers whose names start with space.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
6227 waiting for input as well. */
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6228
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6229 Lisp_Object
17961
86ae1679df19 (sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents: 17895
diff changeset
6230 sit_for (sec, usec, reading, display, initial_display)
86ae1679df19 (sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents: 17895
diff changeset
6231 int sec, usec, reading, display, initial_display;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6232 {
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6233 Lisp_Object read_kbd;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6234
14964
9938201005a3 (sit_for): Call swallow_events.
Richard M. Stallman <rms@gnu.org>
parents: 14903
diff changeset
6235 swallow_events (display);
9938201005a3 (sit_for): Call swallow_events.
Richard M. Stallman <rms@gnu.org>
parents: 14903
diff changeset
6236
43729
5b4c5b84bb9d (sit_for): Don't wait if executing a kbd macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 43713
diff changeset
6237 if (detect_input_pending_run_timers (display) || !NILP (Vexecuting_macro))
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6238 return Qnil;
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6239
17961
86ae1679df19 (sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents: 17895
diff changeset
6240 if (initial_display)
35336
002c02db42d3 Call redisplay_preserve_echo_area with additional arg.
Gerd Moellmann <gerd@gnu.org>
parents: 35307
diff changeset
6241 redisplay_preserve_echo_area (2);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6242
673
6217fa6e2cab *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 650
diff changeset
6243 if (sec == 0 && usec == 0)
6217fa6e2cab *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 650
diff changeset
6244 return Qt;
6217fa6e2cab *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 650
diff changeset
6245
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6246 #ifdef SIGIO
1915
98ecf99d7b1a * dispnew.c (sit_for): Pass the correct number of arguments to
Jim Blandy <jimb@redhat.com>
parents: 1872
diff changeset
6247 gobble_input (0);
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6248 #endif
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6249
9264
9338a124ea84 (redraw_frame, Fsleep_for, sit_for, Fsit_for): Use new accessor macros instead
Karl Heuer <kwzh@gnu.org>
parents: 8903
diff changeset
6250 XSETINT (read_kbd, reading ? -1 : 1);
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6251 wait_reading_process_input (sec, usec, read_kbd, display);
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6252
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6253 return detect_input_pending () ? Qnil : Qt;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6254 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6255
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6256
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6257 DEFUN ("sit-for", Fsit_for, Ssit_for, 1, 3, 0,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6258 doc: /* Perform redisplay, then wait for SECONDS seconds or until input is available.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6259 SECONDS may be a floating-point value, meaning that you can wait for a
50589
cf8d9d62ba1e (Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50218
diff changeset
6260 fraction of a second.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6261 \(Not all operating systems support waiting for a fraction of a second.)
50589
cf8d9d62ba1e (Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50218
diff changeset
6262 Optional arg NODISP non-nil means don't redisplay, just wait for input.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6263 Redisplay is preempted as always if input arrives, and does not happen
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6264 if input is available before it starts.
50589
cf8d9d62ba1e (Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50218
diff changeset
6265 Value is t if waited the full time with no input arriving.
cf8d9d62ba1e (Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50218
diff changeset
6266
cf8d9d62ba1e (Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50218
diff changeset
6267 An obsolete but still supported form is
cf8d9d62ba1e (Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50218
diff changeset
6268 \(sit-for SECONDS &optional MILLISECONDS NODISP)
cf8d9d62ba1e (Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50218
diff changeset
6269 Where the optional arg MILLISECONDS specifies an additional wait period,
cf8d9d62ba1e (Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50218
diff changeset
6270 in milliseconds; this was useful when Emacs was built without
cf8d9d62ba1e (Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50218
diff changeset
6271 floating point support.
51413
d40ff6314d84 (Fsit_for): Don't lie about the number of args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51232
diff changeset
6272 usage: (sit-for SECONDS &optional NODISP OLD-NODISP) */)
d40ff6314d84 (Fsit_for): Don't lie about the number of args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51232
diff changeset
6273
d40ff6314d84 (Fsit_for): Don't lie about the number of args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51232
diff changeset
6274 /* The `old-nodisp' stuff is there so that the arglist has the correct
d40ff6314d84 (Fsit_for): Don't lie about the number of args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51232
diff changeset
6275 length. Otherwise, `defdvice' will redefine it with fewer args. */
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6276 (seconds, milliseconds, nodisp)
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6277 Lisp_Object seconds, milliseconds, nodisp;
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6278 {
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6279 int sec, usec;
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6280
50589
cf8d9d62ba1e (Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50218
diff changeset
6281 if (NILP (nodisp) && !NUMBERP (milliseconds))
cf8d9d62ba1e (Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50218
diff changeset
6282 { /* New style. */
cf8d9d62ba1e (Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50218
diff changeset
6283 nodisp = milliseconds;
cf8d9d62ba1e (Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50218
diff changeset
6284 milliseconds = Qnil;
cf8d9d62ba1e (Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50218
diff changeset
6285 }
cf8d9d62ba1e (Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50218
diff changeset
6286
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6287 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
6288 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
6289 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40512
diff changeset
6290 CHECK_NUMBER (milliseconds);
2648
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6291 usec = XINT (milliseconds) * 1000;
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6292
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6293 {
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6294 double duration = extract_float (seconds);
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6295 sec = (int) duration;
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6296 usec += (duration - sec) * 1000000;
0a8d853dfebb * systime.h: Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2511
diff changeset
6297 }
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6298
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6299 #ifndef EMACS_HAS_USECS
2291
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6300 if (usec != 0 && sec == 0)
bee5c1693cac * dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents: 2288
diff changeset
6301 error ("millisecond `sit-for' not supported on %s", SYSTEM_TYPE);
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6302 #endif
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6303
17961
86ae1679df19 (sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents: 17895
diff changeset
6304 return sit_for (sec, usec, 0, NILP (nodisp), NILP (nodisp));
650
39f0e62a8511 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 649
diff changeset
6305 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6306
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6307
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6308
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6309 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6310 Other Lisp Functions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6311 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6312
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6313 /* A vector of size >= 2 * NFRAMES + 3 * NBUFFERS + 1, containing the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6314 session's frames, frame names, buffers, buffer-read-only flags, and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6315 buffer-modified-flags, and a trailing sentinel (so we don't need to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6316 add length checks). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6317
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6318 static Lisp_Object frame_and_buffer_state;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6319
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6320
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6321 DEFUN ("frame-or-buffer-changed-p", Fframe_or_buffer_changed_p,
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6322 Sframe_or_buffer_changed_p, 0, 0, 0,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6323 doc: /* Return non-nil if the frame and buffer state appears to have changed.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6324 The state variable is an internal vector containing all frames and buffers,
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6325 aside from buffers whose names start with space,
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6326 along with the buffers' read-only and modified flags, which allows a fast
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6327 check to see whether the menu bars might need to be recomputed.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6328 If this function returns non-nil, it updates the internal vector to reflect
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6329 the current state. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6330 ()
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6331 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6332 Lisp_Object tail, frame, buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6333 Lisp_Object *vecp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6334 int n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6335
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6336 vecp = XVECTOR (frame_and_buffer_state)->contents;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6337 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6338 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6339 if (!EQ (*vecp++, frame))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6340 goto changed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6341 if (!EQ (*vecp++, XFRAME (frame)->name))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6342 goto changed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6343 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6344 /* Check that the buffer info matches.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6345 No need to test for the end of the vector
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6346 because the last element of the vector is lambda
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6347 and that will always cause a mismatch. */
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
6348 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6349 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
6350 buf = XCDR (XCAR (tail));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6351 /* 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
6352 if (SREF (XBUFFER (buf)->name, 0) == ' ')
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6353 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6354 if (!EQ (*vecp++, buf))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6355 goto changed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6356 if (!EQ (*vecp++, XBUFFER (buf)->read_only))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6357 goto changed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6358 if (!EQ (*vecp++, Fbuffer_modified_p (buf)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6359 goto changed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6360 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6361 /* Detect deletion of a buffer at the end of the list. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6362 if (EQ (*vecp, Qlambda))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6363 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6364 changed:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6365 /* Start with 1 so there is room for at least one lambda at the end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6366 n = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6367 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6368 n += 2;
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
6369 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6370 n += 3;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6371 /* Reallocate the vector if it's grown, or if it's shrunk a lot. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6372 if (n > XVECTOR (frame_and_buffer_state)->size
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6373 || n + 20 < XVECTOR (frame_and_buffer_state)->size / 2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6374 /* Add 20 extra so we grow it less often. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6375 frame_and_buffer_state = Fmake_vector (make_number (n + 20), Qlambda);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6376 vecp = XVECTOR (frame_and_buffer_state)->contents;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6377 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6378 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6379 *vecp++ = frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6380 *vecp++ = XFRAME (frame)->name;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6381 }
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
6382 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6383 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
6384 buf = XCDR (XCAR (tail));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6385 /* 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
6386 if (SREF (XBUFFER (buf)->name, 0) == ' ')
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6387 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6388 *vecp++ = buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6389 *vecp++ = XBUFFER (buf)->read_only;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6390 *vecp++ = Fbuffer_modified_p (buf);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6391 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6392 /* Fill up the vector with lambdas (always at least one). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6393 *vecp++ = Qlambda;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6394 while (vecp - XVECTOR (frame_and_buffer_state)->contents
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6395 < XVECTOR (frame_and_buffer_state)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6396 *vecp++ = Qlambda;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6397 /* Make sure we didn't overflow the vector. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6398 if (vecp - XVECTOR (frame_and_buffer_state)->contents
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6399 > XVECTOR (frame_and_buffer_state)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6400 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6401 return Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6402 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6403
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6404
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6405
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6406 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6407 Initialization
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6408 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6409
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6410 char *terminal_type;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6411
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6412 /* Initialization done when Emacs fork is started, before doing stty.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6413 Determine terminal type and set terminal_driver. Then invoke its
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6414 decoding routine to set up variables in the terminal package. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6415
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
6416 void
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6417 init_display ()
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6418 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6419 #ifdef HAVE_X_WINDOWS
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6420 extern int display_arg;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6421 #endif
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6422
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6423 /* Construct the space glyph. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6424 space_glyph.type = CHAR_GLYPH;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6425 SET_CHAR_GLYPH_FROM_GLYPH (space_glyph, ' ');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6426 space_glyph.charpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6427
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6428 meta_key = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6429 inverse_video = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6430 cursor_in_echo_area = 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6431 terminal_type = (char *) 0;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6432
2339
a302de11debf * dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents: 2292
diff changeset
6433 /* 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
6434 during startup. */
a302de11debf * dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents: 2292
diff changeset
6435 Vwindow_system = Qnil;
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6436
2339
a302de11debf * dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents: 2292
diff changeset
6437 /* 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
6438 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
6439 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
6440 using the window system.
a302de11debf * dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents: 2292
diff changeset
6441
14125
2f222e8b06f5 (init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents: 14068
diff changeset
6442 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
6443 try to use X, and die with an error message if that doesn't work. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6444
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6445 #ifdef HAVE_X_WINDOWS
2359
90a5f91329f3 * dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents: 2339
diff changeset
6446 if (! display_arg)
90a5f91329f3 * dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents: 2339
diff changeset
6447 {
14125
2f222e8b06f5 (init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents: 14068
diff changeset
6448 char *display;
2359
90a5f91329f3 * dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents: 2339
diff changeset
6449 #ifdef VMS
14125
2f222e8b06f5 (init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents: 14068
diff changeset
6450 display = getenv ("DECW$DISPLAY");
2359
90a5f91329f3 * dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents: 2339
diff changeset
6451 #else
14125
2f222e8b06f5 (init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents: 14068
diff changeset
6452 display = getenv ("DISPLAY");
2359
90a5f91329f3 * dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents: 2339
diff changeset
6453 #endif
14125
2f222e8b06f5 (init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents: 14068
diff changeset
6454
2f222e8b06f5 (init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents: 14068
diff changeset
6455 display_arg = (display != 0 && *display != 0);
2364
9a8a5570e842 Fix typo.
Jim Blandy <jimb@redhat.com>
parents: 2359
diff changeset
6456 }
2359
90a5f91329f3 * dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents: 2339
diff changeset
6457
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6458 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
6459 #ifndef CANNOT_DUMP
95b4ac950a5d (init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents: 18015
diff changeset
6460 && initialized
95b4ac950a5d (init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents: 18015
diff changeset
6461 #endif
95b4ac950a5d (init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents: 18015
diff changeset
6462 )
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6463 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6464 Vwindow_system = intern ("x");
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6465 #ifdef HAVE_X11
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6466 Vwindow_system_version = make_number (11);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6467 #else
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6468 Vwindow_system_version = make_number (10);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6469 #endif
41969
e669966d496e Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents: 41120
diff changeset
6470 #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
6471 /* In some versions of ncurses,
15282
7db3a832db9e Comment fix.
Karl Heuer <kwzh@gnu.org>
parents: 15273
diff changeset
6472 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
6473 So call tgetent. */
db889dd732a1 (init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents: 15078
diff changeset
6474 { char b[2044]; tgetent (b, "xterm");}
db889dd732a1 (init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents: 15078
diff changeset
6475 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6476 adjust_frame_glyphs_initially ();
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6477 return;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6478 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6479 #endif /* HAVE_X_WINDOWS */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6480
13408
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6481 #ifdef HAVE_NTGUI
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6482 if (!inhibit_window_system)
13408
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6483 {
16589
ec300a10e407 (init_display) [HAVE_NTGUI]: Use w32 for window-system.
Geoff Voelker <voelker@cs.washington.edu>
parents: 16412
diff changeset
6484 Vwindow_system = intern ("w32");
13408
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6485 Vwindow_system_version = make_number (1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6486 adjust_frame_glyphs_initially ();
13408
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6487 return;
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6488 }
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6489 #endif /* HAVE_NTGUI */
7e92386e1cf7 [HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13220
diff changeset
6490
44890
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents: 44815
diff changeset
6491 #ifdef MAC_OS
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6492 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
6493 {
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32468
diff changeset
6494 Vwindow_system = intern ("mac");
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32468
diff changeset
6495 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
6496 adjust_frame_glyphs_initially ();
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32468
diff changeset
6497 return;
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32468
diff changeset
6498 }
44890
01b93e5e53a7 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents: 44815
diff changeset
6499 #endif /* MAC_OS */
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32468
diff changeset
6500
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6501 /* If no window system has been specified, try to use the terminal. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6502 if (! isatty (0))
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6503 {
16896
b2c51d6de440 (init_display): Use `fatal'.
Richard M. Stallman <rms@gnu.org>
parents: 16891
diff changeset
6504 fatal ("standard input is not a tty");
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6505 exit (1);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6506 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6507
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
6508 /* Look at the TERM variable. */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6509 terminal_type = (char *) getenv ("TERM");
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6510 if (!terminal_type)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6511 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6512 #ifdef VMS
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6513 fprintf (stderr, "Please specify your terminal type.\n\
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6514 For types defined in VMS, use set term /device=TYPE.\n\
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6515 For types not defined in VMS, use define emacs_term \"TYPE\".\n\
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6516 \(The quotation marks are necessary since terminal types are lower case.)\n");
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6517 #else
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6518 fprintf (stderr, "Please set the environment variable TERM; see tset(1).\n");
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6519 #endif
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6520 exit (1);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6521 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6522
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6523 #ifdef VMS
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6524 /* VMS DCL tends to up-case things, so down-case term type.
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6525 Hardly any uppercase letters in terminal types; should be none. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6526 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6527 char *new = (char *) xmalloc (strlen (terminal_type) + 1);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6528 char *p;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6529
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6530 strcpy (new, terminal_type);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6531
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6532 for (p = new; *p; p++)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6533 if (isupper (*p))
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6534 *p = tolower (*p);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6535
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6536 terminal_type = new;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6537 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6538 #endif /* VMS */
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6539
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6540 term_init (terminal_type);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6541
16891
989845750a4d (init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents: 16881
diff changeset
6542 {
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6543 struct frame *sf = SELECTED_FRAME ();
51193
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
6544 int width = FRAME_TOTAL_COLS (sf);
d47b56221a15 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 50589
diff changeset
6545 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
6546
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6547 unsigned int total_glyphs = height * (width + 2) * sizeof (struct glyph);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6548
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6549 /* If these sizes are so big they cause overflow, just ignore the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6550 change. It's not clear what better we could do. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6551 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
6552 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
6553 }
989845750a4d (init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents: 16881
diff changeset
6554
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6555 adjust_frame_glyphs_initially ();
25666
063da8f6a487 (selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
6556 calculate_costs (XFRAME (selected_frame));
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6557
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6558 #ifdef SIGWINCH
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6559 #ifndef CANNOT_DUMP
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6560 if (initialized)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6561 #endif /* CANNOT_DUMP */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6562 signal (SIGWINCH, window_change_signal);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6563 #endif /* SIGWINCH */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6564
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6565 /* Set up faces of the initial terminal frame of a dumped Emacs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6566 if (initialized
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6567 && !noninteractive
25118
08ae9ffe6763 (init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents: 25012
diff changeset
6568 #ifdef MSDOS
08ae9ffe6763 (init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents: 25012
diff changeset
6569 /* 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
6570 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
6571 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
6572 and internal_terminal_init. */
08ae9ffe6763 (init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents: 25012
diff changeset
6573 && (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
6574 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6575 && NILP (Vwindow_system))
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26591
diff changeset
6576 {
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26591
diff changeset
6577 /* 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
6578 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
6579 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
6580
26902
264b83a3a688 Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents: 26851
diff changeset
6581 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
6582 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
6583 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
6584 }
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6585 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6586
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6587
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6588
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6589 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6590 Blinking cursor
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6591 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6592
26280
083835afced5 (Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents: 26164
diff changeset
6593 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
6594 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
6595 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
6596 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
6597 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
6598 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
6599 (window, show)
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6600 Lisp_Object window, show;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6601 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6602 /* Don't change cursor state while redisplaying. This could confuse
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6603 output routines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6604 if (!redisplaying_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6605 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6606 if (NILP (window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6607 window = selected_window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6608 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40512
diff changeset
6609 CHECK_WINDOW (window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6610
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6611 XWINDOW (window)->cursor_off_p = NILP (show);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6612 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6613
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6614 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6615 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6616
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6617
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6618 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
6619 Sinternal_show_cursor_p, 0, 1, 0,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6620 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
6621 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
6622 (window)
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6623 Lisp_Object window;
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6624 {
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6625 struct window *w;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6626
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6627 if (NILP (window))
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6628 window = selected_window;
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6629 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40512
diff changeset
6630 CHECK_WINDOW (window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6631
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6632 w = XWINDOW (window);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6633 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
6634 }
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6635
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6636
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6637 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6638 Initialization
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6639 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6640
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21453
diff changeset
6641 void
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6642 syms_of_display ()
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6643 {
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
6644 defsubr (&Sredraw_frame);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6645 defsubr (&Sredraw_display);
7810
15c0bf73737e (Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7808
diff changeset
6646 defsubr (&Sframe_or_buffer_changed_p);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6647 defsubr (&Sopen_termscript);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6648 defsubr (&Sding);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6649 defsubr (&Ssit_for);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6650 defsubr (&Ssleep_for);
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6651 defsubr (&Ssend_string_to_terminal);
26280
083835afced5 (Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents: 26164
diff changeset
6652 defsubr (&Sinternal_show_cursor);
26334
e3a9ceb7a557 (Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents: 26280
diff changeset
6653 defsubr (&Sinternal_show_cursor_p);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6654
34893
779bd3fa820e Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents: 34866
diff changeset
6655 #if GLYPH_DEBUG
34866
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
6656 defsubr (&Sdump_redisplay_history);
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
6657 #endif
4f47fc699608 (struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents: 34849
diff changeset
6658
12186
6811992e871c (Fframe_or_buffer_changed_p): Calculate vector size right.
Karl Heuer <kwzh@gnu.org>
parents: 11919
diff changeset
6659 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
6660 staticpro (&frame_and_buffer_state);
15c0bf73737e (Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7808
diff changeset
6661
13220
2e9014617492 (Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13105
diff changeset
6662 Qdisplay_table = intern ("display-table");
2e9014617492 (Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13105
diff changeset
6663 staticpro (&Qdisplay_table);
30720
64f3338f72d8 (Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30713
diff changeset
6664 Qredisplay_dont_pause = intern ("redisplay-dont-pause");
64f3338f72d8 (Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30713
diff changeset
6665 staticpro (&Qredisplay_dont_pause);
13220
2e9014617492 (Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13105
diff changeset
6666
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6667 DEFVAR_INT ("baud-rate", &baud_rate,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6668 doc: /* *The output baud rate of the terminal.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6669 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
6670 and the other strategic decisions made during redisplay. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6671
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6672 DEFVAR_BOOL ("inverse-video", &inverse_video,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6673 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
6674 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
6675
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6676 DEFVAR_BOOL ("visible-bell", &visible_bell,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6677 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
6678
bee6cc2e8a90 (syms_of_display) <visible-bell>: Add a reference to
Eli Zaretskii <eliz@gnu.org>
parents: 40271
diff changeset
6679 See also `ring-bell-function'. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6680
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6681 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6682 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
6683 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
6684 Emacs's frame display when you reenter Emacs.
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6685 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
6686
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6687 DEFVAR_LISP ("window-system", &Vwindow_system,
41025
4feeae90afa4 (syms_of_display): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 40979
diff changeset
6688 doc: /* Name of window system that Emacs is displaying through.
4feeae90afa4 (syms_of_display): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 40979
diff changeset
6689 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
6690 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
6691
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6692 DEFVAR_LISP ("window-system-version", &Vwindow_system_version,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6693 doc: /* The version number of the window system in use.
39914
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6694 For X windows, this is 10 or 11. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49322
diff changeset
6695
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6696 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6697 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
6698
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6699 DEFVAR_LISP ("glyph-table", &Vglyph_table,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6700 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
6701 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
6702 Each element can be:
91951fb5b9e5 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39682
diff changeset
6703 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
6704 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
6705 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
6706 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
6707 while outputting it. */);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6708 Vglyph_table = Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6709
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6710 DEFVAR_LISP ("standard-display-table", &Vstandard_display_table,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6711 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
6712 See `buffer-display-table' for more information. */);
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6713 Vstandard_display_table = Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6714
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39954
diff changeset
6715 DEFVAR_BOOL ("redisplay-dont-pause", &redisplay_dont_pause,
40979
a3a3b477c670 (Fsit_for): Reindent.
Pavel Janík <Pavel@Janik.cz>
parents: 40656
diff changeset
6716 doc: /* *Non-nil means update isn't paused when input is detected. */);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6717 redisplay_dont_pause = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 22309
diff changeset
6718
314
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6719 /* Initialize `window-system', unless init_display already decided it. */
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6720 #ifdef CANNOT_DUMP
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6721 if (noninteractive)
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6722 #endif
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6723 {
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6724 Vwindow_system = Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6725 Vwindow_system_version = Qnil;
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6726 }
36a905212ceb Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6727 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52377
diff changeset
6728
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52377
diff changeset
6729 /* arch-tag: 8d812b1f-04a2-4195-a9c4-381f8457a413
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52377
diff changeset
6730 (do not change this comment) */