annotate src/fringe.c @ 112356:fa69cea85c66

Small updates for manual Ack section. * doc/emacs/ack.texi, doc/emacs/emacs.texi (Acknowledgments): Update for ERT addition. * doc/emacs/ack.texi (Acknowledgments): Remove mention of replaced prolog.el.
author Glenn Morris <rgm@gnu.org>
date Tue, 18 Jan 2011 00:22:22 -0800
parents ef719132ddfa
children 42e22c4f06b7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1 /* Fringe handling (split from xdisp.c).
64770
a0d1312ede66 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64084
diff changeset
2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997,
75227
e90d04cd455a Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents: 71834
diff changeset
3 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
112218
376148b31b5e Add 2011 to FSF/AIST copyright years.
Glenn Morris <rgm@gnu.org>
parents: 109296
diff changeset
4 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6 This file is part of GNU Emacs.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94420
diff changeset
8 GNU Emacs is free software: you can redistribute it and/or modify
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
9 it under the terms of the GNU General Public License as published by
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94420
diff changeset
10 the Free Software Foundation, either version 3 of the License, or
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94420
diff changeset
11 (at your option) any later version.
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
12
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
13 GNU Emacs is distributed in the hope that it will be useful,
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
14 but WITHOUT ANY WARRANTY; without even the implied warranty of
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
16 GNU General Public License for more details.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
17
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94420
diff changeset
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
20
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
21 #include <config.h>
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
22 #include <stdio.h>
105669
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 103062
diff changeset
23 #include <setjmp.h>
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
24
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
25 #include "lisp.h"
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
26 #include "frame.h"
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
27 #include "window.h"
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
28 #include "dispextern.h"
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
29 #include "buffer.h"
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
30 #include "blockinput.h"
83037
03a73693678e Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents: 53970
diff changeset
31 #include "termhooks.h"
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
32
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
33 #ifdef HAVE_WINDOW_SYSTEM
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
34
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
35 /* Non-nil means that newline may flow into the right fringe. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
36
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
37 Lisp_Object Voverflow_newline_into_fringe;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
38
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
39 /* List of known fringe bitmap symbols.
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
40
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
41 The fringe bitmap number is stored in the `fringe' property on
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
42 those symbols. Names for the built-in bitmaps are installed by
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
43 loading fringe.el.
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
44 */
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
45
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
46 Lisp_Object Vfringe_bitmaps;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
47
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
48 /* Fringe bitmaps are represented in three different ways:
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
49
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
50 Logical bitmaps are used internally to denote things like
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
51 'end-of-buffer', 'left-truncation', 'overlay-arrow', etc.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
52
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
53 Physical bitmaps specify the visual appearence of the bitmap,
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
54 e.g. 'bottom-left-angle', 'left-arrow', 'left-triangle', etc.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
55 User defined bitmaps are physical bitmaps.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
56
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
57 Internally, fringe bitmaps for a specific display row are
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
58 represented as a simple integer that is used as an index
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
59 into the table of all defined bitmaps. This index is stored
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
60 in the `fringe' property of the physical bitmap symbol.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
61
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
62 Logical bitmaps are mapped to physical bitmaps through the
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
63 buffer-local `fringe-indicator-alist' variable.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
64
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
65 Each element of this alist is a cons (LOGICAL . PHYSICAL)
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
66 mapping a logical bitmap to a physical bitmap.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
67 PHYSICAL is either a symbol to use in both left and right fringe,
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
68 or a cons of two symbols (LEFT . RIGHT) denoting different
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
69 bitmaps to use in left and right fringe.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
70
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
71 LOGICAL is first looked up in the window's buffer's buffer-local
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
72 value of the fringe-indicator-alist variable, and if not present,
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
73 in the global value of fringe-indicator-alist.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
74
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
75 If LOGICAL is not present in either alist, or the PHYSICAL value
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
76 found is nil, no bitmap is shown for the logical bitmap.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
77
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
78 The `left-fringe' and `right-fringe' display properties
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
79 must specify physical bitmap symbols.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
80 */
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
81
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
82 Lisp_Object Qtruncation, Qcontinuation, Qoverlay_arrow;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
83 Lisp_Object Qempty_line, Qtop_bottom;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
84 Lisp_Object Qhollow_small;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
85
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
86 enum fringe_bitmap_align
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
87 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
88 ALIGN_BITMAP_CENTER = 0,
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
89 ALIGN_BITMAP_TOP,
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
90 ALIGN_BITMAP_BOTTOM
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
91 };
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
92
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
93 struct fringe_bitmap
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
94 {
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
95 unsigned short *bits;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
96 unsigned height : 8;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
97 unsigned width : 8;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
98 unsigned period : 8;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
99 unsigned align : 2;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
100 unsigned dynamic : 1;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
101 };
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
102
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
103
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
104 /***********************************************************************
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
105 Fringe bitmaps
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
106 ***********************************************************************/
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
107
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
108 /* Undefined bitmap. A question mark. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
109 /*
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
110 ..xxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
111 .xxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
112 xx....xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
113 xx....xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
114 ....xx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
115 ...xx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
116 ...xx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
117 ........
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
118 ...xx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
119 ...xx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
120 */
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
121 static unsigned short question_mark_bits[] = {
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
122 0x3c, 0x7e, 0x7e, 0x0c, 0x18, 0x18, 0x00, 0x18, 0x18};
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
123
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
124 /* An arrow like this: `<-'. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
125 /*
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
126 ...xx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
127 ..xx....
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
128 .xx.....
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
129 xxxxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
130 xxxxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
131 .xx.....
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
132 ..xx....
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
133 ...xx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
134 */
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
135 static unsigned short left_arrow_bits[] = {
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
136 0x18, 0x30, 0x60, 0xfc, 0xfc, 0x60, 0x30, 0x18};
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
137
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
138
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
139 /* Right truncation arrow bitmap `->'. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
140 /*
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
141 ...xx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
142 ....xx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
143 .....xx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
144 ..xxxxxx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
145 ..xxxxxx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
146 .....xx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
147 ....xx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
148 ...xx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
149 */
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
150 static unsigned short right_arrow_bits[] = {
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
151 0x18, 0x0c, 0x06, 0x3f, 0x3f, 0x06, 0x0c, 0x18};
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
152
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
153
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
154 /* Up arrow bitmap. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
155 /*
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
156 ...xx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
157 ..xxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
158 .xxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
159 xxxxxxxx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
160 ...xx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
161 ...xx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
162 ...xx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
163 ...xx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
164 */
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
165 static unsigned short up_arrow_bits[] = {
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
166 0x18, 0x3c, 0x7e, 0xff, 0x18, 0x18, 0x18, 0x18};
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
167
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
168
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
169 /* Down arrow bitmap. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
170 /*
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
171 ...xx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
172 ...xx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
173 ...xx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
174 ...xx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
175 xxxxxxxx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
176 .xxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
177 ..xxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
178 ...xx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
179 */
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
180 static unsigned short down_arrow_bits[] = {
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
181 0x18, 0x18, 0x18, 0x18, 0xff, 0x7e, 0x3c, 0x18};
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
182
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
183 /* Marker for continuation lines. */
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
184 /*
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
185 ..xxxx..
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
186 .xxxxx..
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
187 xx......
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
188 xxx..x..
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
189 xxxxxx..
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
190 .xxxxx..
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
191 ..xxxx..
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
192 .xxxxx..
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
193 */
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
194 static unsigned short left_curly_arrow_bits[] = {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
195 0x3c, 0x7c, 0xc0, 0xe4, 0xfc, 0x7c, 0x3c, 0x7c};
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
196
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
197 /* Marker for continued lines. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
198 /*
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
199 ..xxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
200 ..xxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
201 ......xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
202 ..x..xxx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
203 ..xxxxxx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
204 ..xxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
205 ..xxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
206 ..xxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
207 */
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
208 static unsigned short right_curly_arrow_bits[] = {
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
209 0x3c, 0x3e, 0x03, 0x27, 0x3f, 0x3e, 0x3c, 0x3e};
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
210
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
211 /* Reverse Overlay arrow bitmap. A triangular arrow. */
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
212 /*
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
213 ......xx
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
214 ....xxxx
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
215 ...xxxxx
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
216 ..xxxxxx
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
217 ..xxxxxx
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
218 ...xxxxx
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
219 ....xxxx
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
220 ......xx
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
221 */
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
222 static unsigned short left_triangle_bits[] = {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
223 0x03, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x03};
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
224
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
225 /* Overlay arrow bitmap. A triangular arrow. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
226 /*
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
227 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
228 xxxx....
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
229 xxxxx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
230 xxxxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
231 xxxxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
232 xxxxx...
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
233 xxxx....
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
234 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
235 */
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
236 static unsigned short right_triangle_bits[] = {
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
237 0xc0, 0xf0, 0xf8, 0xfc, 0xfc, 0xf8, 0xf0, 0xc0};
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
238
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
239 /* First line bitmap. An top-left angle. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
240 /*
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
241 xxxxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
242 xxxxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
243 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
244 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
245 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
246 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
247 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
248 ........
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
249 */
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
250 static unsigned short top_left_angle_bits[] = {
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
251 0xfc, 0xfc, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00};
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
252
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
253 /* First line bitmap. An right-up angle. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
254 /*
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
255 ..xxxxxx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
256 ..xxxxxx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
257 ......xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
258 ......xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
259 ......xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
260 ......xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
261 ......xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
262 ........
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
263 */
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
264 static unsigned short top_right_angle_bits[] = {
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
265 0x3f, 0x3f, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00};
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
266
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
267 /* Last line bitmap. An left-down angle. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
268 /*
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
269 ........
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
270 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
271 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
272 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
273 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
274 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
275 xxxxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
276 xxxxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
277 */
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
278 static unsigned short bottom_left_angle_bits[] = {
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
279 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xfc};
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
280
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
281 /* Last line bitmap. An right-down angle. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
282 /*
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
283 ........
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
284 ......xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
285 ......xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
286 ......xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
287 ......xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
288 ......xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
289 ..xxxxxx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
290 ..xxxxxx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
291 */
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
292 static unsigned short bottom_right_angle_bits[] = {
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
293 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x3f, 0x3f};
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
294
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
295 /* First/last line bitmap. An left bracket. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
296 /*
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
297 xxxxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
298 xxxxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
299 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
300 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
301 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
302 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
303 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
304 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
305 xxxxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
306 xxxxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
307 */
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
308 static unsigned short left_bracket_bits[] = {
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
309 0xfc, 0xfc, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xfc};
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
310
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
311 /* First/last line bitmap. An right bracket. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
312 /*
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
313 ..xxxxxx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
314 ..xxxxxx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
315 ......xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
316 ......xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
317 ......xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
318 ......xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
319 ......xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
320 ......xx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
321 ..xxxxxx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
322 ..xxxxxx
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
323 */
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
324 static unsigned short right_bracket_bits[] = {
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
325 0x3f, 0x3f, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x3f, 0x3f};
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
326
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
327 /* Filled box cursor bitmap. A filled box; max 13 pixels high. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
328 /*
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
329 xxxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
330 xxxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
331 xxxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
332 xxxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
333 xxxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
334 xxxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
335 xxxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
336 xxxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
337 xxxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
338 xxxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
339 xxxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
340 xxxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
341 xxxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
342 */
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
343 static unsigned short filled_rectangle_bits[] = {
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
344 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe};
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
345
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
346 /* Hollow box cursor bitmap. A hollow box; max 13 pixels high. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
347 /*
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
348 xxxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
349 x.....x.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
350 x.....x.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
351 x.....x.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
352 x.....x.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
353 x.....x.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
354 x.....x.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
355 x.....x.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
356 x.....x.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
357 x.....x.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
358 x.....x.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
359 x.....x.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
360 xxxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
361 */
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
362 static unsigned short hollow_rectangle_bits[] = {
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
363 0xfe, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0xfe};
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
364
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
365 /* Hollow square bitmap. */
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
366 /*
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
367 .xxxxxx.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
368 .x....x.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
369 .x....x.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
370 .x....x.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
371 .x....x.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
372 .xxxxxx.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
373 */
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
374 static unsigned short hollow_square_bits[] = {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
375 0x7e, 0x42, 0x42, 0x42, 0x42, 0x7e};
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
376
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
377 /* Filled square bitmap. */
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
378 /*
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
379 .xxxxxx.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
380 .xxxxxx.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
381 .xxxxxx.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
382 .xxxxxx.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
383 .xxxxxx.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
384 .xxxxxx.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
385 */
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
386 static unsigned short filled_square_bits[] = {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
387 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e};
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
388
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
389 /* Bar cursor bitmap. A vertical bar; max 13 pixels high. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
390 /*
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
391 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
392 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
393 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
394 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
395 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
396 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
397 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
398 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
399 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
400 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
401 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
402 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
403 xx......
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
404 */
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
405 static unsigned short vertical_bar_bits[] = {
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
406 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0};
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
407
69063
fb4f4719e18b (horizontal_bar_bits): Rename from `horisontal_bar_bits'.
Juanma Barranquero <lekktu@gmail.com>
parents: 69049
diff changeset
408 /* HBar cursor bitmap. A horizontal bar; 2 pixels high. */
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
409 /*
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
410 xxxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
411 xxxxxxx.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
412 */
69063
fb4f4719e18b (horizontal_bar_bits): Rename from `horisontal_bar_bits'.
Juanma Barranquero <lekktu@gmail.com>
parents: 69049
diff changeset
413 static unsigned short horizontal_bar_bits[] = {
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
414 0xfe, 0xfe};
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
415
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
416
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
417 /* Bitmap drawn to indicate lines not displaying text if
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
418 `indicate-empty-lines' is non-nil. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
419 /*
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
420 ........
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
421 ..xxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
422 ........
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
423 ........
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
424 ..xxxx..
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
425 ........
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
426 */
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
427 static unsigned short empty_line_bits[] = {
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
428 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00,
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
429 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00,
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
430 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00,
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
431 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00,
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
432 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00,
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
433 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00,
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
434 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00,
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
435 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00};
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
436
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
437
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
438 #define BYTES_PER_BITMAP_ROW (sizeof (unsigned short))
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
439 #define STANDARD_BITMAP_HEIGHT(bits) (sizeof (bits)/BYTES_PER_BITMAP_ROW)
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
440 #define FRBITS(bits) bits, STANDARD_BITMAP_HEIGHT (bits)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
441
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
442 /* NOTE: The order of these bitmaps must match the sequence
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
443 used in fringe.el to define the corresponding symbols. */
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
444
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
445 struct fringe_bitmap standard_bitmaps[] =
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
446 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
447 { NULL, 0, 0, 0, 0, 0 }, /* NO_FRINGE_BITMAP */
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
448 { FRBITS (question_mark_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 },
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
449 { FRBITS (left_arrow_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 },
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
450 { FRBITS (right_arrow_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 },
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
451 { FRBITS (up_arrow_bits), 8, 0, ALIGN_BITMAP_TOP, 0 },
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
452 { FRBITS (down_arrow_bits), 8, 0, ALIGN_BITMAP_BOTTOM, 0 },
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
453 { FRBITS (left_curly_arrow_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 },
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
454 { FRBITS (right_curly_arrow_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 },
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
455 { FRBITS (left_triangle_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 },
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
456 { FRBITS (right_triangle_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 },
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
457 { FRBITS (top_left_angle_bits), 8, 0, ALIGN_BITMAP_TOP, 0 },
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
458 { FRBITS (top_right_angle_bits), 8, 0, ALIGN_BITMAP_TOP, 0 },
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
459 { FRBITS (bottom_left_angle_bits), 8, 0, ALIGN_BITMAP_BOTTOM, 0 },
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
460 { FRBITS (bottom_right_angle_bits), 8, 0, ALIGN_BITMAP_BOTTOM, 0 },
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
461 { FRBITS (left_bracket_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 },
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
462 { FRBITS (right_bracket_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 },
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
463 { FRBITS (filled_rectangle_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 },
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
464 { FRBITS (hollow_rectangle_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 },
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
465 { FRBITS (filled_square_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 },
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
466 { FRBITS (hollow_square_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 },
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
467 { FRBITS (vertical_bar_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 },
69063
fb4f4719e18b (horizontal_bar_bits): Rename from `horisontal_bar_bits'.
Juanma Barranquero <lekktu@gmail.com>
parents: 69049
diff changeset
468 { FRBITS (horizontal_bar_bits), 8, 0, ALIGN_BITMAP_BOTTOM, 0 },
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
469 { FRBITS (empty_line_bits), 8, 3, ALIGN_BITMAP_TOP, 0 },
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
470 };
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
471
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
472 #define NO_FRINGE_BITMAP 0
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
473 #define UNDEF_FRINGE_BITMAP 1
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
474 #define MAX_STANDARD_FRINGE_BITMAPS (sizeof(standard_bitmaps)/sizeof(standard_bitmaps[0]))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
475
57277
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
476 static struct fringe_bitmap **fringe_bitmaps;
59401
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
477 static Lisp_Object *fringe_faces;
57277
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
478 static int max_fringe_bitmaps;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
479
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 94963
diff changeset
480 int max_used_fringe_bitmap = MAX_STANDARD_FRINGE_BITMAPS;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
481
57270
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
482
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
483 /* Lookup bitmap number for symbol BITMAP.
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
484 Return 0 if not a bitmap. */
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
485
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
486 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108946
diff changeset
487 lookup_fringe_bitmap (Lisp_Object bitmap)
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
488 {
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
489 int bn;
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
490
57270
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
491 bitmap = Fget (bitmap, Qfringe);
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
492 if (!INTEGERP (bitmap))
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
493 return 0;
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
494
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
495 bn = XINT (bitmap);
57270
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
496 if (bn > NO_FRINGE_BITMAP
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
497 && bn < max_used_fringe_bitmap
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
498 && (bn < MAX_STANDARD_FRINGE_BITMAPS
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
499 || fringe_bitmaps[bn] != NULL))
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
500 return bn;
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
501
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
502 return 0;
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
503 }
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
504
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
505 /* Get fringe bitmap name for bitmap number BN.
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
506
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
507 Found by traversing Vfringe_bitmaps comparing BN to the
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
508 fringe property for each symbol.
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
509
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
510 Return BN if not found in Vfringe_bitmaps. */
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
511
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
512 static Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108946
diff changeset
513 get_fringe_bitmap_name (int bn)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
514 {
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
515 Lisp_Object bitmaps;
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
516 Lisp_Object num;
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
517
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
518 /* Zero means no bitmap -- return nil. */
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
519 if (bn <= 0)
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
520 return Qnil;
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
521
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
522 bitmaps = Vfringe_bitmaps;
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
523 num = make_number (bn);
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
524
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
525 while (CONSP (bitmaps))
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
526 {
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
527 Lisp_Object bitmap = XCAR (bitmaps);
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
528 if (EQ (num, Fget (bitmap, Qfringe)))
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
529 return bitmap;
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
530 bitmaps = XCDR (bitmaps);
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
531 }
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
532
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
533 return num;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
534 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
535
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
536
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
537 /* Draw the bitmap WHICH in one of the left or right fringes of
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
538 window W. ROW is the glyph row for which to display the bitmap; it
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
539 determines the vertical position at which the bitmap has to be
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
540 drawn.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
541 LEFT_P is 1 for left fringe, 0 for right fringe.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
542 */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
543
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
544 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108946
diff changeset
545 draw_fringe_bitmap_1 (struct window *w, struct glyph_row *row, int left_p, int overlay, int which)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
546 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
547 struct frame *f = XFRAME (WINDOW_FRAME (w));
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
548 struct draw_fringe_bitmap_params p;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
549 struct fringe_bitmap *fb;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
550 int period;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
551 int face_id = DEFAULT_FACE_ID;
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
552 int offset, header_line_height;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
553
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
554 p.overlay_p = (overlay & 1) == 1;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
555 p.cursor_p = (overlay & 2) == 2;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
556
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
557 if (which != NO_FRINGE_BITMAP)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
558 {
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
559 offset = 0;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
560 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
561 else if (left_p)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
562 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
563 which = row->left_fringe_bitmap;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
564 face_id = row->left_fringe_face_id;
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
565 offset = row->left_fringe_offset;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
566 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
567 else
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
568 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
569 which = row->right_fringe_bitmap;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
570 face_id = row->right_fringe_face_id;
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
571 offset = row->right_fringe_offset;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
572 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
573
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
574 if (face_id == DEFAULT_FACE_ID)
59401
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
575 {
109153
978941230a7c * fringe.c (draw_fringe_bitmap_1): Use lookup_named_face to get
Chong Yidong <cyd@stupidchicken.com>
parents: 109126
diff changeset
576 Lisp_Object face = fringe_faces[which];
978941230a7c * fringe.c (draw_fringe_bitmap_1): Use lookup_named_face to get
Chong Yidong <cyd@stupidchicken.com>
parents: 109126
diff changeset
577 face_id = NILP (face) ? lookup_named_face (f, Qfringe, 0)
978941230a7c * fringe.c (draw_fringe_bitmap_1): Use lookup_named_face to get
Chong Yidong <cyd@stupidchicken.com>
parents: 109126
diff changeset
578 : lookup_derived_face (f, face, FRINGE_FACE_ID, 0);
978941230a7c * fringe.c (draw_fringe_bitmap_1): Use lookup_named_face to get
Chong Yidong <cyd@stupidchicken.com>
parents: 109126
diff changeset
579 if (face_id < 0)
59401
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
580 face_id = FRINGE_FACE_ID;
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
581 }
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
582
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
583 fb = fringe_bitmaps[which];
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
584 if (fb == NULL)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
585 fb = &standard_bitmaps[which < MAX_STANDARD_FRINGE_BITMAPS
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
586 ? which : UNDEF_FRINGE_BITMAP];
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
587
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
588 period = fb->period;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
589
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
590 /* Convert row to frame coordinates. */
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
591 p.y = WINDOW_TO_FRAME_PIXEL_Y (w, row->y) + offset;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
592
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
593 p.which = which;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
594 p.bits = fb->bits;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
595 p.wd = fb->width;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
596
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
597 p.h = fb->height;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
598 p.dh = (period > 0 ? (p.y % period) : 0);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
599 p.h -= p.dh;
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
600
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
601 /* Adjust y to the offset in the row to start drawing the bitmap. */
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
602 switch (fb->align)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
603 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
604 case ALIGN_BITMAP_CENTER:
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
605 p.y += (row->height - p.h) / 2;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
606 break;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
607 case ALIGN_BITMAP_BOTTOM:
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
608 p.y += (row->visible_height - p.h);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
609 break;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
610 case ALIGN_BITMAP_TOP:
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
611 break;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
612 }
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
613
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
614 p.face = FACE_FROM_ID (f, face_id);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
615
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
616 if (p.face == NULL)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
617 {
59401
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
618 /* This could happen after clearing face cache.
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
619 But it shouldn't happen anymore. ++kfs */
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
620 return;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
621 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
622
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
623 PREPARE_FACE_FOR_DISPLAY (f, p.face);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
624
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
625 /* Clear left fringe if no bitmap to draw or if bitmap doesn't fill
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
626 the fringe. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
627 p.bx = -1;
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
628 header_line_height = WINDOW_HEADER_LINE_HEIGHT (w);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
629 p.by = WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height, row->y));
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
630 p.ny = row->visible_height;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
631 if (left_p)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
632 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
633 int wd = WINDOW_LEFT_FRINGE_WIDTH (w);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
634 int x = window_box_left (w, (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
635 ? LEFT_MARGIN_AREA
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
636 : TEXT_AREA));
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
637 if (p.wd > wd)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
638 p.wd = wd;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
639 p.x = x - p.wd - (wd - p.wd) / 2;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
640
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
641 if (p.wd < wd || p.y > p.by || p.y + p.h < p.by + p.ny)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
642 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
643 /* If W has a vertical border to its left, don't draw over it. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
644 wd -= ((!WINDOW_LEFTMOST_P (w)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
645 && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w))
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
646 ? 1 : 0);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
647 p.bx = x - wd;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
648 p.nx = wd;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
649 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
650 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
651 else
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
652 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
653 int x = window_box_right (w,
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
654 (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
655 ? RIGHT_MARGIN_AREA
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
656 : TEXT_AREA));
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
657 int wd = WINDOW_RIGHT_FRINGE_WIDTH (w);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
658 if (p.wd > wd)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
659 p.wd = wd;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
660 p.x = x + (wd - p.wd) / 2;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
661 /* Clear right fringe if no bitmap to draw of if bitmap doesn't fill
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
662 the fringe. */
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
663 if (p.wd < wd || p.y > p.by || p.y + p.h < p.by + p.ny)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
664 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
665 p.bx = x;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
666 p.nx = wd;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
667 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
668 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
669
83037
03a73693678e Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents: 53970
diff changeset
670 FRAME_RIF (f)->draw_fringe_bitmap (w, row, &p);
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
671 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
672
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
673 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108946
diff changeset
674 get_logical_cursor_bitmap (struct window *w, Lisp_Object cursor)
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
675 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
676 Lisp_Object cmap, bm = Qnil;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
677
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
678 if ((cmap = XBUFFER (w->buffer)->fringe_cursor_alist), !NILP (cmap))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
679 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
680 bm = Fassq (cursor, cmap);
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
681 if (CONSP (bm))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
682 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
683 if ((bm = XCDR (bm)), NILP (bm))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
684 return NO_FRINGE_BITMAP;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
685 return lookup_fringe_bitmap (bm);
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
686 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
687 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
688 if (EQ (cmap, buffer_defaults.fringe_cursor_alist))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
689 return NO_FRINGE_BITMAP;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
690 bm = Fassq (cursor, buffer_defaults.fringe_cursor_alist);
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
691 if (!CONSP (bm) || ((bm = XCDR (bm)), NILP (bm)))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
692 return NO_FRINGE_BITMAP;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
693 return lookup_fringe_bitmap (bm);
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
694 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
695
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
696 static int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108946
diff changeset
697 get_logical_fringe_bitmap (struct window *w, Lisp_Object bitmap, int right_p, int partial_p)
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
698 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
699 Lisp_Object cmap, bm1 = Qnil, bm2 = Qnil, bm;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
700 int ln1 = 0, ln2 = 0;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
701 int ix1 = right_p;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
702 int ix2 = ix1 + (partial_p ? 2 : 0);
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
703
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
704 /* Lookup in buffer-local fringe-indicator-alist before global alist.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
705
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
706 Elements are:
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
707 BITMAP -- use for all
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
708 (L R) -- use for left right (whether partial or not)
108933
b465aa3255ed Fix typos.
Juanma Barranquero <lekktu@gmail.com>
parents: 106815
diff changeset
709 (L R PL PR) -- use for left right partial-left partial-right
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
710 If any value in local binding is not present or t, use global value.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
711
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
712 If partial, lookup partial bitmap in default value if not found here.
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
713 If not partial, or no partial spec is present, use non-partial bitmap. */
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
714
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
715 if ((cmap = XBUFFER (w->buffer)->fringe_indicator_alist), !NILP (cmap))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
716 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
717 bm1 = Fassq (bitmap, cmap);
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
718 if (CONSP (bm1))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
719 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
720 if ((bm1 = XCDR (bm1)), NILP (bm1))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
721 return NO_FRINGE_BITMAP;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
722 if (CONSP (bm1))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
723 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
724 ln1 = XINT (Flength (bm1));
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
725 if (partial_p)
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
726 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
727 if (ln1 > ix2)
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
728 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
729 bm = Fnth (make_number (ix2), bm1);
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
730 if (!EQ (bm, Qt))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
731 goto found;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
732 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
733 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
734 else
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
735 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
736 if (ln1 > ix1)
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
737 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
738 bm = Fnth (make_number (ix1), bm1);
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
739 if (!EQ (bm, Qt))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
740 goto found;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
741 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
742 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
743 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
744 else if ((bm = bm1, !EQ (bm, Qt)))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
745 goto found;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
746 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
747 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
748
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
749 if (!EQ (cmap, buffer_defaults.fringe_indicator_alist)
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
750 && !NILP (buffer_defaults.fringe_indicator_alist))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
751 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
752 bm2 = Fassq (bitmap, buffer_defaults.fringe_indicator_alist);
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
753 if (CONSP (bm2))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
754 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
755 if ((bm2 = XCDR (bm2)), !NILP (bm2))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
756 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
757 if (CONSP (bm2))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
758 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
759 ln2 = XINT (Flength (bm2));
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
760 if (partial_p)
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
761 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
762 if (ln2 > ix2)
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
763 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
764 bm = Fnth (make_number (ix2), bm2);
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
765 if (!EQ (bm, Qt))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
766 goto found;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
767 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
768 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
769 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
770 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
771 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
772 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
773
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
774 if (ln1 > ix1)
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
775 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
776 bm = Fnth (make_number (ix1), bm1);
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
777 if (!EQ (bm, Qt))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
778 goto found;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
779 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
780
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
781 if (ln2 > ix1)
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
782 {
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
783 bm = Fnth (make_number (ix1), bm2);
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
784 if (!EQ (bm, Qt))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
785 goto found;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
786 return NO_FRINGE_BITMAP;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
787 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
788 else if ((bm = bm2, NILP (bm)))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
789 return NO_FRINGE_BITMAP;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
790
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
791 found:
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
792 return lookup_fringe_bitmap (bm);
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
793 }
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
794
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
795
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
796 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108946
diff changeset
797 draw_fringe_bitmap (struct window *w, struct glyph_row *row, int left_p)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
798 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
799 int overlay = 0;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
800
107991
74557d25410e Implement cursor on the left fringe for R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents: 106815
diff changeset
801 if (left_p == row->reversed_p && row->cursor_in_fringe_p)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
802 {
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
803 Lisp_Object cursor = Qnil;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
804
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
805 switch (w->phys_cursor_type)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
806 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
807 case HOLLOW_BOX_CURSOR:
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
808 if (row->visible_height >= STANDARD_BITMAP_HEIGHT (hollow_rectangle_bits))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
809 cursor = Qhollow;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
810 else
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
811 cursor = Qhollow_small;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
812 break;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
813 case FILLED_BOX_CURSOR:
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
814 cursor = Qbox;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
815 break;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
816 case BAR_CURSOR:
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
817 cursor = Qbar;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
818 break;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
819 case HBAR_CURSOR:
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
820 cursor = Qhbar;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
821 break;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
822 case NO_CURSOR:
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
823 default:
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
824 w->phys_cursor_on_p = 0;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
825 row->cursor_in_fringe_p = 0;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
826 break;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
827 }
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
828 if (!NILP (cursor))
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
829 {
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
830 int bm = get_logical_cursor_bitmap (w, cursor);
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
831 if (bm != NO_FRINGE_BITMAP)
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
832 {
107991
74557d25410e Implement cursor on the left fringe for R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents: 106815
diff changeset
833 draw_fringe_bitmap_1 (w, row, left_p, 2, bm);
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
834 overlay = EQ (cursor, Qbox) ? 3 : 1;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
835 }
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
836 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
837 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
838
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
839 draw_fringe_bitmap_1 (w, row, left_p, overlay, NO_FRINGE_BITMAP);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
840
61634
e188b7249c28 (draw_fringe_bitmap): Use overlay_arrow_bitmap from row
Kim F. Storm <storm@cua.dk>
parents: 60834
diff changeset
841 if (left_p && row->overlay_arrow_bitmap != NO_FRINGE_BITMAP)
69616
c00e99faf809 (draw_fringe_bitmap): Don't calculate default overlay arrow
Kim F. Storm <storm@cua.dk>
parents: 69490
diff changeset
842 draw_fringe_bitmap_1 (w, row, 1, 1, row->overlay_arrow_bitmap);
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
843 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
844
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
845
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
846 /* Draw fringe bitmaps for glyph row ROW on window W. Call this
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
847 function with input blocked. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
848
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
849 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108946
diff changeset
850 draw_row_fringe_bitmaps (struct window *w, struct glyph_row *row)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
851 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
852 xassert (interrupt_input_blocked);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
853
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
854 /* If row is completely invisible, because of vscrolling, we
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
855 don't have to draw anything. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
856 if (row->visible_height <= 0)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
857 return;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
858
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
859 if (WINDOW_LEFT_FRINGE_WIDTH (w) != 0)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
860 draw_fringe_bitmap (w, row, 1);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
861
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
862 if (WINDOW_RIGHT_FRINGE_WIDTH (w) != 0)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
863 draw_fringe_bitmap (w, row, 0);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
864 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
865
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
866 /* Draw the fringes of window W. Only fringes for rows marked for
57371
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
867 update in redraw_fringe_bitmaps_p are drawn.
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
868
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
869 Return >0 if left or right fringe was redrawn in any way.
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
870
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
871 If NO_FRINGE is non-zero, also return >0 if either fringe has zero width.
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
872
57371
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
873 A return value >0 indicates that the vertical line between windows
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
874 needs update (as it may be drawn in the fringe).
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
875 */
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
876
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
877 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108946
diff changeset
878 draw_window_fringes (struct window *w, int no_fringe)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
879 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
880 struct glyph_row *row;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
881 int yb = window_text_bottom_y (w);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
882 int nrows = w->current_matrix->nrows;
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
883 int y, rn;
57371
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
884 int updated = 0;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
885
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
886 if (w->pseudo_window_p)
57371
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
887 return 0;
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
888
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
889 /* Must draw line if no fringe */
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
890 if (no_fringe
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
891 && (WINDOW_LEFT_FRINGE_WIDTH (w) == 0
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
892 || WINDOW_RIGHT_FRINGE_WIDTH (w) == 0))
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
893 updated++;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
894
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
895 for (y = w->vscroll, rn = 0, row = w->current_matrix->rows;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
896 y < yb && rn < nrows;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
897 y += row->height, ++row, ++rn)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
898 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
899 if (!row->redraw_fringe_bitmaps_p)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
900 continue;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
901 draw_row_fringe_bitmaps (w, row);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
902 row->redraw_fringe_bitmaps_p = 0;
57371
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
903 updated++;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
904 }
57371
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
905
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
906 return updated;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
907 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
908
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
909
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
910 /* Recalculate the bitmaps to show in the fringes of window W.
65062
8370ced2ae75 (update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents: 64770
diff changeset
911 Only mark rows with modified bitmaps for update in redraw_fringe_bitmaps_p.
8370ced2ae75 (update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents: 64770
diff changeset
912
8370ced2ae75 (update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents: 64770
diff changeset
913 If KEEP_CURRENT_P is 0, update current_matrix too. */
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
914
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
915 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108946
diff changeset
916 update_window_fringes (struct window *w, int keep_current_p)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
917 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
918 struct glyph_row *row, *cur = 0;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
919 int yb = window_text_bottom_y (w);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
920 int rn, nrows = w->current_matrix->nrows;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
921 int y;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
922 int redraw_p = 0;
57246
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
923 Lisp_Object boundary_top = Qnil, boundary_bot = Qnil;
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
924 Lisp_Object arrow_top = Qnil, arrow_bot = Qnil;
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
925 Lisp_Object empty_pos;
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
926 Lisp_Object ind = Qnil;
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
927 #define MAX_BITMAP_CACHE (8*4)
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
928 int bitmap_cache[MAX_BITMAP_CACHE];
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
929 int top_ind_rn, bot_ind_rn;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
930 int top_ind_min_y, bot_ind_max_y;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
931 int top_row_ends_at_zv_p, bot_row_ends_at_zv_p;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
932
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
933 if (w->pseudo_window_p)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
934 return 0;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
935
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
936 if (!MINI_WINDOW_P (w)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
937 && (ind = XBUFFER (w->buffer)->indicate_buffer_boundaries, !NILP (ind)))
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
938 {
57246
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
939 if (EQ (ind, Qleft) || EQ (ind, Qright))
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
940 boundary_top = boundary_bot = arrow_top = arrow_bot = ind;
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
941 else if (CONSP (ind) && CONSP (XCAR (ind)))
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
942 {
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
943 Lisp_Object pos;
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
944 if (pos = Fassq (Qt, ind), !NILP (pos))
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
945 boundary_top = boundary_bot = arrow_top = arrow_bot = XCDR (pos);
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
946 if (pos = Fassq (Qtop, ind), !NILP (pos))
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
947 boundary_top = XCDR (pos);
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
948 if (pos = Fassq (Qbottom, ind), !NILP (pos))
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
949 boundary_bot = XCDR (pos);
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
950 if (pos = Fassq (Qup, ind), !NILP (pos))
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
951 arrow_top = XCDR (pos);
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
952 if (pos = Fassq (Qdown, ind), !NILP (pos))
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
953 arrow_bot = XCDR (pos);
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
954 }
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
955 else
58424
99a14d81043f (update_window_fringes): Provide sensible fall-back
Kim F. Storm <storm@cua.dk>
parents: 58268
diff changeset
956 /* Anything else means boundary on left and no arrows. */
99a14d81043f (update_window_fringes): Provide sensible fall-back
Kim F. Storm <storm@cua.dk>
parents: 58268
diff changeset
957 boundary_top = boundary_bot = Qleft;
57246
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
958 }
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
959
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
960 top_ind_rn = bot_ind_rn = -1;
57246
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
961 if (!NILP (ind))
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
962 {
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
963 for (y = w->vscroll, rn = 0;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
964 y < yb && rn < nrows;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
965 y += row->height, ++rn)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
966 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
967 unsigned indicate_bob_p, indicate_top_line_p;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
968 unsigned indicate_eob_p, indicate_bottom_line_p;
54220
50ba59282051 (Fdefine_fringe_bitmap): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 54079
diff changeset
969
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
970 row = w->desired_matrix->rows + rn;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
971 if (!row->enabled_p)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
972 row = w->current_matrix->rows + rn;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
973
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
974 indicate_bob_p = row->indicate_bob_p;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
975 indicate_top_line_p = row->indicate_top_line_p;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
976 indicate_eob_p = row->indicate_eob_p;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
977 indicate_bottom_line_p = row->indicate_bottom_line_p;
54220
50ba59282051 (Fdefine_fringe_bitmap): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 54079
diff changeset
978
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
979 row->indicate_bob_p = row->indicate_top_line_p = 0;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
980 row->indicate_eob_p = row->indicate_bottom_line_p = 0;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
981
58443
4e571414ba22 (update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents: 58424
diff changeset
982 if (!row->mode_line_p)
4e571414ba22 (update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents: 58424
diff changeset
983 {
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
984 if (top_ind_rn < 0 && row->visible_height > 0)
58443
4e571414ba22 (update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents: 58424
diff changeset
985 {
65066
67861e2e09d6 * fringe.c (update_window_fringes): Only put TOP and BOTTOM
Kim F. Storm <storm@cua.dk>
parents: 65062
diff changeset
986 if (MATRIX_ROW_START_CHARPOS (row) <= BUF_BEGV (XBUFFER (w->buffer))
67861e2e09d6 * fringe.c (update_window_fringes): Only put TOP and BOTTOM
Kim F. Storm <storm@cua.dk>
parents: 65062
diff changeset
987 && !MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (w, row))
58443
4e571414ba22 (update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents: 58424
diff changeset
988 row->indicate_bob_p = !NILP (boundary_top);
4e571414ba22 (update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents: 58424
diff changeset
989 else
4e571414ba22 (update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents: 58424
diff changeset
990 row->indicate_top_line_p = !NILP (arrow_top);
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
991 top_ind_rn = rn;
58443
4e571414ba22 (update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents: 58424
diff changeset
992 }
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
993
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
994 if (bot_ind_rn < 0)
58443
4e571414ba22 (update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents: 58424
diff changeset
995 {
66622
cf3d316b4bc0 (update_window_fringes): Undo 2005-10-27 change.
Kim F. Storm <storm@cua.dk>
parents: 66471
diff changeset
996 if (MATRIX_ROW_END_CHARPOS (row) >= BUF_ZV (XBUFFER (w->buffer))
65066
67861e2e09d6 * fringe.c (update_window_fringes): Only put TOP and BOTTOM
Kim F. Storm <storm@cua.dk>
parents: 65062
diff changeset
997 && !MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row))
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
998 row->indicate_eob_p = !NILP (boundary_bot), bot_ind_rn = rn;
58443
4e571414ba22 (update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents: 58424
diff changeset
999 else if (y + row->height >= yb)
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1000 row->indicate_bottom_line_p = !NILP (arrow_bot), bot_ind_rn = rn;
58443
4e571414ba22 (update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents: 58424
diff changeset
1001 }
4e571414ba22 (update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents: 58424
diff changeset
1002 }
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1003 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1004 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1005
57246
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
1006 empty_pos = XBUFFER (w->buffer)->indicate_empty_lines;
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
1007 if (!NILP (empty_pos) && !EQ (empty_pos, Qright))
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
1008 empty_pos = WINDOW_LEFT_FRINGE_WIDTH (w) == 0 ? Qright : Qleft;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1009
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1010 for (y = 0; y < MAX_BITMAP_CACHE; y++)
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1011 bitmap_cache[y] = -1;
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1012
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1013 #define LEFT_FRINGE(cache, which, partial_p) \
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1014 (bitmap_cache[cache*4+partial_p] >= 0 \
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1015 ? bitmap_cache[cache*4+partial_p] \
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1016 : (bitmap_cache[cache*4+partial_p] = \
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1017 get_logical_fringe_bitmap (w, which, 0, partial_p)))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1018
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1019 #define RIGHT_FRINGE(cache, which, partial_p) \
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1020 (bitmap_cache[cache*4+2+partial_p] >= 0 \
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1021 ? bitmap_cache[cache*4+2+partial_p] \
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1022 : (bitmap_cache[cache*4+2+partial_p] = \
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1023 get_logical_fringe_bitmap (w, which, 1, partial_p)))
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1024
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1025
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1026 /* Extend top-aligned top indicator (or bottom-aligned bottom
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1027 indicator) to adjacent rows if it doesn't fit in one row. */
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1028 top_ind_min_y = bot_ind_max_y = -1;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1029 if (top_ind_rn >= 0)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1030 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1031 int bn = NO_FRINGE_BITMAP;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1032
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1033 row = w->desired_matrix->rows + top_ind_rn;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1034 if (!row->enabled_p)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1035 row = w->current_matrix->rows + top_ind_rn;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1036
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1037 top_row_ends_at_zv_p = row->ends_at_zv_p;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1038 if (row->indicate_bob_p)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1039 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1040 if (EQ (boundary_top, Qleft))
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1041 bn = ((row->indicate_eob_p && EQ (boundary_bot, Qleft))
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1042 ? LEFT_FRINGE (1, Qtop_bottom, row->ends_at_zv_p)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1043 : LEFT_FRINGE (2, Qtop, 0));
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1044 else
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1045 bn = ((row->indicate_eob_p && EQ (boundary_bot, Qright))
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1046 ? RIGHT_FRINGE (1, Qtop_bottom, row->ends_at_zv_p)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1047 : RIGHT_FRINGE (2, Qtop, 0));
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1048 }
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1049 else if (row->indicate_top_line_p)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1050 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1051 if (EQ (arrow_top, Qleft))
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1052 bn = LEFT_FRINGE (6, Qup, 0);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1053 else
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1054 bn = RIGHT_FRINGE (6, Qup, 0);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1055 }
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1056
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1057 if (bn != NO_FRINGE_BITMAP)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1058 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1059 struct fringe_bitmap *fb;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1060
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1061 fb = fringe_bitmaps[bn];
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1062 if (fb == NULL)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1063 fb = &standard_bitmaps[bn < MAX_STANDARD_FRINGE_BITMAPS
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1064 ? bn : UNDEF_FRINGE_BITMAP];
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1065 if (fb->align == ALIGN_BITMAP_TOP && fb->period == 0)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1066 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1067 struct glyph_row *row1;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1068 int top_ind_max_y;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1069
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1070 top_ind_min_y = WINDOW_HEADER_LINE_HEIGHT (w);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1071 top_ind_max_y = top_ind_min_y + fb->height;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1072 if (top_ind_max_y > yb)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1073 top_ind_max_y = yb;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1074
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1075 for (y = row->y + row->height, rn = top_ind_rn + 1;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1076 y < top_ind_max_y && rn < nrows;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1077 y += row1->height, rn++)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1078 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1079 if (bot_ind_rn >= 0 && rn >= bot_ind_rn)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1080 break;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1081
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1082 row1 = w->desired_matrix->rows + rn;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1083 if (!row1->enabled_p)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1084 row1 = w->current_matrix->rows + rn;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1085
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1086 row1->indicate_bob_p = row->indicate_bob_p;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1087 row1->indicate_top_line_p = row->indicate_top_line_p;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1088 }
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1089 }
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1090 }
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1091 }
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1092 if (bot_ind_rn >= 0)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1093 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1094 int bn = NO_FRINGE_BITMAP;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1095
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1096 row = w->desired_matrix->rows + bot_ind_rn;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1097 if (!row->enabled_p)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1098 row = w->current_matrix->rows + bot_ind_rn;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1099
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1100 bot_row_ends_at_zv_p = row->ends_at_zv_p;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1101 if (row->indicate_eob_p)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1102 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1103 if (EQ (boundary_bot, Qleft))
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1104 bn = LEFT_FRINGE (3, Qbottom, row->ends_at_zv_p);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1105 else
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1106 bn = RIGHT_FRINGE (3, Qbottom, row->ends_at_zv_p);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1107 }
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1108 else if (row->indicate_bottom_line_p)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1109 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1110 if (EQ (arrow_bot, Qleft))
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1111 bn = LEFT_FRINGE (7, Qdown, 0);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1112 else
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1113 bn = RIGHT_FRINGE (7, Qdown, 0);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1114 }
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1115
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1116 if (bn != NO_FRINGE_BITMAP)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1117 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1118 struct fringe_bitmap *fb;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1119
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1120 fb = fringe_bitmaps[bn];
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1121 if (fb == NULL)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1122 fb = &standard_bitmaps[bn < MAX_STANDARD_FRINGE_BITMAPS
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1123 ? bn : UNDEF_FRINGE_BITMAP];
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1124 if (fb->align == ALIGN_BITMAP_BOTTOM && fb->period == 0)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1125 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1126 struct glyph_row *row1;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1127 int bot_ind_min_y;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1128
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1129 bot_ind_max_y = row->y + row->visible_height;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1130 bot_ind_min_y = bot_ind_max_y - fb->height;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1131 if (bot_ind_min_y < WINDOW_HEADER_LINE_HEIGHT (w))
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1132 bot_ind_min_y = WINDOW_HEADER_LINE_HEIGHT (w);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1133
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1134 for (y = row->y, rn = bot_ind_rn - 1;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1135 y >= bot_ind_min_y && rn >= 0;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1136 y -= row1->height, rn--)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1137 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1138 if (top_ind_rn >= 0 && rn <= top_ind_rn)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1139 break;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1140
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1141 row1 = w->desired_matrix->rows + rn;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1142 if (!row1->enabled_p)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1143 row1 = w->current_matrix->rows + rn;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1144
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1145 row1->indicate_eob_p = row->indicate_eob_p;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1146 row1->indicate_bottom_line_p = row->indicate_bottom_line_p;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1147 }
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1148 }
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1149 }
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1150 }
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1151
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1152 for (y = w->vscroll, rn = 0;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1153 y < yb && rn < nrows;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1154 y += row->height, rn++)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1155 {
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1156 int left, right;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1157 unsigned left_face_id, right_face_id;
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1158 int left_offset, right_offset;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1159
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1160 row = w->desired_matrix->rows + rn;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1161 cur = w->current_matrix->rows + rn;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1162 if (!row->enabled_p)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1163 row = cur;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1164
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1165 left_face_id = right_face_id = DEFAULT_FACE_ID;
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1166 left_offset = right_offset = 0;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1167
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1168 /* Decide which bitmap to draw in the left fringe. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1169 if (WINDOW_LEFT_FRINGE_WIDTH (w) == 0)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1170 left = NO_FRINGE_BITMAP;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1171 else if (row->left_user_fringe_bitmap != NO_FRINGE_BITMAP)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1172 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1173 left = row->left_user_fringe_bitmap;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1174 left_face_id = row->left_user_fringe_face_id;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1175 }
108313
cda2e3e030af Fix fringe truncation bitmaps in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents: 107994
diff changeset
1176 else if ((!row->reversed_p && row->truncated_on_left_p)
cda2e3e030af Fix fringe truncation bitmaps in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents: 107994
diff changeset
1177 || (row->reversed_p && row->truncated_on_right_p))
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1178 left = LEFT_FRINGE(0, Qtruncation, 0);
57246
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
1179 else if (row->indicate_bob_p && EQ (boundary_top, Qleft))
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1180 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1181 left = ((row->indicate_eob_p && EQ (boundary_bot, Qleft))
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1182 ? LEFT_FRINGE (1, Qtop_bottom, top_row_ends_at_zv_p)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1183 : LEFT_FRINGE (2, Qtop, 0));
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1184 if (top_ind_min_y >= 0)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1185 left_offset = top_ind_min_y - row->y;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1186 }
57246
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
1187 else if (row->indicate_eob_p && EQ (boundary_bot, Qleft))
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1188 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1189 left = LEFT_FRINGE (3, Qbottom, bot_row_ends_at_zv_p);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1190 if (bot_ind_max_y >= 0)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1191 left_offset = bot_ind_max_y - (row->y + row->visible_height);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1192 }
109439
9ad1e76fc718 Restore mistakenly reverted code from revno 99854.1.6 merged in revno 99950.
Eli Zaretskii <eliz@gnu.org>
parents: 109302
diff changeset
1193 else if ((!row->reversed_p && MATRIX_ROW_CONTINUATION_LINE_P (row))
9ad1e76fc718 Restore mistakenly reverted code from revno 99854.1.6 merged in revno 99950.
Eli Zaretskii <eliz@gnu.org>
parents: 109302
diff changeset
1194 || (row->reversed_p && row->continued_p))
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1195 left = LEFT_FRINGE (4, Qcontinuation, 0);
57246
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
1196 else if (row->indicate_empty_line_p && EQ (empty_pos, Qleft))
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1197 left = LEFT_FRINGE (5, Qempty_line, 0);
57246
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
1198 else if (row->indicate_top_line_p && EQ (arrow_top, Qleft))
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1199 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1200 left = LEFT_FRINGE (6, Qup, 0);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1201 if (top_ind_min_y >= 0)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1202 left_offset = top_ind_min_y - row->y;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1203 }
57246
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
1204 else if (row->indicate_bottom_line_p && EQ (arrow_bot, Qleft))
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1205 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1206 left = LEFT_FRINGE (7, Qdown, 0);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1207 if (bot_ind_max_y >= 0)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1208 left_offset = bot_ind_max_y - (row->y + row->visible_height);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1209 }
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1210 else
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1211 left = NO_FRINGE_BITMAP;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1212
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1213 /* Decide which bitmap to draw in the right fringe. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1214 if (WINDOW_RIGHT_FRINGE_WIDTH (w) == 0)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1215 right = NO_FRINGE_BITMAP;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1216 else if (row->right_user_fringe_bitmap != NO_FRINGE_BITMAP)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1217 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1218 right = row->right_user_fringe_bitmap;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1219 right_face_id = row->right_user_fringe_face_id;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1220 }
108313
cda2e3e030af Fix fringe truncation bitmaps in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents: 107994
diff changeset
1221 else if ((!row->reversed_p && row->truncated_on_right_p)
cda2e3e030af Fix fringe truncation bitmaps in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents: 107994
diff changeset
1222 || (row->reversed_p && row->truncated_on_left_p))
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1223 right = RIGHT_FRINGE (0, Qtruncation, 0);
57246
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
1224 else if (row->indicate_bob_p && EQ (boundary_top, Qright))
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1225 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1226 right = ((row->indicate_eob_p && EQ (boundary_bot, Qright))
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1227 ? RIGHT_FRINGE (1, Qtop_bottom, top_row_ends_at_zv_p)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1228 : RIGHT_FRINGE (2, Qtop, 0));
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1229 if (top_ind_min_y >= 0)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1230 right_offset = top_ind_min_y - row->y;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1231 }
57246
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
1232 else if (row->indicate_eob_p && EQ (boundary_bot, Qright))
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1233 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1234 right = RIGHT_FRINGE (3, Qbottom, bot_row_ends_at_zv_p);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1235 if (bot_ind_max_y >= 0)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1236 right_offset = bot_ind_max_y - (row->y + row->visible_height);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1237 }
109439
9ad1e76fc718 Restore mistakenly reverted code from revno 99854.1.6 merged in revno 99950.
Eli Zaretskii <eliz@gnu.org>
parents: 109302
diff changeset
1238 else if ((!row->reversed_p && row->continued_p)
9ad1e76fc718 Restore mistakenly reverted code from revno 99854.1.6 merged in revno 99950.
Eli Zaretskii <eliz@gnu.org>
parents: 109302
diff changeset
1239 || (row->reversed_p && MATRIX_ROW_CONTINUATION_LINE_P (row)))
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1240 right = RIGHT_FRINGE (4, Qcontinuation, 0);
57246
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
1241 else if (row->indicate_top_line_p && EQ (arrow_top, Qright))
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1242 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1243 right = RIGHT_FRINGE (6, Qup, 0);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1244 if (top_ind_min_y >= 0)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1245 right_offset = top_ind_min_y - row->y;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1246 }
57246
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
1247 else if (row->indicate_bottom_line_p && EQ (arrow_bot, Qright))
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1248 {
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1249 right = RIGHT_FRINGE (7, Qdown, 0);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1250 if (bot_ind_max_y >= 0)
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1251 right_offset = bot_ind_max_y - (row->y + row->visible_height);
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1252 }
57246
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
1253 else if (row->indicate_empty_line_p && EQ (empty_pos, Qright))
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1254 right = RIGHT_FRINGE (5, Qempty_line, 0);
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1255 else
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1256 right = NO_FRINGE_BITMAP;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1257
65062
8370ced2ae75 (update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents: 64770
diff changeset
1258 if (row->y != cur->y
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1259 || row->visible_height != cur->visible_height
58057
33d7af04fba1 (update_window_fringes): Update fringe bitmaps if
Kim F. Storm <storm@cua.dk>
parents: 57371
diff changeset
1260 || row->ends_at_zv_p != cur->ends_at_zv_p
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1261 || left != cur->left_fringe_bitmap
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1262 || right != cur->right_fringe_bitmap
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1263 || left_face_id != cur->left_fringe_face_id
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1264 || right_face_id != cur->right_fringe_face_id
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1265 || left_offset != cur->left_fringe_offset
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1266 || right_offset != cur->right_fringe_offset
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1267 || cur->redraw_fringe_bitmaps_p)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1268 {
65062
8370ced2ae75 (update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents: 64770
diff changeset
1269 redraw_p = row->redraw_fringe_bitmaps_p = 1;
8370ced2ae75 (update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents: 64770
diff changeset
1270 if (!keep_current_p)
8370ced2ae75 (update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents: 64770
diff changeset
1271 {
8370ced2ae75 (update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents: 64770
diff changeset
1272 cur->redraw_fringe_bitmaps_p = 1;
8370ced2ae75 (update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents: 64770
diff changeset
1273 cur->left_fringe_bitmap = left;
8370ced2ae75 (update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents: 64770
diff changeset
1274 cur->right_fringe_bitmap = right;
8370ced2ae75 (update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents: 64770
diff changeset
1275 cur->left_fringe_face_id = left_face_id;
8370ced2ae75 (update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents: 64770
diff changeset
1276 cur->right_fringe_face_id = right_face_id;
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1277 cur->left_fringe_offset = left_offset;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1278 cur->right_fringe_offset = right_offset;
65062
8370ced2ae75 (update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents: 64770
diff changeset
1279 }
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1280 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1281
69616
c00e99faf809 (draw_fringe_bitmap): Don't calculate default overlay arrow
Kim F. Storm <storm@cua.dk>
parents: 69490
diff changeset
1282 if (row->overlay_arrow_bitmap < 0)
c00e99faf809 (draw_fringe_bitmap): Don't calculate default overlay arrow
Kim F. Storm <storm@cua.dk>
parents: 69490
diff changeset
1283 row->overlay_arrow_bitmap = get_logical_fringe_bitmap (w, Qoverlay_arrow, 0, 0);
c00e99faf809 (draw_fringe_bitmap): Don't calculate default overlay arrow
Kim F. Storm <storm@cua.dk>
parents: 69490
diff changeset
1284
61634
e188b7249c28 (draw_fringe_bitmap): Use overlay_arrow_bitmap from row
Kim F. Storm <storm@cua.dk>
parents: 60834
diff changeset
1285 if (row->overlay_arrow_bitmap != cur->overlay_arrow_bitmap)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1286 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1287 redraw_p = row->redraw_fringe_bitmaps_p = cur->redraw_fringe_bitmaps_p = 1;
61634
e188b7249c28 (draw_fringe_bitmap): Use overlay_arrow_bitmap from row
Kim F. Storm <storm@cua.dk>
parents: 60834
diff changeset
1288 cur->overlay_arrow_bitmap = row->overlay_arrow_bitmap;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1289 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1290
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1291 row->left_fringe_bitmap = left;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1292 row->right_fringe_bitmap = right;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1293 row->left_fringe_face_id = left_face_id;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1294 row->right_fringe_face_id = right_face_id;
109296
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1295 row->left_fringe_offset = left_offset;
f6f0d450d542 Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 108933
diff changeset
1296 row->right_fringe_offset = right_offset;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1297 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1298
65062
8370ced2ae75 (update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents: 64770
diff changeset
1299 return redraw_p && !keep_current_p;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1300 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1301
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1302
54220
50ba59282051 (Fdefine_fringe_bitmap): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 54079
diff changeset
1303 /* Compute actual fringe widths for frame F.
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1304
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1305 If REDRAW is 1, redraw F if the fringe settings was actually
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1306 modified and F is visible.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1307
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1308 Since the combined left and right fringe must occupy an integral
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1309 number of columns, we may need to add some pixels to each fringe.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1310 Typically, we add an equal amount (+/- 1 pixel) to each fringe,
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1311 but a negative width value is taken literally (after negating it).
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1312
57371
3c27c0be625d (draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents: 57316
diff changeset
1313 We never make the fringes narrower than specified.
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1314 */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1315
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1316 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108946
diff changeset
1317 compute_fringe_widths (struct frame *f, int redraw)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1318 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1319 int o_left = FRAME_LEFT_FRINGE_WIDTH (f);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1320 int o_right = FRAME_RIGHT_FRINGE_WIDTH (f);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1321 int o_cols = FRAME_FRINGE_COLS (f);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1322
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1323 Lisp_Object left_fringe = Fassq (Qleft_fringe, f->param_alist);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1324 Lisp_Object right_fringe = Fassq (Qright_fringe, f->param_alist);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1325 int left_fringe_width, right_fringe_width;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1326
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1327 if (!NILP (left_fringe))
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1328 left_fringe = Fcdr (left_fringe);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1329 if (!NILP (right_fringe))
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1330 right_fringe = Fcdr (right_fringe);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1331
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1332 left_fringe_width = ((NILP (left_fringe) || !INTEGERP (left_fringe)) ? 8 :
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1333 XINT (left_fringe));
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1334 right_fringe_width = ((NILP (right_fringe) || !INTEGERP (right_fringe)) ? 8 :
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1335 XINT (right_fringe));
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1336
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1337 if (left_fringe_width || right_fringe_width)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1338 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1339 int left_wid = left_fringe_width >= 0 ? left_fringe_width : -left_fringe_width;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1340 int right_wid = right_fringe_width >= 0 ? right_fringe_width : -right_fringe_width;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1341 int conf_wid = left_wid + right_wid;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1342 int font_wid = FRAME_COLUMN_WIDTH (f);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1343 int cols = (left_wid + right_wid + font_wid-1) / font_wid;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1344 int real_wid = cols * font_wid;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1345 if (left_wid && right_wid)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1346 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1347 if (left_fringe_width < 0)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1348 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1349 /* Left fringe width is fixed, adjust right fringe if necessary */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1350 FRAME_LEFT_FRINGE_WIDTH (f) = left_wid;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1351 FRAME_RIGHT_FRINGE_WIDTH (f) = real_wid - left_wid;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1352 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1353 else if (right_fringe_width < 0)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1354 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1355 /* Right fringe width is fixed, adjust left fringe if necessary */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1356 FRAME_LEFT_FRINGE_WIDTH (f) = real_wid - right_wid;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1357 FRAME_RIGHT_FRINGE_WIDTH (f) = right_wid;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1358 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1359 else
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1360 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1361 /* Adjust both fringes with an equal amount.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1362 Note that we are doing integer arithmetic here, so don't
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1363 lose a pixel if the total width is an odd number. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1364 int fill = real_wid - conf_wid;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1365 FRAME_LEFT_FRINGE_WIDTH (f) = left_wid + fill/2;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1366 FRAME_RIGHT_FRINGE_WIDTH (f) = right_wid + fill - fill/2;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1367 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1368 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1369 else if (left_fringe_width)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1370 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1371 FRAME_LEFT_FRINGE_WIDTH (f) = real_wid;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1372 FRAME_RIGHT_FRINGE_WIDTH (f) = 0;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1373 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1374 else
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1375 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1376 FRAME_LEFT_FRINGE_WIDTH (f) = 0;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1377 FRAME_RIGHT_FRINGE_WIDTH (f) = real_wid;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1378 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1379 FRAME_FRINGE_COLS (f) = cols;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1380 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1381 else
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1382 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1383 FRAME_LEFT_FRINGE_WIDTH (f) = 0;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1384 FRAME_RIGHT_FRINGE_WIDTH (f) = 0;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1385 FRAME_FRINGE_COLS (f) = 0;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1386 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1387
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1388 if (redraw && FRAME_VISIBLE_P (f))
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1389 if (o_left != FRAME_LEFT_FRINGE_WIDTH (f) ||
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1390 o_right != FRAME_RIGHT_FRINGE_WIDTH (f) ||
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1391 o_cols != FRAME_FRINGE_COLS (f))
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1392 redraw_frame (f);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1393 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1394
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1395
57270
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
1396 /* Free resources used by a user-defined bitmap. */
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
1397
58089
fb4cd138f0b8 (destroy_fringe_bitmap): Fix return type.
Kim F. Storm <storm@cua.dk>
parents: 58057
diff changeset
1398 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108946
diff changeset
1399 destroy_fringe_bitmap (int n)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1400 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1401 struct fringe_bitmap **fbp;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1402
59401
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
1403 fringe_faces[n] = Qnil;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1404
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1405 fbp = &fringe_bitmaps[n];
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1406 if (*fbp && (*fbp)->dynamic)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1407 {
83037
03a73693678e Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents: 53970
diff changeset
1408 /* XXX Is SELECTED_FRAME OK here? */
83212
f70dc61a797f Merged in changes from CVS trunk.
Karoly Lorentey <lorentey@elte.hu>
parents: 83211 57277
diff changeset
1409 struct redisplay_interface *rif = FRAME_RIF (SELECTED_FRAME ());
57267
617e54beffb6 * fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents: 57258
diff changeset
1410 if (rif && rif->destroy_fringe_bitmap)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1411 rif->destroy_fringe_bitmap (n);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1412 xfree (*fbp);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1413 *fbp = NULL;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1414 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1415
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1416 while (max_used_fringe_bitmap > MAX_STANDARD_FRINGE_BITMAPS
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1417 && fringe_bitmaps[max_used_fringe_bitmap - 1] == NULL)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1418 max_used_fringe_bitmap--;
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1419 }
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1420
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1421
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1422 DEFUN ("destroy-fringe-bitmap", Fdestroy_fringe_bitmap, Sdestroy_fringe_bitmap,
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1423 1, 1, 0,
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1424 doc: /* Destroy fringe bitmap BITMAP.
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1425 If BITMAP overrides a standard fringe bitmap, the original bitmap is restored. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1426 (Lisp_Object bitmap)
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1427 {
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1428 int n;
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1429
57270
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
1430 CHECK_SYMBOL (bitmap);
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
1431 n = lookup_fringe_bitmap (bitmap);
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
1432 if (!n)
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1433 return Qnil;
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1434
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1435 destroy_fringe_bitmap (n);
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1436
57270
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
1437 if (n >= MAX_STANDARD_FRINGE_BITMAPS)
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1438 {
57270
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
1439 Vfringe_bitmaps = Fdelq (bitmap, Vfringe_bitmaps);
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1440 /* It would be better to remove the fringe property. */
57270
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
1441 Fput (bitmap, Qfringe, Qnil);
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1442 }
57270
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
1443
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1444 return Qnil;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1445 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1446
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1447
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1448 /* Initialize bitmap bit.
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1449
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1450 On X, we bit-swap the built-in bitmaps and reduce bitmap
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1451 from short to char array if width is <= 8 bits.
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1452
53955
7d8c228c1f02 (init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents: 53940
diff changeset
1453 On MAC with big-endian CPU, we need to byte-swap each short.
7d8c228c1f02 (init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents: 53940
diff changeset
1454
7d8c228c1f02 (init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents: 53940
diff changeset
1455 On W32 and MAC (little endian), there's no need to do this.
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1456 */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1457
78786
7080fcd26c3e (init_fringe_bitmap) <swap nibble>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78260
diff changeset
1458 #if defined (HAVE_X_WINDOWS)
105959
ba3ffbd9c422 * process.c (ifflag_def): Make flag_sym constant.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105877
diff changeset
1459 static const unsigned char swap_nibble[16] = {
84559
acac15277b75 (init_fringe_bitmap) <swap nibble>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 84541
diff changeset
1460 0x0, 0x8, 0x4, 0xc, /* 0000 1000 0100 1100 */
acac15277b75 (init_fringe_bitmap) <swap nibble>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 84541
diff changeset
1461 0x2, 0xa, 0x6, 0xe, /* 0010 1010 0110 1110 */
acac15277b75 (init_fringe_bitmap) <swap nibble>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 84541
diff changeset
1462 0x1, 0x9, 0x5, 0xd, /* 0001 1001 0101 1101 */
acac15277b75 (init_fringe_bitmap) <swap nibble>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 84541
diff changeset
1463 0x3, 0xb, 0x7, 0xf}; /* 0011 1011 0111 1111 */
78786
7080fcd26c3e (init_fringe_bitmap) <swap nibble>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78260
diff changeset
1464 #endif /* HAVE_X_WINDOWS */
7080fcd26c3e (init_fringe_bitmap) <swap nibble>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents: 78260
diff changeset
1465
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1466 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108946
diff changeset
1467 init_fringe_bitmap (int which, struct fringe_bitmap *fb, int once_p)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1468 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1469 if (once_p || fb->dynamic)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1470 {
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1471 #if defined (HAVE_X_WINDOWS)
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1472 unsigned short *bits = fb->bits;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1473 int j;
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1474
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1475 if (fb->width <= 8)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1476 {
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1477 unsigned char *cbits = (unsigned char *)fb->bits;
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1478 for (j = 0; j < fb->height; j++)
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1479 {
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1480 unsigned short b = *bits++;
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1481 unsigned char c;
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1482 c = (unsigned char)((swap_nibble[b & 0xf] << 4)
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1483 | (swap_nibble[(b>>4) & 0xf]));
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1484 *cbits++ = (c >> (8 - fb->width));
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1485 }
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1486 }
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1487 else
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1488 {
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1489 for (j = 0; j < fb->height; j++)
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1490 {
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1491 unsigned short b = *bits;
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1492 b = (unsigned short)((swap_nibble[b & 0xf] << 12)
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1493 | (swap_nibble[(b>>4) & 0xf] << 8)
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1494 | (swap_nibble[(b>>8) & 0xf] << 4)
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1495 | (swap_nibble[(b>>12) & 0xf]));
103062
06cf3e417172 (init_fringe_bitmap) [HAVE_X_WINDOWS && WORDS_BIG_ENDIAN]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 100951
diff changeset
1496 b >>= (16 - fb->width);
109732
470bed744331 Use autoconf determined WORDS_BIGENDIAN instead of hardcoded definition.
Andreas Schwab <schwab@linux-m68k.org>
parents: 109637
diff changeset
1497 #ifdef WORDS_BIGENDIAN
103062
06cf3e417172 (init_fringe_bitmap) [HAVE_X_WINDOWS && WORDS_BIG_ENDIAN]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 100951
diff changeset
1498 b = ((b >> 8) | (b << 8));
06cf3e417172 (init_fringe_bitmap) [HAVE_X_WINDOWS && WORDS_BIG_ENDIAN]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 100951
diff changeset
1499 #endif
06cf3e417172 (init_fringe_bitmap) [HAVE_X_WINDOWS && WORDS_BIG_ENDIAN]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 100951
diff changeset
1500 *bits++ = b;
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1501 }
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1502 }
53955
7d8c228c1f02 (init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents: 53940
diff changeset
1503 #endif /* HAVE_X_WINDOWS */
7d8c228c1f02 (init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents: 53940
diff changeset
1504
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1505 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1506
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1507 if (!once_p)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1508 {
83214
2bd6d4c2d21c Removed C99ism in init_fringe_bitmap.
Karoly Lorentey <lorentey@elte.hu>
parents: 83213
diff changeset
1509 /* XXX Is SELECTED_FRAME OK here? */
2bd6d4c2d21c Removed C99ism in init_fringe_bitmap.
Karoly Lorentey <lorentey@elte.hu>
parents: 83213
diff changeset
1510 struct redisplay_interface *rif = FRAME_RIF (SELECTED_FRAME ());
2bd6d4c2d21c Removed C99ism in init_fringe_bitmap.
Karoly Lorentey <lorentey@elte.hu>
parents: 83213
diff changeset
1511
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1512 destroy_fringe_bitmap (which);
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1513
57267
617e54beffb6 * fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents: 57258
diff changeset
1514 if (rif && rif->define_fringe_bitmap)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1515 rif->define_fringe_bitmap (which, fb->bits, fb->height, fb->width);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1516
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1517 fringe_bitmaps[which] = fb;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1518 if (which >= max_used_fringe_bitmap)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1519 max_used_fringe_bitmap = which + 1;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1520 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1521 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1522
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1523
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1524 DEFUN ("define-fringe-bitmap", Fdefine_fringe_bitmap, Sdefine_fringe_bitmap,
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1525 2, 5, 0,
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1526 doc: /* Define fringe bitmap BITMAP from BITS of size HEIGHT x WIDTH.
71659
0a57a8cfd0fa (Fdefine_fringe_bitmap): Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 69616
diff changeset
1527 BITMAP is a symbol identifying the new fringe bitmap.
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1528 BITS is either a string or a vector of integers.
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1529 HEIGHT is height of bitmap. If HEIGHT is nil, use length of BITS.
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1530 WIDTH must be an integer between 1 and 16, or nil which defaults to 8.
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1531 Optional fifth arg ALIGN may be one of `top', `center', or `bottom',
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1532 indicating the positioning of the bitmap relative to the rows where it
94420
090cf85895a7 (Fdefine_fringe_bitmap): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 91327
diff changeset
1533 is used; the default is to center the bitmap. Fifth arg may also be a
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1534 list (ALIGN PERIODIC) where PERIODIC non-nil specifies that the bitmap
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1535 should be repeated.
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1536 If BITMAP already exists, the existing definition is replaced. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1537 (Lisp_Object bitmap, Lisp_Object bits, Lisp_Object height, Lisp_Object width, Lisp_Object align)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1538 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1539 int n, h, i, j;
53936
4dd0e0a7fd9e (struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents: 53900
diff changeset
1540 unsigned short *b;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1541 struct fringe_bitmap fb, *xfb;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1542 int fill1 = 0, fill2 = 0;
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1543
57270
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
1544 CHECK_SYMBOL (bitmap);
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1545
58268
fc159de41e11 (Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents: 58089
diff changeset
1546 if (STRINGP (bits))
fc159de41e11 (Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents: 58089
diff changeset
1547 h = SCHARS (bits);
fc159de41e11 (Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents: 58089
diff changeset
1548 else if (VECTORP (bits))
fc159de41e11 (Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents: 58089
diff changeset
1549 h = XVECTOR (bits)->size;
fc159de41e11 (Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents: 58089
diff changeset
1550 else
71834
bf40c8c83e7a (Fdefine_fringe_bitmap): Cleanup wrong_type_argument use.
Kim F. Storm <storm@cua.dk>
parents: 71659
diff changeset
1551 wrong_type_argument (Qsequencep, bits);
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1552
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1553 if (NILP (height))
58268
fc159de41e11 (Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents: 58089
diff changeset
1554 fb.height = h;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1555 else
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1556 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1557 CHECK_NUMBER (height);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1558 fb.height = min (XINT (height), 255);
58268
fc159de41e11 (Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents: 58089
diff changeset
1559 if (fb.height > h)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1560 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1561 fill1 = (fb.height - h) / 2;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1562 fill2 = fb.height - h - fill1;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1563 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1564 }
54220
50ba59282051 (Fdefine_fringe_bitmap): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 54079
diff changeset
1565
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1566 if (NILP (width))
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1567 fb.width = 8;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1568 else
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1569 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1570 CHECK_NUMBER (width);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1571 fb.width = min (XINT (width), 255);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1572 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1573
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1574 fb.period = 0;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1575 fb.align = ALIGN_BITMAP_CENTER;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1576
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1577 if (CONSP (align))
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1578 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1579 Lisp_Object period = XCDR (align);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1580 if (CONSP (period))
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1581 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1582 period = XCAR (period);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1583 if (!NILP (period))
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1584 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1585 fb.period = fb.height;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1586 fb.height = 255;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1587 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1588 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1589 align = XCAR (align);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1590 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1591 if (EQ (align, Qtop))
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1592 fb.align = ALIGN_BITMAP_TOP;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1593 else if (EQ (align, Qbottom))
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1594 fb.align = ALIGN_BITMAP_BOTTOM;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1595 else if (!NILP (align) && !EQ (align, Qcenter))
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1596 error ("Bad align argument");
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1597
57277
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1598 n = lookup_fringe_bitmap (bitmap);
57270
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
1599 if (!n)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1600 {
57277
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1601 if (max_used_fringe_bitmap < max_fringe_bitmaps)
53966
26dc8943ee64 Lisp_Object/int mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53955
diff changeset
1602 n = max_used_fringe_bitmap++;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1603 else
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1604 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1605 for (n = MAX_STANDARD_FRINGE_BITMAPS;
57277
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1606 n < max_fringe_bitmaps;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1607 n++)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1608 if (fringe_bitmaps[n] == NULL)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1609 break;
57277
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1610
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1611 if (n == max_fringe_bitmaps)
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1612 {
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1613 if ((max_fringe_bitmaps + 20) > MAX_FRINGE_BITMAPS)
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1614 error ("No free fringe bitmap slots");
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1615
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1616 i = max_fringe_bitmaps;
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1617 max_fringe_bitmaps += 20;
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1618 fringe_bitmaps
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1619 = ((struct fringe_bitmap **)
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1620 xrealloc (fringe_bitmaps, max_fringe_bitmaps * sizeof (struct fringe_bitmap *)));
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1621 fringe_faces
59581
26fb5a3f95ac * fringe.c (Fdefine_fringe_bitmap, init_fringe): When assigning
Jan Djärv <jan.h.d@swipnet.se>
parents: 59401
diff changeset
1622 = (Lisp_Object *) xrealloc (fringe_faces, max_fringe_bitmaps * sizeof (Lisp_Object));
57277
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1623
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1624 for (; i < max_fringe_bitmaps; i++)
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1625 {
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1626 fringe_bitmaps[i] = NULL;
59401
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
1627 fringe_faces[i] = Qnil;
57277
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1628 }
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1629 }
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1630 }
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1631
57270
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
1632 Vfringe_bitmaps = Fcons (bitmap, Vfringe_bitmaps);
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
1633 Fput (bitmap, Qfringe, make_number (n));
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1634 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1635
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1636 fb.dynamic = 1;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1637
54079
e1b6171f91b8 (Fdefine_fringe_bitmap): Use && instead of & to avoid
Andreas Schwab <schwab@suse.de>
parents: 53970
diff changeset
1638 xfb = (struct fringe_bitmap *) xmalloc (sizeof fb
e1b6171f91b8 (Fdefine_fringe_bitmap): Use && instead of & to avoid
Andreas Schwab <schwab@suse.de>
parents: 53970
diff changeset
1639 + fb.height * BYTES_PER_BITMAP_ROW);
e1b6171f91b8 (Fdefine_fringe_bitmap): Use && instead of & to avoid
Andreas Schwab <schwab@suse.de>
parents: 53970
diff changeset
1640 fb.bits = b = (unsigned short *) (xfb + 1);
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109153
diff changeset
1641 memset (b, 0, fb.height);
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1642
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1643 j = 0;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1644 while (j < fb.height)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1645 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1646 for (i = 0; i < fill1 && j < fb.height; i++)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1647 b[j++] = 0;
54079
e1b6171f91b8 (Fdefine_fringe_bitmap): Use && instead of & to avoid
Andreas Schwab <schwab@suse.de>
parents: 53970
diff changeset
1648 for (i = 0; i < h && j < fb.height; i++)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1649 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1650 Lisp_Object elt = Faref (bits, make_number (i));
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1651 b[j++] = NUMBERP (elt) ? XINT (elt) : 0;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1652 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1653 for (i = 0; i < fill2 && j < fb.height; i++)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1654 b[j++] = 0;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1655 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1656
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1657 *xfb = fb;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1658
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1659 init_fringe_bitmap (n, xfb, 0);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1660
57270
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
1661 return bitmap;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1662 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1663
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1664 DEFUN ("set-fringe-bitmap-face", Fset_fringe_bitmap_face, Sset_fringe_bitmap_face,
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1665 1, 2, 0,
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1666 doc: /* Set face for fringe bitmap BITMAP to FACE.
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1667 If FACE is nil, reset face to default fringe face. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1668 (Lisp_Object bitmap, Lisp_Object face)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1669 {
57270
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
1670 int n;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1671 int face_id;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1672
57270
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
1673 CHECK_SYMBOL (bitmap);
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
1674 n = lookup_fringe_bitmap (bitmap);
bb98cba59362 Simplify last change.
Kim F. Storm <storm@cua.dk>
parents: 57267
diff changeset
1675 if (!n)
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1676 error ("Undefined fringe bitmap");
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1677
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1678 if (!NILP (face))
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1679 {
60834
94900ab8eef0 (draw_fringe_bitmap_1, Fset_fringe_bitmap_face):
Kim F. Storm <storm@cua.dk>
parents: 59581
diff changeset
1680 face_id = lookup_derived_face (SELECTED_FRAME (), face,
90128
13796b0653c7 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-29
Miles Bader <miles@gnu.org>
parents: 90082 60834
diff changeset
1681 FRINGE_FACE_ID, 1);
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1682 if (face_id < 0)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1683 error ("No such face");
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1684 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1685
59401
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
1686 fringe_faces[n] = face;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1687
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1688 return Qnil;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1689 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1690
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1691 DEFUN ("fringe-bitmaps-at-pos", Ffringe_bitmaps_at_pos, Sfringe_bitmaps_at_pos,
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1692 0, 2, 0,
54220
50ba59282051 (Fdefine_fringe_bitmap): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 54079
diff changeset
1693 doc: /* Return fringe bitmaps of row containing position POS in window WINDOW.
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1694 If WINDOW is nil, use selected window. If POS is nil, use value of point
57316
3eb68ef1dcb7 (Ffringe_bitmaps_at_pos): Change return value from cons
Kim F. Storm <storm@cua.dk>
parents: 57277
diff changeset
1695 in that window. Return value is a list (LEFT RIGHT OV), where LEFT
3eb68ef1dcb7 (Ffringe_bitmaps_at_pos): Change return value from cons
Kim F. Storm <storm@cua.dk>
parents: 57277
diff changeset
1696 is the symbol for the bitmap in the left fringe (or nil if no bitmap),
3eb68ef1dcb7 (Ffringe_bitmaps_at_pos): Change return value from cons
Kim F. Storm <storm@cua.dk>
parents: 57277
diff changeset
1697 RIGHT is similar for the right fringe, and OV is non-nil if there is an
3eb68ef1dcb7 (Ffringe_bitmaps_at_pos): Change return value from cons
Kim F. Storm <storm@cua.dk>
parents: 57277
diff changeset
1698 overlay arrow in the left fringe.
57246
36ab9b017a42 (update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents: 54230
diff changeset
1699 Return nil if POS is not visible in WINDOW. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1700 (Lisp_Object pos, Lisp_Object window)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1701 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1702 struct window *w;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1703 struct glyph_row *row;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1704 int textpos;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1705
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1706 if (NILP (window))
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1707 window = selected_window;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1708 CHECK_WINDOW (window);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1709 w = XWINDOW (window);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1710
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1711 if (!NILP (pos))
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1712 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1713 CHECK_NUMBER_COERCE_MARKER (pos);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1714 textpos = XINT (pos);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1715 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1716 else if (w == XWINDOW (selected_window))
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1717 textpos = PT;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1718 else
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1719 textpos = XMARKER (w->pointm)->charpos;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1720
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1721 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1722 row = row_containing_pos (w, textpos, row, NULL, 0);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1723 if (row)
57316
3eb68ef1dcb7 (Ffringe_bitmaps_at_pos): Change return value from cons
Kim F. Storm <storm@cua.dk>
parents: 57277
diff changeset
1724 return list3 (get_fringe_bitmap_name (row->left_fringe_bitmap),
3eb68ef1dcb7 (Ffringe_bitmaps_at_pos): Change return value from cons
Kim F. Storm <storm@cua.dk>
parents: 57277
diff changeset
1725 get_fringe_bitmap_name (row->right_fringe_bitmap),
61634
e188b7249c28 (draw_fringe_bitmap): Use overlay_arrow_bitmap from row
Kim F. Storm <storm@cua.dk>
parents: 60834
diff changeset
1726 (row->overlay_arrow_bitmap == 0 ? Qnil
e188b7249c28 (draw_fringe_bitmap): Use overlay_arrow_bitmap from row
Kim F. Storm <storm@cua.dk>
parents: 60834
diff changeset
1727 : row->overlay_arrow_bitmap < 0 ? Qt
e188b7249c28 (draw_fringe_bitmap): Use overlay_arrow_bitmap from row
Kim F. Storm <storm@cua.dk>
parents: 60834
diff changeset
1728 : get_fringe_bitmap_name (row->overlay_arrow_bitmap)));
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1729 else
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1730 return Qnil;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1731 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1732
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1733
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1734 /***********************************************************************
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1735 Initialization
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1736 ***********************************************************************/
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1737
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1738 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108946
diff changeset
1739 syms_of_fringe (void)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1740 {
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
1741 Qtruncation = intern_c_string ("truncation");
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1742 staticpro (&Qtruncation);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
1743 Qcontinuation = intern_c_string ("continuation");
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1744 staticpro (&Qcontinuation);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
1745 Qoverlay_arrow = intern_c_string ("overlay-arrow");
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1746 staticpro (&Qoverlay_arrow);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
1747 Qempty_line = intern_c_string ("empty-line");
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1748 staticpro (&Qempty_line);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
1749 Qtop_bottom = intern_c_string ("top-bottom");
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1750 staticpro (&Qtop_bottom);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
1751 Qhollow_small = intern_c_string ("hollow-small");
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1752 staticpro (&Qhollow_small);
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1753
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1754 defsubr (&Sdestroy_fringe_bitmap);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1755 defsubr (&Sdefine_fringe_bitmap);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1756 defsubr (&Sfringe_bitmaps_at_pos);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1757 defsubr (&Sset_fringe_bitmap_face);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1758
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1759 DEFVAR_LISP ("overflow-newline-into-fringe", &Voverflow_newline_into_fringe,
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1760 doc: /* *Non-nil means that newline may flow into the right fringe.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1761 This means that display lines which are exactly as wide as the window
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1762 (not counting the final newline) will only occupy one screen line, by
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1763 showing (or hiding) the final newline in the right fringe; when point
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1764 is at the final newline, the cursor is shown in the right fringe.
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1765 If nil, also continue lines which are exactly as wide as the window. */);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1766 Voverflow_newline_into_fringe = Qt;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1767
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1768 DEFVAR_LISP ("fringe-bitmaps", &Vfringe_bitmaps,
69071
ee6d3763fda6 (syms_of_fringe) <fringe-bitmaps>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 69063
diff changeset
1769 doc: /* List of fringe bitmap symbols. */);
57258
36eef73e00fa (Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents: 57246
diff changeset
1770 Vfringe_bitmaps = Qnil;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1771 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1772
59401
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
1773 /* Garbage collection hook */
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
1774
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
1775 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108946
diff changeset
1776 mark_fringe_data (void)
59401
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
1777 {
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
1778 int i;
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
1779
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
1780 for (i = 0; i < max_fringe_bitmaps; i++)
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
1781 if (!NILP (fringe_faces[i]))
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
1782 mark_object (fringe_faces[i]);
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
1783 }
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
1784
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1785 /* Initialize this module when Emacs starts. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1786
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1787 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108946
diff changeset
1788 init_fringe_once (void)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1789 {
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1790 int bt;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1791
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1792 for (bt = NO_FRINGE_BITMAP + 1; bt < MAX_STANDARD_FRINGE_BITMAPS; bt++)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1793 init_fringe_bitmap(bt, &standard_bitmaps[bt], 1);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1794 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1795
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1796 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108946
diff changeset
1797 init_fringe (void)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1798 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1799 int i;
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1800
57277
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1801 max_fringe_bitmaps = MAX_STANDARD_FRINGE_BITMAPS + 20;
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1802
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1803 fringe_bitmaps
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1804 = (struct fringe_bitmap **) xmalloc (max_fringe_bitmaps * sizeof (struct fringe_bitmap *));
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1805 fringe_faces
59581
26fb5a3f95ac * fringe.c (Fdefine_fringe_bitmap, init_fringe): When assigning
Jan Djärv <jan.h.d@swipnet.se>
parents: 59401
diff changeset
1806 = (Lisp_Object *) xmalloc (max_fringe_bitmaps * sizeof (Lisp_Object));
57277
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1807
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1808 for (i = 0; i < max_fringe_bitmaps; i++)
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1809 {
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1810 fringe_bitmaps[i] = NULL;
59401
8f5e8e079790 (fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents: 58532
diff changeset
1811 fringe_faces[i] = Qnil;
57277
85230b6628b3 Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents: 57270
diff changeset
1812 }
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1813 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1814
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96675
diff changeset
1815 #ifdef HAVE_NTGUI
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1816
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1817 void
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96675
diff changeset
1818 w32_init_fringe (struct redisplay_interface *rif)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1819 {
69049
28b3892bfcda (enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
1820 int bt;
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1821
57267
617e54beffb6 * fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents: 57258
diff changeset
1822 if (!rif)
617e54beffb6 * fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents: 57258
diff changeset
1823 return;
617e54beffb6 * fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents: 57258
diff changeset
1824
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1825 for (bt = NO_FRINGE_BITMAP + 1; bt < MAX_STANDARD_FRINGE_BITMAPS; bt++)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1826 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1827 struct fringe_bitmap *fb = &standard_bitmaps[bt];
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1828 rif->define_fringe_bitmap (bt, fb->bits, fb->height, fb->width);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1829 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1830 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1831
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1832 void
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109439
diff changeset
1833 w32_reset_fringes (void)
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1834 {
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1835 /* Destroy row bitmaps. */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1836 int bt;
83581
29192b6da477 (w32_init_fringe w32_reset_fringes) [HAVE_NTGUI]:
Jason Rumney <jasonr@gnu.org>
parents: 83554
diff changeset
1837 struct redisplay_interface *rif = FRAME_RIF (SELECTED_FRAME ());
54220
50ba59282051 (Fdefine_fringe_bitmap): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 54079
diff changeset
1838
57267
617e54beffb6 * fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents: 57258
diff changeset
1839 if (!rif)
617e54beffb6 * fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents: 57258
diff changeset
1840 return;
617e54beffb6 * fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents: 57258
diff changeset
1841
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1842 for (bt = NO_FRINGE_BITMAP + 1; bt < max_used_fringe_bitmap; bt++)
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1843 rif->destroy_fringe_bitmap (bt);
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1844 }
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1845
53955
7d8c228c1f02 (init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents: 53940
diff changeset
1846 #endif /* HAVE_NTGUI */
53879
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1847
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1848 #endif /* HAVE_WINDOW_SYSTEM */
e3771c262410 New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1849