Mercurial > emacs
annotate src/fringe.c @ 112375:b7555c0e51fe
Merge from mainline.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Wed, 19 Jan 2011 15:02:04 -0800 |
parents | 42e22c4f06b7 |
children |
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 |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
35 /* 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
|
36 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
37 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
|
38 '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
|
39 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
40 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
|
41 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
|
42 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
|
43 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
44 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
|
45 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
|
46 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
|
47 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
|
48 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
49 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
|
50 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
|
51 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
52 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
|
53 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
|
54 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
|
55 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
|
56 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
|
57 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
58 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
|
59 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
|
60 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
|
61 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
62 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
|
63 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
|
64 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
65 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
|
66 must specify physical bitmap symbols. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
67 */ |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
68 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
69 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
|
70 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
|
71 Lisp_Object Qhollow_small; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
72 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
73 enum fringe_bitmap_align |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
74 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
75 ALIGN_BITMAP_CENTER = 0, |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
76 ALIGN_BITMAP_TOP, |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
77 ALIGN_BITMAP_BOTTOM |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
78 }; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
79 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
80 struct fringe_bitmap |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
81 { |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
82 unsigned short *bits; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
83 unsigned height : 8; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
84 unsigned width : 8; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
85 unsigned period : 8; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
86 unsigned align : 2; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
87 unsigned dynamic : 1; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
88 }; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
89 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
90 |
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 Fringe bitmaps |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
93 ***********************************************************************/ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
94 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
95 /* Undefined bitmap. A question mark. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
96 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
97 ..xxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
98 .xxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
99 xx....xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
100 xx....xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
101 ....xx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
102 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
103 ...xx... |
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 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
106 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
107 */ |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
108 static unsigned short question_mark_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
109 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
|
110 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
111 /* An arrow like this: `<-'. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
112 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
113 ...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 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
117 xxxxxx.. |
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 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
121 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
122 static unsigned short left_arrow_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
123 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
|
124 |
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 /* Right truncation arrow bitmap `->'. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
127 /* |
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 ....xx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
130 .....xx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
131 ..xxxxxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
132 ..xxxxxx |
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 ....xx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
135 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
136 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
137 static unsigned short right_arrow_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
138 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
|
139 |
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 /* Up arrow bitmap. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
142 /* |
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 ..xxxx.. |
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 xxxxxxxx |
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 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
150 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
151 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
152 static unsigned short up_arrow_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
153 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
|
154 |
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 /* Down arrow bitmap. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
157 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
158 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
159 ...xx... |
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 xxxxxxxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
163 .xxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
164 ..xxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
165 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
166 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
167 static unsigned short down_arrow_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
168 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
|
169 |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
170 /* Marker for continuation lines. */ |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
171 /* |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
172 ..xxxx.. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
173 .xxxxx.. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
174 xx...... |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
175 xxx..x.. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
176 xxxxxx.. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
177 .xxxxx.. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
178 ..xxxx.. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
179 .xxxxx.. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
180 */ |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
181 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
|
182 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
|
183 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
184 /* Marker for continued lines. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
185 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
186 ..xxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
187 ..xxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
188 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
189 ..x..xxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
190 ..xxxxxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
191 ..xxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
192 ..xxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
193 ..xxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
194 */ |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
195 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
|
196 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
|
197 |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
198 /* 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
|
199 /* |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
200 ......xx |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
201 ....xxxx |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
202 ...xxxxx |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
203 ..xxxxxx |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
204 ..xxxxxx |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
205 ...xxxxx |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
206 ....xxxx |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
207 ......xx |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
208 */ |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
209 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
|
210 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
|
211 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
212 /* Overlay arrow bitmap. A triangular arrow. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
213 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
214 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
215 xxxx.... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
216 xxxxx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
217 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
218 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
219 xxxxx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
220 xxxx.... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
221 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
222 */ |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
223 static unsigned short right_triangle_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
224 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
|
225 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
226 /* First line bitmap. An top-left angle. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
227 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
228 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
229 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
230 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
231 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
232 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
233 xx...... |
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 ........ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
236 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
237 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
|
238 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
|
239 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
240 /* First line bitmap. An right-up angle. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
241 /* |
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 ..xxxxxx |
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 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
249 ........ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
250 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
251 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
|
252 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
|
253 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
254 /* Last line bitmap. An left-down angle. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
255 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
256 ........ |
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 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
263 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
264 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
265 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
|
266 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
|
267 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
268 /* Last line bitmap. An right-down angle. */ |
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 ........ |
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 ......xx |
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 ..xxxxxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
278 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
279 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
|
280 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
|
281 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
282 /* First/last line bitmap. An left bracket. */ |
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 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
285 xxxxxx.. |
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 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
290 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
291 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
292 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
293 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
294 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
295 static unsigned short left_bracket_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
296 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
|
297 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
298 /* First/last line bitmap. An right bracket. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
299 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
300 ..xxxxxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
301 ..xxxxxx |
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 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
306 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
307 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
308 ..xxxxxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
309 ..xxxxxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
310 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
311 static unsigned short right_bracket_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
312 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
|
313 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
314 /* 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
|
315 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
316 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
317 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
318 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
319 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
320 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
321 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
322 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
323 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
324 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
325 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
326 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
327 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
328 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
329 */ |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
330 static unsigned short filled_rectangle_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
331 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
|
332 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
333 /* 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
|
334 /* |
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 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
337 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
338 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
339 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
340 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
341 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
342 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
343 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
344 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
345 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
346 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
347 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
348 */ |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
349 static unsigned short hollow_rectangle_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
350 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
|
351 |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
352 /* Hollow square bitmap. */ |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
353 /* |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
354 .xxxxxx. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
355 .x....x. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
356 .x....x. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
357 .x....x. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
358 .x....x. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
359 .xxxxxx. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
360 */ |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
361 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
|
362 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
|
363 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
364 /* Filled square bitmap. */ |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
365 /* |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
366 .xxxxxx. |
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 .xxxxxx. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
369 .xxxxxx. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
370 .xxxxxx. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
371 .xxxxxx. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
372 */ |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
373 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
|
374 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
|
375 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
376 /* 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
|
377 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
378 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
379 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
380 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
381 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
382 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
383 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
384 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
385 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
386 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
387 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
388 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
389 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
390 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
391 */ |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
392 static unsigned short vertical_bar_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
393 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
|
394 |
69063
fb4f4719e18b
(horizontal_bar_bits): Rename from `horisontal_bar_bits'.
Juanma Barranquero <lekktu@gmail.com>
parents:
69049
diff
changeset
|
395 /* 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
|
396 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
397 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
398 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
399 */ |
69063
fb4f4719e18b
(horizontal_bar_bits): Rename from `horisontal_bar_bits'.
Juanma Barranquero <lekktu@gmail.com>
parents:
69049
diff
changeset
|
400 static unsigned short horizontal_bar_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
401 0xfe, 0xfe}; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
402 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
403 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
404 /* 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
|
405 `indicate-empty-lines' is non-nil. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
406 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
407 ........ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
408 ..xxxx.. |
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 ........ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
411 ..xxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
412 ........ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
413 */ |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
414 static unsigned short empty_line_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
415 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
|
416 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
|
417 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
|
418 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
|
419 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
|
420 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
|
421 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
|
422 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
|
423 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
424 |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
425 #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
|
426 #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
|
427 #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
|
428 |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
429 /* 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
|
430 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
|
431 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
432 struct fringe_bitmap standard_bitmaps[] = |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
433 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
434 { 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
|
435 { 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
|
436 { 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
|
437 { 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
|
438 { 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
|
439 { 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
|
440 { 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
|
441 { 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
|
442 { 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
|
443 { 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
|
444 { 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
|
445 { 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
|
446 { 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
|
447 { 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
|
448 { 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
|
449 { 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
|
450 { 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
|
451 { 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
|
452 { 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
|
453 { 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
|
454 { 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
|
455 { 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
|
456 { 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
|
457 }; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
458 |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
459 #define NO_FRINGE_BITMAP 0 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
460 #define UNDEF_FRINGE_BITMAP 1 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
461 #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
|
462 |
57277
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
463 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
|
464 static Lisp_Object *fringe_faces; |
57277
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
465 static int max_fringe_bitmaps; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
466 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
94963
diff
changeset
|
467 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
|
468 |
57270 | 469 |
470 /* Lookup bitmap number for symbol BITMAP. | |
471 Return 0 if not a bitmap. */ | |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
472 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
473 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
474 lookup_fringe_bitmap (Lisp_Object bitmap) |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
475 { |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
476 int bn; |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
477 |
57270 | 478 bitmap = Fget (bitmap, Qfringe); |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
479 if (!INTEGERP (bitmap)) |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
480 return 0; |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
481 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
482 bn = XINT (bitmap); |
57270 | 483 if (bn > NO_FRINGE_BITMAP |
484 && bn < max_used_fringe_bitmap | |
485 && (bn < MAX_STANDARD_FRINGE_BITMAPS | |
486 || fringe_bitmaps[bn] != NULL)) | |
487 return bn; | |
488 | |
489 return 0; | |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
490 } |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
491 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
492 /* Get fringe bitmap name for bitmap number BN. |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
493 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
494 Found by traversing Vfringe_bitmaps comparing BN to the |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
495 fringe property for each symbol. |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
496 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
497 Return BN if not found in Vfringe_bitmaps. */ |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
498 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
499 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
500 get_fringe_bitmap_name (int bn) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
501 { |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
502 Lisp_Object bitmaps; |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
503 Lisp_Object num; |
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 /* Zero means no bitmap -- return nil. */ |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
506 if (bn <= 0) |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
507 return Qnil; |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
508 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
509 bitmaps = Vfringe_bitmaps; |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
510 num = make_number (bn); |
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 while (CONSP (bitmaps)) |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
513 { |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
514 Lisp_Object bitmap = XCAR (bitmaps); |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
515 if (EQ (num, Fget (bitmap, Qfringe))) |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
516 return bitmap; |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
517 bitmaps = XCDR (bitmaps); |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
518 } |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
519 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
520 return num; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
521 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
522 |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
523 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
524 /* 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
|
525 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
|
526 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
|
527 drawn. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
528 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
|
529 */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
530 |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
531 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
532 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
|
533 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
534 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
535 struct draw_fringe_bitmap_params p; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
536 struct fringe_bitmap *fb; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
537 int period; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
538 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
|
539 int offset, header_line_height; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
540 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
541 p.overlay_p = (overlay & 1) == 1; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
542 p.cursor_p = (overlay & 2) == 2; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
543 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
544 if (which != NO_FRINGE_BITMAP) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
545 { |
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
|
546 offset = 0; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
547 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
548 else if (left_p) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
549 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
550 which = row->left_fringe_bitmap; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
551 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
|
552 offset = row->left_fringe_offset; |
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 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
555 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
556 which = row->right_fringe_bitmap; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
557 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
|
558 offset = row->right_fringe_offset; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
559 } |
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 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
|
562 { |
109153
978941230a7c
* fringe.c (draw_fringe_bitmap_1): Use lookup_named_face to get
Chong Yidong <cyd@stupidchicken.com>
parents:
109126
diff
changeset
|
563 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
|
564 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
|
565 : 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
|
566 if (face_id < 0) |
59401
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
567 face_id = FRINGE_FACE_ID; |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
568 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
569 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
570 fb = fringe_bitmaps[which]; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
571 if (fb == NULL) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
572 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
|
573 ? which : UNDEF_FRINGE_BITMAP]; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
574 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
575 period = fb->period; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
576 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
577 /* 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
|
578 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
|
579 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
580 p.which = which; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
581 p.bits = fb->bits; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
582 p.wd = fb->width; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
583 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
584 p.h = fb->height; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
585 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
|
586 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
|
587 |
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
|
588 /* 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
|
589 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
|
590 { |
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 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
|
592 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
|
593 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
|
594 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
|
595 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
|
596 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
|
597 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
|
598 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
|
599 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
600 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
601 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
|
602 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
603 if (p.face == NULL) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
604 { |
59401
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
605 /* 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
|
606 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
|
607 return; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
608 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
609 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
610 PREPARE_FACE_FOR_DISPLAY (f, p.face); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
611 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
612 /* 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
|
613 the fringe. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
614 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
|
615 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
|
616 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
|
617 p.ny = row->visible_height; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
618 if (left_p) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
619 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
620 int wd = WINDOW_LEFT_FRINGE_WIDTH (w); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
621 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
|
622 ? LEFT_MARGIN_AREA |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
623 : TEXT_AREA)); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
624 if (p.wd > wd) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
625 p.wd = wd; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
626 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
|
627 |
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 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
|
629 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
630 /* 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
|
631 wd -= ((!WINDOW_LEFTMOST_P (w) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
632 && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
633 ? 1 : 0); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
634 p.bx = x - wd; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
635 p.nx = wd; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
636 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
637 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
638 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
639 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
640 int x = window_box_right (w, |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
641 (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
642 ? RIGHT_MARGIN_AREA |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
643 : TEXT_AREA)); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
644 int wd = WINDOW_RIGHT_FRINGE_WIDTH (w); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
645 if (p.wd > wd) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
646 p.wd = wd; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
647 p.x = x + (wd - p.wd) / 2; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
648 /* 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
|
649 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
|
650 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
|
651 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
652 p.bx = x; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
653 p.nx = wd; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
654 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
655 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
656 |
83037
03a73693678e
Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents:
53970
diff
changeset
|
657 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
|
658 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
659 |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
660 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
661 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
|
662 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
663 Lisp_Object cmap, bm = Qnil; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
664 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
665 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
|
666 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
667 bm = Fassq (cursor, cmap); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
668 if (CONSP (bm)) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
669 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
670 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
|
671 return NO_FRINGE_BITMAP; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
672 return lookup_fringe_bitmap (bm); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
673 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
674 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
675 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
|
676 return NO_FRINGE_BITMAP; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
677 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
|
678 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
|
679 return NO_FRINGE_BITMAP; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
680 return lookup_fringe_bitmap (bm); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
681 } |
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 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
684 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
|
685 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
686 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
|
687 int ln1 = 0, ln2 = 0; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
688 int ix1 = right_p; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
689 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
|
690 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
691 /* 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
|
692 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
693 Elements are: |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
694 BITMAP -- use for all |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
695 (L R) -- use for left right (whether partial or not) |
108933 | 696 (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
|
697 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
|
698 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
699 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
|
700 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
|
701 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
702 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
|
703 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
704 bm1 = Fassq (bitmap, cmap); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
705 if (CONSP (bm1)) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
706 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
707 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
|
708 return NO_FRINGE_BITMAP; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
709 if (CONSP (bm1)) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
710 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
711 ln1 = XINT (Flength (bm1)); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
712 if (partial_p) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
713 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
714 if (ln1 > ix2) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
715 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
716 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
|
717 if (!EQ (bm, Qt)) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
718 goto found; |
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 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
721 else |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
722 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
723 if (ln1 > ix1) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
724 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
725 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
|
726 if (!EQ (bm, Qt)) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
727 goto found; |
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 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
730 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
731 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
|
732 goto found; |
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 } |
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 (!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
|
737 && !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
|
738 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
739 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
|
740 if (CONSP (bm2)) |
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 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
|
743 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
744 if (CONSP (bm2)) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
745 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
746 ln2 = XINT (Flength (bm2)); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
747 if (partial_p) |
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 (ln2 > ix2) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
750 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
751 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
|
752 if (!EQ (bm, Qt)) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
753 goto found; |
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 } |
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 } |
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 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
760 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
761 if (ln1 > ix1) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
762 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
763 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
|
764 if (!EQ (bm, Qt)) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
765 goto found; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
766 } |
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 if (ln2 > ix1) |
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 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
|
771 if (!EQ (bm, Qt)) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
772 goto found; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
773 return NO_FRINGE_BITMAP; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
774 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
775 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
|
776 return NO_FRINGE_BITMAP; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
777 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
778 found: |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
779 return lookup_fringe_bitmap (bm); |
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 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
782 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
783 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
784 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
|
785 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
786 int overlay = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
787 |
107991
74557d25410e
Implement cursor on the left fringe for R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
106815
diff
changeset
|
788 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
|
789 { |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
790 Lisp_Object cursor = Qnil; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
791 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
792 switch (w->phys_cursor_type) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
793 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
794 case HOLLOW_BOX_CURSOR: |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
795 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
|
796 cursor = Qhollow; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
797 else |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
798 cursor = Qhollow_small; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
799 break; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
800 case FILLED_BOX_CURSOR: |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
801 cursor = Qbox; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
802 break; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
803 case BAR_CURSOR: |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
804 cursor = Qbar; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
805 break; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
806 case HBAR_CURSOR: |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
807 cursor = Qhbar; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
808 break; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
809 case NO_CURSOR: |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
810 default: |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
811 w->phys_cursor_on_p = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
812 row->cursor_in_fringe_p = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
813 break; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
814 } |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
815 if (!NILP (cursor)) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
816 { |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
817 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
|
818 if (bm != NO_FRINGE_BITMAP) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
819 { |
107991
74557d25410e
Implement cursor on the left fringe for R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
106815
diff
changeset
|
820 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
|
821 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
|
822 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
823 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
824 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
825 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
826 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
|
827 |
61634
e188b7249c28
(draw_fringe_bitmap): Use overlay_arrow_bitmap from row
Kim F. Storm <storm@cua.dk>
parents:
60834
diff
changeset
|
828 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
|
829 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
|
830 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
831 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
832 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
833 /* 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
|
834 function with input blocked. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
835 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
836 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
837 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
|
838 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
839 xassert (interrupt_input_blocked); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
840 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
841 /* 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
|
842 don't have to draw anything. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
843 if (row->visible_height <= 0) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
844 return; |
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 if (WINDOW_LEFT_FRINGE_WIDTH (w) != 0) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
847 draw_fringe_bitmap (w, row, 1); |
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 if (WINDOW_RIGHT_FRINGE_WIDTH (w) != 0) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
850 draw_fringe_bitmap (w, row, 0); |
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 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
853 /* 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
|
854 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
|
855 |
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
856 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
|
857 |
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
858 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
|
859 |
57371
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
860 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
|
861 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
|
862 */ |
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
863 |
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
864 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
865 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
|
866 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
867 struct glyph_row *row; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
868 int yb = window_text_bottom_y (w); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
869 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
|
870 int y, rn; |
57371
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
871 int updated = 0; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
872 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
873 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
|
874 return 0; |
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 /* 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
|
877 if (no_fringe |
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
878 && (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
|
879 || 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
|
880 updated++; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
881 |
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
|
882 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
|
883 y < yb && rn < nrows; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
884 y += row->height, ++row, ++rn) |
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 (!row->redraw_fringe_bitmaps_p) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
887 continue; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
888 draw_row_fringe_bitmaps (w, row); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
889 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
|
890 updated++; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
891 } |
57371
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
892 |
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
893 return updated; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
894 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
895 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
896 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
897 /* 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
|
898 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
|
899 |
8370ced2ae75
(update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents:
64770
diff
changeset
|
900 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
|
901 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
902 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
903 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
|
904 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
905 struct glyph_row *row, *cur = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
906 int yb = window_text_bottom_y (w); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
907 int rn, nrows = w->current_matrix->nrows; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
908 int y; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
909 int redraw_p = 0; |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
910 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
|
911 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
|
912 Lisp_Object empty_pos; |
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
913 Lisp_Object ind = Qnil; |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
914 #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
|
915 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
|
916 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
|
917 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
|
918 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
|
919 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
920 if (w->pseudo_window_p) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
921 return 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
922 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
923 if (!MINI_WINDOW_P (w) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
924 && (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
|
925 { |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
926 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
|
927 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
|
928 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
|
929 { |
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
930 Lisp_Object pos; |
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
931 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
|
932 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
|
933 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
|
934 boundary_top = XCDR (pos); |
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
935 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
|
936 boundary_bot = XCDR (pos); |
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
937 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
|
938 arrow_top = XCDR (pos); |
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
939 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
|
940 arrow_bot = XCDR (pos); |
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
941 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
942 else |
58424
99a14d81043f
(update_window_fringes): Provide sensible fall-back
Kim F. Storm <storm@cua.dk>
parents:
58268
diff
changeset
|
943 /* 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
|
944 boundary_top = boundary_bot = Qleft; |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
945 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
946 |
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
|
947 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
|
948 if (!NILP (ind)) |
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
949 { |
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
|
950 for (y = w->vscroll, rn = 0; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
951 y < yb && rn < nrows; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
952 y += row->height, ++rn) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
953 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
954 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
|
955 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
|
956 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
957 row = w->desired_matrix->rows + rn; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
958 if (!row->enabled_p) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
959 row = w->current_matrix->rows + rn; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
960 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
961 indicate_bob_p = row->indicate_bob_p; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
962 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
|
963 indicate_eob_p = row->indicate_eob_p; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
964 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
|
965 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
966 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
|
967 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
|
968 |
58443
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
969 if (!row->mode_line_p) |
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
970 { |
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
|
971 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
|
972 { |
65066
67861e2e09d6
* fringe.c (update_window_fringes): Only put TOP and BOTTOM
Kim F. Storm <storm@cua.dk>
parents:
65062
diff
changeset
|
973 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
|
974 && !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
|
975 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
|
976 else |
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
977 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
|
978 top_ind_rn = rn; |
58443
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
979 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
980 |
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
|
981 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
|
982 { |
66622
cf3d316b4bc0
(update_window_fringes): Undo 2005-10-27 change.
Kim F. Storm <storm@cua.dk>
parents:
66471
diff
changeset
|
983 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
|
984 && !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
|
985 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
|
986 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
|
987 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
|
988 } |
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
989 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
990 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
991 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
992 |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
993 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
|
994 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
|
995 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
|
996 |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
997 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
|
998 bitmap_cache[y] = -1; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
999 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1000 #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
|
1001 (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
|
1002 ? 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
|
1003 : (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
|
1004 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
|
1005 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1006 #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
|
1007 (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
|
1008 ? 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
|
1009 : (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
|
1010 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
|
1011 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1012 |
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
|
1013 /* 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
|
1014 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
|
1015 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
|
1016 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
|
1017 { |
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
|
1018 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
|
1019 |
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
|
1020 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
|
1021 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
|
1022 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
|
1023 |
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
|
1024 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
|
1025 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
|
1026 { |
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 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
|
1028 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
|
1029 ? 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
|
1030 : 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
|
1031 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
|
1032 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
|
1033 ? 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
|
1034 : 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
|
1035 } |
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 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
|
1037 { |
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 (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
|
1039 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
|
1040 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
|
1041 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
|
1042 } |
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 |
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 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
|
1045 { |
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 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
|
1047 |
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 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
|
1049 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
|
1050 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
|
1051 ? 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
|
1052 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
|
1053 { |
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 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
|
1055 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
|
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 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
|
1058 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
|
1059 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
|
1060 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
|
1061 |
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 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
|
1063 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
|
1064 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
|
1065 { |
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 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
|
1067 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
|
1068 |
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 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
|
1070 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
|
1071 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
|
1072 |
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 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
|
1074 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
|
1075 } |
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 } |
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 } |
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) |
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 { |
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 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
|
1082 |
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 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
|
1084 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
|
1085 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
|
1086 |
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 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
|
1088 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
|
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 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
|
1091 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
|
1092 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
|
1093 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
|
1094 } |
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 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
|
1096 { |
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 (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
|
1098 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
|
1099 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
|
1100 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
|
1101 } |
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 (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
|
1104 { |
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 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
|
1106 |
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 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
|
1108 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
|
1109 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
|
1110 ? 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
|
1111 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
|
1112 { |
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 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
|
1114 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
|
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 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
|
1117 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
|
1118 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
|
1119 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
|
1120 |
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 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
|
1122 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
|
1123 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
|
1124 { |
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 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
|
1126 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
|
1127 |
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 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
|
1129 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
|
1130 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
|
1131 |
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 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
|
1133 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
|
1134 } |
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 } |
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 } |
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 |
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 for (y = w->vscroll, rn = 0; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1140 y < yb && rn < nrows; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1141 y += row->height, rn++) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1142 { |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1143 int left, right; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1144 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
|
1145 int left_offset, right_offset; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1146 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1147 row = w->desired_matrix->rows + rn; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1148 cur = w->current_matrix->rows + rn; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1149 if (!row->enabled_p) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1150 row = cur; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1151 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1152 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
|
1153 left_offset = right_offset = 0; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1154 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1155 /* 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
|
1156 if (WINDOW_LEFT_FRINGE_WIDTH (w) == 0) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1157 left = NO_FRINGE_BITMAP; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1158 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
|
1159 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1160 left = row->left_user_fringe_bitmap; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1161 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
|
1162 } |
108313
cda2e3e030af
Fix fringe truncation bitmaps in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107994
diff
changeset
|
1163 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
|
1164 || (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
|
1165 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
|
1166 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
|
1167 { |
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
|
1168 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
|
1169 ? 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
|
1170 : 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
|
1171 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
|
1172 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
|
1173 } |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
1174 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
|
1175 { |
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
|
1176 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
|
1177 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
|
1178 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
|
1179 } |
109439
9ad1e76fc718
Restore mistakenly reverted code from revno 99854.1.6 merged in revno 99950.
Eli Zaretskii <eliz@gnu.org>
parents:
109302
diff
changeset
|
1180 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
|
1181 || (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
|
1182 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
|
1183 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
|
1184 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
|
1185 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
|
1186 { |
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
|
1187 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
|
1188 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
|
1189 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
|
1190 } |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
1191 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
|
1192 { |
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
|
1193 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
|
1194 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
|
1195 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
|
1196 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1197 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1198 left = NO_FRINGE_BITMAP; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1199 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1200 /* 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
|
1201 if (WINDOW_RIGHT_FRINGE_WIDTH (w) == 0) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1202 right = NO_FRINGE_BITMAP; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1203 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
|
1204 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1205 right = row->right_user_fringe_bitmap; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1206 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
|
1207 } |
108313
cda2e3e030af
Fix fringe truncation bitmaps in R2L lines.
Eli Zaretskii <eliz@gnu.org>
parents:
107994
diff
changeset
|
1208 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
|
1209 || (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
|
1210 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
|
1211 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
|
1212 { |
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
|
1213 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
|
1214 ? 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
|
1215 : 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
|
1216 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
|
1217 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
|
1218 } |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
1219 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
|
1220 { |
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
|
1221 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
|
1222 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
|
1223 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
|
1224 } |
109439
9ad1e76fc718
Restore mistakenly reverted code from revno 99854.1.6 merged in revno 99950.
Eli Zaretskii <eliz@gnu.org>
parents:
109302
diff
changeset
|
1225 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
|
1226 || (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
|
1227 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
|
1228 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
|
1229 { |
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 = 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
|
1231 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
|
1232 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
|
1233 } |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
1234 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
|
1235 { |
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 = 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
|
1237 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
|
1238 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
|
1239 } |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
1240 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
|
1241 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
|
1242 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1243 right = NO_FRINGE_BITMAP; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1244 |
65062
8370ced2ae75
(update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents:
64770
diff
changeset
|
1245 if (row->y != cur->y |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1246 || 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
|
1247 || 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
|
1248 || left != cur->left_fringe_bitmap |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1249 || right != cur->right_fringe_bitmap |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1250 || 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
|
1251 || 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
|
1252 || 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
|
1253 || right_offset != cur->right_fringe_offset |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1254 || cur->redraw_fringe_bitmaps_p) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1255 { |
65062
8370ced2ae75
(update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents:
64770
diff
changeset
|
1256 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
|
1257 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
|
1258 { |
8370ced2ae75
(update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents:
64770
diff
changeset
|
1259 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
|
1260 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
|
1261 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
|
1262 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
|
1263 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
|
1264 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
|
1265 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
|
1266 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1267 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1268 |
69616
c00e99faf809
(draw_fringe_bitmap): Don't calculate default overlay arrow
Kim F. Storm <storm@cua.dk>
parents:
69490
diff
changeset
|
1269 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
|
1270 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
|
1271 |
61634
e188b7249c28
(draw_fringe_bitmap): Use overlay_arrow_bitmap from row
Kim F. Storm <storm@cua.dk>
parents:
60834
diff
changeset
|
1272 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
|
1273 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1274 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
|
1275 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
|
1276 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1277 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1278 row->left_fringe_bitmap = left; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1279 row->right_fringe_bitmap = right; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1280 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
|
1281 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
|
1282 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
|
1283 row->right_fringe_offset = right_offset; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1284 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1285 |
65062
8370ced2ae75
(update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents:
64770
diff
changeset
|
1286 return redraw_p && !keep_current_p; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1287 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1288 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1289 |
54220
50ba59282051
(Fdefine_fringe_bitmap): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
54079
diff
changeset
|
1290 /* 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
|
1291 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1292 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
|
1293 modified and F is visible. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1294 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1295 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
|
1296 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
|
1297 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
|
1298 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
|
1299 |
57371
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
1300 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
|
1301 */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1302 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1303 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
1304 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
|
1305 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1306 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
|
1307 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
|
1308 int o_cols = FRAME_FRINGE_COLS (f); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1309 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1310 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
|
1311 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
|
1312 int left_fringe_width, right_fringe_width; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1313 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1314 if (!NILP (left_fringe)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1315 left_fringe = Fcdr (left_fringe); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1316 if (!NILP (right_fringe)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1317 right_fringe = Fcdr (right_fringe); |
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 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
|
1320 XINT (left_fringe)); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1321 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
|
1322 XINT (right_fringe)); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1323 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1324 if (left_fringe_width || right_fringe_width) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1325 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1326 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
|
1327 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
|
1328 int conf_wid = left_wid + right_wid; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1329 int font_wid = FRAME_COLUMN_WIDTH (f); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1330 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
|
1331 int real_wid = cols * font_wid; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1332 if (left_wid && right_wid) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1333 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1334 if (left_fringe_width < 0) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1335 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1336 /* 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
|
1337 FRAME_LEFT_FRINGE_WIDTH (f) = left_wid; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1338 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
|
1339 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1340 else if (right_fringe_width < 0) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1341 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1342 /* 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
|
1343 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
|
1344 FRAME_RIGHT_FRINGE_WIDTH (f) = right_wid; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1345 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1346 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1347 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1348 /* Adjust both fringes with an equal amount. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1349 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
|
1350 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
|
1351 int fill = real_wid - conf_wid; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1352 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
|
1353 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
|
1354 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1355 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1356 else if (left_fringe_width) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1357 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1358 FRAME_LEFT_FRINGE_WIDTH (f) = real_wid; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1359 FRAME_RIGHT_FRINGE_WIDTH (f) = 0; |
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 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1362 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1363 FRAME_LEFT_FRINGE_WIDTH (f) = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1364 FRAME_RIGHT_FRINGE_WIDTH (f) = real_wid; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1365 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1366 FRAME_FRINGE_COLS (f) = cols; |
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 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1369 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1370 FRAME_LEFT_FRINGE_WIDTH (f) = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1371 FRAME_RIGHT_FRINGE_WIDTH (f) = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1372 FRAME_FRINGE_COLS (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 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1375 if (redraw && FRAME_VISIBLE_P (f)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1376 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
|
1377 o_right != FRAME_RIGHT_FRINGE_WIDTH (f) || |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1378 o_cols != FRAME_FRINGE_COLS (f)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1379 redraw_frame (f); |
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 |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1382 |
57270 | 1383 /* Free resources used by a user-defined bitmap. */ |
1384 | |
58089
fb4cd138f0b8
(destroy_fringe_bitmap): Fix return type.
Kim F. Storm <storm@cua.dk>
parents:
58057
diff
changeset
|
1385 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
1386 destroy_fringe_bitmap (int n) |
53879
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 struct fringe_bitmap **fbp; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1389 |
59401
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1390 fringe_faces[n] = Qnil; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1391 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1392 fbp = &fringe_bitmaps[n]; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1393 if (*fbp && (*fbp)->dynamic) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1394 { |
83037
03a73693678e
Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents:
53970
diff
changeset
|
1395 /* XXX Is SELECTED_FRAME OK here? */ |
83212 | 1396 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
|
1397 if (rif && rif->destroy_fringe_bitmap) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1398 rif->destroy_fringe_bitmap (n); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1399 xfree (*fbp); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1400 *fbp = NULL; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1401 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1402 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1403 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
|
1404 && 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
|
1405 max_used_fringe_bitmap--; |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1406 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1407 |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1408 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1409 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
|
1410 1, 1, 0, |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1411 doc: /* Destroy fringe bitmap BITMAP. |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1412 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
|
1413 (Lisp_Object bitmap) |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1414 { |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1415 int n; |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1416 |
57270 | 1417 CHECK_SYMBOL (bitmap); |
1418 n = lookup_fringe_bitmap (bitmap); | |
1419 if (!n) | |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1420 return Qnil; |
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 destroy_fringe_bitmap (n); |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1423 |
57270 | 1424 if (n >= MAX_STANDARD_FRINGE_BITMAPS) |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1425 { |
57270 | 1426 Vfringe_bitmaps = Fdelq (bitmap, Vfringe_bitmaps); |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1427 /* It would be better to remove the fringe property. */ |
57270 | 1428 Fput (bitmap, Qfringe, Qnil); |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1429 } |
57270 | 1430 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1431 return Qnil; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1432 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1433 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1434 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1435 /* Initialize bitmap bit. |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1436 |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1437 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
|
1438 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
|
1439 |
53955
7d8c228c1f02
(init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents:
53940
diff
changeset
|
1440 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
|
1441 |
7d8c228c1f02
(init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents:
53940
diff
changeset
|
1442 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
|
1443 */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1444 |
78786
7080fcd26c3e
(init_fringe_bitmap) <swap nibble>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78260
diff
changeset
|
1445 #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
|
1446 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
|
1447 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
|
1448 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
|
1449 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
|
1450 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
|
1451 #endif /* HAVE_X_WINDOWS */ |
7080fcd26c3e
(init_fringe_bitmap) <swap nibble>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78260
diff
changeset
|
1452 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1453 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
1454 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
|
1455 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1456 if (once_p || fb->dynamic) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1457 { |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1458 #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
|
1459 unsigned short *bits = fb->bits; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1460 int j; |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1461 |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1462 if (fb->width <= 8) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1463 { |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1464 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
|
1465 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
|
1466 { |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1467 unsigned short b = *bits++; |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1468 unsigned char c; |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1469 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
|
1470 | (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
|
1471 *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
|
1472 } |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1473 } |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1474 else |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1475 { |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1476 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
|
1477 { |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1478 unsigned short b = *bits; |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1479 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
|
1480 | (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
|
1481 | (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
|
1482 | (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
|
1483 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
|
1484 #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
|
1485 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
|
1486 #endif |
06cf3e417172
(init_fringe_bitmap) [HAVE_X_WINDOWS && WORDS_BIG_ENDIAN]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
100951
diff
changeset
|
1487 *bits++ = b; |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1488 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1489 } |
53955
7d8c228c1f02
(init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents:
53940
diff
changeset
|
1490 #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
|
1491 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1492 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1493 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1494 if (!once_p) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1495 { |
83214
2bd6d4c2d21c
Removed C99ism in init_fringe_bitmap.
Karoly Lorentey <lorentey@elte.hu>
parents:
83213
diff
changeset
|
1496 /* XXX Is SELECTED_FRAME OK here? */ |
2bd6d4c2d21c
Removed C99ism in init_fringe_bitmap.
Karoly Lorentey <lorentey@elte.hu>
parents:
83213
diff
changeset
|
1497 struct redisplay_interface *rif = FRAME_RIF (SELECTED_FRAME ()); |
2bd6d4c2d21c
Removed C99ism in init_fringe_bitmap.
Karoly Lorentey <lorentey@elte.hu>
parents:
83213
diff
changeset
|
1498 |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1499 destroy_fringe_bitmap (which); |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1500 |
57267
617e54beffb6
* fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents:
57258
diff
changeset
|
1501 if (rif && rif->define_fringe_bitmap) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1502 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
|
1503 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1504 fringe_bitmaps[which] = fb; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1505 if (which >= max_used_fringe_bitmap) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1506 max_used_fringe_bitmap = which + 1; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1507 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1508 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1509 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1510 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1511 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
|
1512 2, 5, 0, |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1513 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
|
1514 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
|
1515 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
|
1516 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
|
1517 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
|
1518 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
|
1519 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
|
1520 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
|
1521 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
|
1522 should be repeated. |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1523 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
|
1524 (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
|
1525 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1526 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
|
1527 unsigned short *b; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1528 struct fringe_bitmap fb, *xfb; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1529 int fill1 = 0, fill2 = 0; |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1530 |
57270 | 1531 CHECK_SYMBOL (bitmap); |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1532 |
58268
fc159de41e11
(Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
58089
diff
changeset
|
1533 if (STRINGP (bits)) |
fc159de41e11
(Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
58089
diff
changeset
|
1534 h = SCHARS (bits); |
fc159de41e11
(Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
58089
diff
changeset
|
1535 else if (VECTORP (bits)) |
fc159de41e11
(Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
58089
diff
changeset
|
1536 h = XVECTOR (bits)->size; |
fc159de41e11
(Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
58089
diff
changeset
|
1537 else |
71834
bf40c8c83e7a
(Fdefine_fringe_bitmap): Cleanup wrong_type_argument use.
Kim F. Storm <storm@cua.dk>
parents:
71659
diff
changeset
|
1538 wrong_type_argument (Qsequencep, bits); |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1539 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1540 if (NILP (height)) |
58268
fc159de41e11
(Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
58089
diff
changeset
|
1541 fb.height = h; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1542 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1543 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1544 CHECK_NUMBER (height); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1545 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
|
1546 if (fb.height > h) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1547 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1548 fill1 = (fb.height - h) / 2; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1549 fill2 = fb.height - h - fill1; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1550 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1551 } |
54220
50ba59282051
(Fdefine_fringe_bitmap): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
54079
diff
changeset
|
1552 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1553 if (NILP (width)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1554 fb.width = 8; |
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 (width); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1558 fb.width = min (XINT (width), 255); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1559 } |
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 fb.period = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1562 fb.align = ALIGN_BITMAP_CENTER; |
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 if (CONSP (align)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1565 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1566 Lisp_Object period = XCDR (align); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1567 if (CONSP (period)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1568 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1569 period = XCAR (period); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1570 if (!NILP (period)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1571 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1572 fb.period = fb.height; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1573 fb.height = 255; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1574 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1575 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1576 align = XCAR (align); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1577 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1578 if (EQ (align, Qtop)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1579 fb.align = ALIGN_BITMAP_TOP; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1580 else if (EQ (align, Qbottom)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1581 fb.align = ALIGN_BITMAP_BOTTOM; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1582 else if (!NILP (align) && !EQ (align, Qcenter)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1583 error ("Bad align argument"); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1584 |
57277
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1585 n = lookup_fringe_bitmap (bitmap); |
57270 | 1586 if (!n) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1587 { |
57277
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1588 if (max_used_fringe_bitmap < max_fringe_bitmaps) |
53966
26dc8943ee64
Lisp_Object/int mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53955
diff
changeset
|
1589 n = max_used_fringe_bitmap++; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1590 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1591 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1592 for (n = MAX_STANDARD_FRINGE_BITMAPS; |
57277
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1593 n < max_fringe_bitmaps; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1594 n++) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1595 if (fringe_bitmaps[n] == NULL) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1596 break; |
57277
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1597 |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1598 if (n == max_fringe_bitmaps) |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1599 { |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1600 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
|
1601 error ("No free fringe bitmap slots"); |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1602 |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1603 i = max_fringe_bitmaps; |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1604 max_fringe_bitmaps += 20; |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1605 fringe_bitmaps |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1606 = ((struct fringe_bitmap **) |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1607 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
|
1608 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
|
1609 = (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
|
1610 |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1611 for (; i < max_fringe_bitmaps; i++) |
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 fringe_bitmaps[i] = NULL; |
59401
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1614 fringe_faces[i] = Qnil; |
57277
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 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1617 } |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1618 |
57270 | 1619 Vfringe_bitmaps = Fcons (bitmap, Vfringe_bitmaps); |
1620 Fput (bitmap, Qfringe, make_number (n)); | |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1621 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1622 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1623 fb.dynamic = 1; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1624 |
54079
e1b6171f91b8
(Fdefine_fringe_bitmap): Use && instead of & to avoid
Andreas Schwab <schwab@suse.de>
parents:
53970
diff
changeset
|
1625 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
|
1626 + fb.height * BYTES_PER_BITMAP_ROW); |
e1b6171f91b8
(Fdefine_fringe_bitmap): Use && instead of & to avoid
Andreas Schwab <schwab@suse.de>
parents:
53970
diff
changeset
|
1627 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
|
1628 memset (b, 0, fb.height); |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1629 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1630 j = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1631 while (j < fb.height) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1632 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1633 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
|
1634 b[j++] = 0; |
54079
e1b6171f91b8
(Fdefine_fringe_bitmap): Use && instead of & to avoid
Andreas Schwab <schwab@suse.de>
parents:
53970
diff
changeset
|
1635 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
|
1636 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1637 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
|
1638 b[j++] = NUMBERP (elt) ? XINT (elt) : 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1639 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1640 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
|
1641 b[j++] = 0; |
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 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1644 *xfb = fb; |
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 init_fringe_bitmap (n, xfb, 0); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1647 |
57270 | 1648 return bitmap; |
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 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1651 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
|
1652 1, 2, 0, |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1653 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
|
1654 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
|
1655 (Lisp_Object bitmap, Lisp_Object face) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1656 { |
57270 | 1657 int n; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1658 int face_id; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1659 |
57270 | 1660 CHECK_SYMBOL (bitmap); |
1661 n = lookup_fringe_bitmap (bitmap); | |
1662 if (!n) | |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1663 error ("Undefined fringe bitmap"); |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1664 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1665 if (!NILP (face)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1666 { |
60834
94900ab8eef0
(draw_fringe_bitmap_1, Fset_fringe_bitmap_face):
Kim F. Storm <storm@cua.dk>
parents:
59581
diff
changeset
|
1667 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>
diff
changeset
|
1668 FRINGE_FACE_ID, 1); |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1669 if (face_id < 0) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1670 error ("No such face"); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1671 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1672 |
59401
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1673 fringe_faces[n] = face; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1674 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1675 return Qnil; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1676 } |
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 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
|
1679 0, 2, 0, |
54220
50ba59282051
(Fdefine_fringe_bitmap): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
54079
diff
changeset
|
1680 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
|
1681 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
|
1682 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
|
1683 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
|
1684 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
|
1685 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
|
1686 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
|
1687 (Lisp_Object pos, Lisp_Object window) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1688 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1689 struct window *w; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1690 struct glyph_row *row; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1691 int textpos; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1692 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1693 if (NILP (window)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1694 window = selected_window; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1695 CHECK_WINDOW (window); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1696 w = XWINDOW (window); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1697 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1698 if (!NILP (pos)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1699 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1700 CHECK_NUMBER_COERCE_MARKER (pos); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1701 textpos = XINT (pos); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1702 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1703 else if (w == XWINDOW (selected_window)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1704 textpos = PT; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1705 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1706 textpos = XMARKER (w->pointm)->charpos; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1707 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1708 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
|
1709 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
|
1710 if (row) |
57316
3eb68ef1dcb7
(Ffringe_bitmaps_at_pos): Change return value from cons
Kim F. Storm <storm@cua.dk>
parents:
57277
diff
changeset
|
1711 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
|
1712 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
|
1713 (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
|
1714 : 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
|
1715 : 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
|
1716 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1717 return Qnil; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1718 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1719 |
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 /*********************************************************************** |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1722 Initialization |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1723 ***********************************************************************/ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1724 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1725 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
1726 syms_of_fringe (void) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1727 { |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
1728 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
|
1729 staticpro (&Qtruncation); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
1730 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
|
1731 staticpro (&Qcontinuation); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
1732 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
|
1733 staticpro (&Qoverlay_arrow); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
1734 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
|
1735 staticpro (&Qempty_line); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
1736 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
|
1737 staticpro (&Qtop_bottom); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
1738 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
|
1739 staticpro (&Qhollow_small); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1740 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1741 defsubr (&Sdestroy_fringe_bitmap); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1742 defsubr (&Sdefine_fringe_bitmap); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1743 defsubr (&Sfringe_bitmaps_at_pos); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1744 defsubr (&Sset_fringe_bitmap_face); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1745 |
112364
42e22c4f06b7
Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents:
112278
diff
changeset
|
1746 DEFVAR_LISP ("overflow-newline-into-fringe", Voverflow_newline_into_fringe, |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1747 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
|
1748 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
|
1749 (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
|
1750 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
|
1751 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
|
1752 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
|
1753 Voverflow_newline_into_fringe = Qt; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1754 |
112364
42e22c4f06b7
Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents:
112278
diff
changeset
|
1755 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
|
1756 doc: /* List of fringe bitmap symbols. */); |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1757 Vfringe_bitmaps = Qnil; |
53879
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 |
59401
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1760 /* Garbage collection hook */ |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1761 |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1762 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
1763 mark_fringe_data (void) |
59401
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1764 { |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1765 int i; |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1766 |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1767 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
|
1768 if (!NILP (fringe_faces[i])) |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1769 mark_object (fringe_faces[i]); |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1770 } |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1771 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1772 /* Initialize this module when Emacs starts. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1773 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1774 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
1775 init_fringe_once (void) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1776 { |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1777 int bt; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1778 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1779 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
|
1780 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
|
1781 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1782 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1783 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
108946
diff
changeset
|
1784 init_fringe (void) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1785 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1786 int i; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1787 |
57277
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1788 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
|
1789 |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1790 fringe_bitmaps |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1791 = (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
|
1792 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
|
1793 = (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
|
1794 |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1795 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
|
1796 { |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1797 fringe_bitmaps[i] = NULL; |
59401
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1798 fringe_faces[i] = Qnil; |
57277
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1799 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1800 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1801 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96675
diff
changeset
|
1802 #ifdef HAVE_NTGUI |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1803 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1804 void |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96675
diff
changeset
|
1805 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
|
1806 { |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1807 int bt; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1808 |
57267
617e54beffb6
* fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents:
57258
diff
changeset
|
1809 if (!rif) |
617e54beffb6
* fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents:
57258
diff
changeset
|
1810 return; |
617e54beffb6
* fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents:
57258
diff
changeset
|
1811 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1812 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
|
1813 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1814 struct fringe_bitmap *fb = &standard_bitmaps[bt]; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1815 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
|
1816 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1817 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1818 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1819 void |
109480
d12162869c07
Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents:
109439
diff
changeset
|
1820 w32_reset_fringes (void) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1821 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1822 /* Destroy row bitmaps. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1823 int bt; |
83581
29192b6da477
(w32_init_fringe w32_reset_fringes) [HAVE_NTGUI]:
Jason Rumney <jasonr@gnu.org>
parents:
83554
diff
changeset
|
1824 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
|
1825 |
57267
617e54beffb6
* fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents:
57258
diff
changeset
|
1826 if (!rif) |
617e54beffb6
* fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents:
57258
diff
changeset
|
1827 return; |
617e54beffb6
* fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents:
57258
diff
changeset
|
1828 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1829 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
|
1830 rif->destroy_fringe_bitmap (bt); |
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 |
53955
7d8c228c1f02
(init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents:
53940
diff
changeset
|
1833 #endif /* HAVE_NTGUI */ |
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 #endif /* HAVE_WINDOW_SYSTEM */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1836 |