Mercurial > emacs
annotate src/fringe.c @ 85078:78a80abb61a1
*** empty log message ***
author | Juri Linkov <juri@jurta.org> |
---|---|
date | Sat, 06 Oct 2007 22:24:14 +0000 |
parents | acac15277b75 |
children | 107ccd98fa12 bdb3fe0ba9fa |
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, |
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
71834
diff
changeset
|
4 2006, 2007 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 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8 GNU Emacs is free software; you can redistribute it and/or modify |
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 |
78260
922696f363b0
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
75227
diff
changeset
|
10 the Free Software Foundation; either version 3, or (at your option) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
11 any later version. |
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 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
19 along with GNU Emacs; see the file COPYING. If not, write to |
64084 | 20 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
21 Boston, MA 02110-1301, USA. */ | |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
22 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
23 #include <config.h> |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
24 #include <stdio.h> |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
25 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
26 #include "lisp.h" |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
27 #include "frame.h" |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
28 #include "window.h" |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
29 #include "dispextern.h" |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
30 #include "buffer.h" |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
31 #include "blockinput.h" |
83037
03a73693678e
Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents:
53970
diff
changeset
|
32 #include "termhooks.h" |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
33 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
34 #ifdef HAVE_WINDOW_SYSTEM |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
35 |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
36 extern Lisp_Object Qfringe; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
37 extern Lisp_Object Qtop, Qbottom, Qcenter; |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
38 extern Lisp_Object Qup, Qdown, Qleft, Qright; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
39 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
40 /* 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
|
41 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
42 Lisp_Object Voverflow_newline_into_fringe; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
43 |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
44 /* List of known fringe bitmap symbols. |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
45 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
46 The fringe bitmap number is stored in the `fringe' property on |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
47 those symbols. Names for the built-in bitmaps are installed by |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
48 loading fringe.el. |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
49 */ |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
50 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
51 Lisp_Object Vfringe_bitmaps; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
52 |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
53 /* 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
|
54 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
55 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
|
56 '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
|
57 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
58 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
|
59 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
|
60 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
|
61 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
62 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
|
63 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
|
64 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
|
65 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
|
66 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
67 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
|
68 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
|
69 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
70 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
|
71 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
|
72 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
|
73 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
|
74 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
|
75 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
76 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
|
77 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
|
78 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
|
79 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
80 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
|
81 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
|
82 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
83 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
|
84 must specify physical bitmap symbols. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
85 */ |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
86 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
87 extern Lisp_Object Qunknown; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
88 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
|
89 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
|
90 extern Lisp_Object Qbar, Qhbar, Qbox, Qhollow; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
91 Lisp_Object Qhollow_small; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
92 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
93 enum fringe_bitmap_align |
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 ALIGN_BITMAP_CENTER = 0, |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
96 ALIGN_BITMAP_TOP, |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
97 ALIGN_BITMAP_BOTTOM |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
98 }; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
99 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
100 struct fringe_bitmap |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
101 { |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
102 unsigned short *bits; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
103 unsigned height : 8; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
104 unsigned width : 8; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
105 unsigned period : 8; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
106 unsigned align : 2; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
107 unsigned dynamic : 1; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
108 }; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
109 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
110 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
111 /*********************************************************************** |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
112 Fringe bitmaps |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
113 ***********************************************************************/ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
114 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
115 /* Undefined bitmap. A question mark. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
116 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
117 ..xxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
118 .xxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
119 xx....xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
120 xx....xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
121 ....xx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
122 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
123 ...xx... |
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 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
126 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
127 */ |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
128 static unsigned short question_mark_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
129 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
|
130 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
131 /* An arrow like this: `<-'. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
132 /* |
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 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
137 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
138 .xx..... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
139 ..xx.... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
140 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
141 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
142 static unsigned short left_arrow_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
143 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
|
144 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
145 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
146 /* Right truncation arrow bitmap `->'. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
147 /* |
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 ..xxxxxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
152 ..xxxxxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
153 .....xx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
154 ....xx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
155 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
156 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
157 static unsigned short right_arrow_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
158 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
|
159 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
160 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
161 /* Up arrow bitmap. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
162 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
163 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
164 ..xxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
165 .xxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
166 xxxxxxxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
167 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
168 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
169 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
170 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
171 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
172 static unsigned short up_arrow_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
173 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
|
174 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
175 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
176 /* Down arrow bitmap. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
177 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
178 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
179 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
180 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
181 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
182 xxxxxxxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
183 .xxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
184 ..xxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
185 ...xx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
186 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
187 static unsigned short down_arrow_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
188 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
|
189 |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
190 /* Marker for continuation lines. */ |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
191 /* |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
192 ..xxxx.. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
193 .xxxxx.. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
194 xx...... |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
195 xxx..x.. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
196 xxxxxx.. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
197 .xxxxx.. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
198 ..xxxx.. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
199 .xxxxx.. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
200 */ |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
201 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
|
202 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
|
203 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
204 /* Marker for continued lines. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
205 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
206 ..xxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
207 ..xxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
208 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
209 ..x..xxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
210 ..xxxxxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
211 ..xxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
212 ..xxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
213 ..xxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
214 */ |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
215 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
|
216 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
|
217 |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
218 /* 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
|
219 /* |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
220 ......xx |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
221 ....xxxx |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
222 ...xxxxx |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
223 ..xxxxxx |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
224 ..xxxxxx |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
225 ...xxxxx |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
226 ....xxxx |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
227 ......xx |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
228 */ |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
229 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
|
230 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
|
231 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
232 /* Overlay arrow bitmap. A triangular arrow. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
233 /* |
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 xxxx.... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
236 xxxxx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
237 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
238 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
239 xxxxx... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
240 xxxx.... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
241 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
242 */ |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
243 static unsigned short right_triangle_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
244 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
|
245 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
246 /* First line bitmap. An top-left angle. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
247 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
248 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
249 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
250 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
251 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
252 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
253 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
254 xx...... |
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 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
257 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
|
258 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
|
259 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
260 /* First line bitmap. An right-up angle. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
261 /* |
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 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
265 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
266 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
267 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
268 ......xx |
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 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
271 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
|
272 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
|
273 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
274 /* Last line bitmap. An left-down angle. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
275 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
276 ........ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
277 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
278 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
279 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
280 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
281 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
282 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
283 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
284 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
285 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
|
286 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
|
287 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
288 /* Last line bitmap. An right-down angle. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
289 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
290 ........ |
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 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
293 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
294 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
295 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
296 ..xxxxxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
297 ..xxxxxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
298 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
299 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
|
300 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
|
301 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
302 /* First/last line bitmap. An left bracket. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
303 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
304 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
305 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
306 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 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
309 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
310 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
311 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
312 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
313 xxxxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
314 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
315 static unsigned short left_bracket_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
316 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
|
317 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
318 /* First/last line bitmap. An right bracket. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
319 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
320 ..xxxxxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
321 ..xxxxxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
322 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
323 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
324 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
325 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
326 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
327 ......xx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
328 ..xxxxxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
329 ..xxxxxx |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
330 */ |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
331 static unsigned short right_bracket_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
332 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
|
333 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
334 /* 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
|
335 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
336 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
337 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
338 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
339 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
340 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
341 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
342 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
343 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
344 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
345 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
346 xxxxxxx. |
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 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
349 */ |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
350 static unsigned short filled_rectangle_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
351 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
|
352 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
353 /* 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
|
354 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
355 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
356 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
357 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
358 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
359 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
360 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
361 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
362 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
363 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
364 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
365 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
366 x.....x. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
367 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
368 */ |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
369 static unsigned short hollow_rectangle_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
370 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
|
371 |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
372 /* Hollow square bitmap. */ |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
373 /* |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
374 .xxxxxx. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
375 .x....x. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
376 .x....x. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
377 .x....x. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
378 .x....x. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
379 .xxxxxx. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
380 */ |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
381 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
|
382 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
|
383 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
384 /* Filled square bitmap. */ |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
385 /* |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
386 .xxxxxx. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
387 .xxxxxx. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
388 .xxxxxx. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
389 .xxxxxx. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
390 .xxxxxx. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
391 .xxxxxx. |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
392 */ |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
393 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
|
394 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
|
395 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
396 /* 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
|
397 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
398 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
399 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
400 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
401 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
402 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
403 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
404 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
405 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
406 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
407 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
408 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
409 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
410 xx...... |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
411 */ |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
412 static unsigned short vertical_bar_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
413 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
|
414 |
69063
fb4f4719e18b
(horizontal_bar_bits): Rename from `horisontal_bar_bits'.
Juanma Barranquero <lekktu@gmail.com>
parents:
69049
diff
changeset
|
415 /* 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
|
416 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
417 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
418 xxxxxxx. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
419 */ |
69063
fb4f4719e18b
(horizontal_bar_bits): Rename from `horisontal_bar_bits'.
Juanma Barranquero <lekktu@gmail.com>
parents:
69049
diff
changeset
|
420 static unsigned short horizontal_bar_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
421 0xfe, 0xfe}; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
422 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
423 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
424 /* 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
|
425 `indicate-empty-lines' is non-nil. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
426 /* |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
427 ........ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
428 ..xxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
429 ........ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
430 ........ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
431 ..xxxx.. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
432 ........ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
433 */ |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
434 static unsigned short empty_line_bits[] = { |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
435 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
436 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
|
437 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
|
438 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
|
439 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
|
440 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
|
441 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
|
442 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
|
443 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
444 |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
445 #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
|
446 #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
|
447 #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
|
448 |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
449 /* 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
|
450 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
|
451 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
452 struct fringe_bitmap standard_bitmaps[] = |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
453 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
454 { 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
|
455 { 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
|
456 { 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
|
457 { 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
|
458 { 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
|
459 { 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
|
460 { 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
|
461 { 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
|
462 { 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
|
463 { 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
|
464 { 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
|
465 { 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
|
466 { 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
|
467 { 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
|
468 { 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
|
469 { 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
|
470 { 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
|
471 { 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
|
472 { 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
|
473 { 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
|
474 { 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
|
475 { 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
|
476 { 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
|
477 }; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
478 |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
479 #define NO_FRINGE_BITMAP 0 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
480 #define UNDEF_FRINGE_BITMAP 1 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
481 #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
|
482 |
57277
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
483 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
|
484 static Lisp_Object *fringe_faces; |
57277
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
485 static int max_fringe_bitmaps; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
486 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
487 static int 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
|
488 |
57270 | 489 |
490 /* Lookup bitmap number for symbol BITMAP. | |
491 Return 0 if not a bitmap. */ | |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
492 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
493 int |
57270 | 494 lookup_fringe_bitmap (bitmap) |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
495 Lisp_Object bitmap; |
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 int bn; |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
498 |
57270 | 499 bitmap = Fget (bitmap, Qfringe); |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
500 if (!INTEGERP (bitmap)) |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
501 return 0; |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
502 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
503 bn = XINT (bitmap); |
57270 | 504 if (bn > NO_FRINGE_BITMAP |
505 && bn < max_used_fringe_bitmap | |
506 && (bn < MAX_STANDARD_FRINGE_BITMAPS | |
507 || fringe_bitmaps[bn] != NULL)) | |
508 return bn; | |
509 | |
510 return 0; | |
57258
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 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
513 /* Get fringe bitmap name for bitmap number BN. |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
514 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
515 Found by traversing Vfringe_bitmaps comparing BN to the |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
516 fringe property for each symbol. |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
517 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
518 Return BN if not found in Vfringe_bitmaps. */ |
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 static Lisp_Object |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
521 get_fringe_bitmap_name (bn) |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
522 int bn; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
523 { |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
524 Lisp_Object bitmaps; |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
525 Lisp_Object num; |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
526 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
527 /* Zero means no bitmap -- return nil. */ |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
528 if (bn <= 0) |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
529 return Qnil; |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
530 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
531 bitmaps = Vfringe_bitmaps; |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
532 num = make_number (bn); |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
533 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
534 while (CONSP (bitmaps)) |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
535 { |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
536 Lisp_Object bitmap = XCAR (bitmaps); |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
537 if (EQ (num, Fget (bitmap, Qfringe))) |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
538 return bitmap; |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
539 bitmaps = XCDR (bitmaps); |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
540 } |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
541 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
542 return num; |
53879
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 |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
545 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
546 /* 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
|
547 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
|
548 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
|
549 drawn. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
550 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
|
551 */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
552 |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
553 static void |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
554 draw_fringe_bitmap_1 (w, row, left_p, overlay, which) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
555 struct window *w; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
556 struct glyph_row *row; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
557 int left_p, overlay; |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
558 int which; |
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 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
561 struct draw_fringe_bitmap_params p; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
562 struct fringe_bitmap *fb; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
563 int period; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
564 int face_id = DEFAULT_FACE_ID; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
565 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
566 p.cursor_p = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
567 p.overlay_p = (overlay & 1) == 1; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
568 p.cursor_p = (overlay & 2) == 2; |
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 if (which != NO_FRINGE_BITMAP) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
571 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
572 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
573 else if (left_p) |
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 which = row->left_fringe_bitmap; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
576 face_id = row->left_fringe_face_id; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
577 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
578 else |
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 which = row->right_fringe_bitmap; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
581 face_id = row->right_fringe_face_id; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
582 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
583 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
584 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
|
585 { |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
586 Lisp_Object face; |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
587 |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
588 if ((face = fringe_faces[which], NILP (face)) |
60834
94900ab8eef0
(draw_fringe_bitmap_1, Fset_fringe_bitmap_face):
Kim F. Storm <storm@cua.dk>
parents:
59581
diff
changeset
|
589 || (face_id = lookup_derived_face (f, face, 'A', FRINGE_FACE_ID, 0), |
94900ab8eef0
(draw_fringe_bitmap_1, Fset_fringe_bitmap_face):
Kim F. Storm <storm@cua.dk>
parents:
59581
diff
changeset
|
590 face_id < 0)) |
59401
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
591 face_id = FRINGE_FACE_ID; |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
592 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
593 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
594 fb = fringe_bitmaps[which]; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
595 if (fb == NULL) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
596 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
|
597 ? which : UNDEF_FRINGE_BITMAP]; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
598 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
599 period = fb->period; |
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 /* Convert row to frame coordinates. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
602 p.y = WINDOW_TO_FRAME_PIXEL_Y (w, row->y); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
603 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
604 p.which = which; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
605 p.bits = fb->bits; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
606 p.wd = fb->width; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
607 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
608 p.h = fb->height; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
609 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
|
610 p.h -= p.dh; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
611 /* Clip bitmap if too high. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
612 if (p.h > row->height) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
613 p.h = row->height; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
614 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
615 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
|
616 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
617 if (p.face == NULL) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
618 { |
59401
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
619 /* 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
|
620 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
|
621 return; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
622 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
623 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
624 PREPARE_FACE_FOR_DISPLAY (f, p.face); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
625 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
626 /* 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
|
627 the fringe. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
628 p.bx = -1; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
629 if (left_p) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
630 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
631 int wd = WINDOW_LEFT_FRINGE_WIDTH (w); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
632 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
|
633 ? LEFT_MARGIN_AREA |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
634 : TEXT_AREA)); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
635 if (p.wd > wd) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
636 p.wd = wd; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
637 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
|
638 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
639 if (p.wd < wd || row->height > p.h) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
640 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
641 /* 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
|
642 wd -= ((!WINDOW_LEFTMOST_P (w) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
643 && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
644 ? 1 : 0); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
645 p.bx = x - wd; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
646 p.nx = wd; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
647 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
648 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
649 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
650 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
651 int x = window_box_right (w, |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
652 (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
653 ? RIGHT_MARGIN_AREA |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
654 : TEXT_AREA)); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
655 int wd = WINDOW_RIGHT_FRINGE_WIDTH (w); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
656 if (p.wd > wd) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
657 p.wd = wd; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
658 p.x = x + (wd - p.wd) / 2; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
659 /* 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
|
660 the fringe. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
661 if (p.wd < wd || row->height > p.h) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
662 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
663 p.bx = x; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
664 p.nx = wd; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
665 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
666 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
667 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
668 if (p.bx >= 0) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
669 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
670 int header_line_height = WINDOW_HEADER_LINE_HEIGHT (w); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
671 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
672 p.by = WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height, row->y)); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
673 p.ny = row->visible_height; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
674 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
675 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
676 /* Adjust y to the offset in the row to start drawing the bitmap. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
677 switch (fb->align) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
678 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
679 case ALIGN_BITMAP_CENTER: |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
680 p.y += (row->height - p.h) / 2; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
681 break; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
682 case ALIGN_BITMAP_BOTTOM: |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
683 p.h = fb->height; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
684 p.y += (row->visible_height - p.h); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
685 break; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
686 case ALIGN_BITMAP_TOP: |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
687 break; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
688 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
689 |
83037
03a73693678e
Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents:
53970
diff
changeset
|
690 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
|
691 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
692 |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
693 static int |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
694 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
|
695 struct window *w; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
696 Lisp_Object cursor; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
697 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
698 Lisp_Object cmap, bm = Qnil; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
699 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
700 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
|
701 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
702 bm = Fassq (cursor, cmap); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
703 if (CONSP (bm)) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
704 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
705 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
|
706 return NO_FRINGE_BITMAP; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
707 return lookup_fringe_bitmap (bm); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
708 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
709 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
710 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
|
711 return NO_FRINGE_BITMAP; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
712 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
|
713 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
|
714 return NO_FRINGE_BITMAP; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
715 return lookup_fringe_bitmap (bm); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
716 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
717 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
718 static int |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
719 get_logical_fringe_bitmap (w, bitmap, right_p, partial_p) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
720 struct window *w; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
721 Lisp_Object bitmap; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
722 int right_p, partial_p; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
723 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
724 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
|
725 int ln1 = 0, ln2 = 0; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
726 int ix1 = right_p; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
727 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
|
728 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
729 /* 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
|
730 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
731 Elements are: |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
732 BITMAP -- use for all |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
733 (L R) -- use for left right (whether partial or not) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
734 (L R PL PR) -- use for left rigth partial-left partial-right |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
735 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
|
736 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
737 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
|
738 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
|
739 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
740 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
|
741 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
742 bm1 = Fassq (bitmap, cmap); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
743 if (CONSP (bm1)) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
744 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
745 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
|
746 return NO_FRINGE_BITMAP; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
747 if (CONSP (bm1)) |
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 ln1 = XINT (Flength (bm1)); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
750 if (partial_p) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
751 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
752 if (ln1 > ix2) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
753 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
754 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
|
755 if (!EQ (bm, Qt)) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
756 goto found; |
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 else |
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 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
769 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
|
770 goto found; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
771 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
772 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
773 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
774 if (!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
|
775 && !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
|
776 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
777 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
|
778 if (CONSP (bm2)) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
779 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
780 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
|
781 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
782 if (CONSP (bm2)) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
783 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
784 ln2 = XINT (Flength (bm2)); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
785 if (partial_p) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
786 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
787 if (ln2 > ix2) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
788 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
789 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
|
790 if (!EQ (bm, Qt)) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
791 goto found; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
792 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
793 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
794 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
795 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
796 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
797 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
798 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
799 if (ln1 > ix1) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
800 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
801 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
|
802 if (!EQ (bm, Qt)) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
803 goto found; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
804 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
805 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
806 if (ln2 > ix1) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
807 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
808 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
|
809 if (!EQ (bm, Qt)) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
810 goto found; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
811 return NO_FRINGE_BITMAP; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
812 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
813 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
|
814 return NO_FRINGE_BITMAP; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
815 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
816 found: |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
817 return lookup_fringe_bitmap (bm); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
818 } |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
819 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
820 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
821 void |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
822 draw_fringe_bitmap (w, row, left_p) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
823 struct window *w; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
824 struct glyph_row *row; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
825 int left_p; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
826 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
827 int overlay = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
828 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
829 if (!left_p && row->cursor_in_fringe_p) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
830 { |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
831 Lisp_Object cursor = Qnil; |
53879
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 switch (w->phys_cursor_type) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
834 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
835 case HOLLOW_BOX_CURSOR: |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
836 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
|
837 cursor = Qhollow; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
838 else |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
839 cursor = Qhollow_small; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
840 break; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
841 case FILLED_BOX_CURSOR: |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
842 cursor = Qbox; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
843 break; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
844 case BAR_CURSOR: |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
845 cursor = Qbar; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
846 break; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
847 case HBAR_CURSOR: |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
848 cursor = Qhbar; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
849 break; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
850 case NO_CURSOR: |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
851 default: |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
852 w->phys_cursor_on_p = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
853 row->cursor_in_fringe_p = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
854 break; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
855 } |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
856 if (!NILP (cursor)) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
857 { |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
858 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
|
859 if (bm != NO_FRINGE_BITMAP) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
860 { |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
861 draw_fringe_bitmap_1 (w, row, 0, 2, bm); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
862 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
|
863 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
864 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
865 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
866 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
867 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
|
868 |
61634
e188b7249c28
(draw_fringe_bitmap): Use overlay_arrow_bitmap from row
Kim F. Storm <storm@cua.dk>
parents:
60834
diff
changeset
|
869 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
|
870 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
|
871 } |
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 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
874 /* 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
|
875 function with input blocked. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
876 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
877 void |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
878 draw_row_fringe_bitmaps (w, row) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
879 struct window *w; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
880 struct glyph_row *row; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
881 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
882 xassert (interrupt_input_blocked); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
883 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
884 /* 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
|
885 don't have to draw anything. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
886 if (row->visible_height <= 0) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
887 return; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
888 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
889 if (WINDOW_LEFT_FRINGE_WIDTH (w) != 0) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
890 draw_fringe_bitmap (w, row, 1); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
891 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
892 if (WINDOW_RIGHT_FRINGE_WIDTH (w) != 0) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
893 draw_fringe_bitmap (w, row, 0); |
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 /* 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
|
897 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
|
898 |
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
899 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
|
900 |
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
901 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
|
902 |
57371
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
903 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
|
904 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
|
905 */ |
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
906 |
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
907 int |
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
908 draw_window_fringes (w, no_fringe) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
909 struct window *w; |
57371
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
910 int no_fringe; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
911 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
912 struct glyph_row *row; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
913 int yb = window_text_bottom_y (w); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
914 int nrows = w->current_matrix->nrows; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
915 int y = 0, rn; |
57371
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
916 int updated = 0; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
917 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
918 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
|
919 return 0; |
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
920 |
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
921 /* 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
|
922 if (no_fringe |
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
923 && (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
|
924 || 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
|
925 updated++; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
926 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
927 for (y = 0, rn = 0, row = w->current_matrix->rows; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
928 y < yb && rn < nrows; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
929 y += row->height, ++row, ++rn) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
930 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
931 if (!row->redraw_fringe_bitmaps_p) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
932 continue; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
933 draw_row_fringe_bitmaps (w, row); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
934 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
|
935 updated++; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
936 } |
57371
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
937 |
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
938 return updated; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
939 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
940 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
941 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
942 /* 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
|
943 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
|
944 |
8370ced2ae75
(update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents:
64770
diff
changeset
|
945 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
|
946 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
947 int |
65062
8370ced2ae75
(update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents:
64770
diff
changeset
|
948 update_window_fringes (w, keep_current_p) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
949 struct 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
|
950 int keep_current_p; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
951 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
952 struct glyph_row *row, *cur = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
953 int yb = window_text_bottom_y (w); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
954 int rn, nrows = w->current_matrix->nrows; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
955 int y; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
956 int redraw_p = 0; |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
957 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
|
958 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
|
959 Lisp_Object empty_pos; |
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
960 Lisp_Object ind = Qnil; |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
961 #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
|
962 int bitmap_cache[MAX_BITMAP_CACHE]; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
963 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
964 if (w->pseudo_window_p) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
965 return 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
966 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
967 if (!MINI_WINDOW_P (w) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
968 && (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
|
969 { |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
970 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
|
971 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
|
972 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
|
973 { |
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
974 Lisp_Object pos; |
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
975 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
|
976 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
|
977 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
|
978 boundary_top = XCDR (pos); |
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
979 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
|
980 boundary_bot = XCDR (pos); |
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
981 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
|
982 arrow_top = XCDR (pos); |
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
983 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
|
984 arrow_bot = XCDR (pos); |
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
985 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
986 else |
58424
99a14d81043f
(update_window_fringes): Provide sensible fall-back
Kim F. Storm <storm@cua.dk>
parents:
58268
diff
changeset
|
987 /* 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
|
988 boundary_top = boundary_bot = Qleft; |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
989 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
990 |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
991 if (!NILP (ind)) |
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
992 { |
58443
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
993 int done_top = 0, done_bot = 0; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
994 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
995 for (y = 0, rn = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
996 y < yb && rn < nrows; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
997 y += row->height, ++rn) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
998 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
999 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
|
1000 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
|
1001 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1002 row = w->desired_matrix->rows + rn; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1003 if (!row->enabled_p) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1004 row = w->current_matrix->rows + rn; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1005 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1006 indicate_bob_p = row->indicate_bob_p; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1007 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
|
1008 indicate_eob_p = row->indicate_eob_p; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1009 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
|
1010 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1011 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
|
1012 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
|
1013 |
58443
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
1014 if (!row->mode_line_p) |
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
1015 { |
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
1016 if (!done_top) |
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
1017 { |
65066
67861e2e09d6
* fringe.c (update_window_fringes): Only put TOP and BOTTOM
Kim F. Storm <storm@cua.dk>
parents:
65062
diff
changeset
|
1018 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
|
1019 && !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
|
1020 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
|
1021 else |
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
1022 row->indicate_top_line_p = !NILP (arrow_top); |
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
1023 done_top = 1; |
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
1024 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1025 |
58443
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
1026 if (!done_bot) |
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
1027 { |
66622
cf3d316b4bc0
(update_window_fringes): Undo 2005-10-27 change.
Kim F. Storm <storm@cua.dk>
parents:
66471
diff
changeset
|
1028 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
|
1029 && !MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row)) |
58443
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
1030 row->indicate_eob_p = !NILP (boundary_bot), done_bot = 1; |
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
1031 else if (y + row->height >= yb) |
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
1032 row->indicate_bottom_line_p = !NILP (arrow_bot), done_bot = 1; |
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
1033 } |
4e571414ba22
(update_window_fringes): Show top row indicator if
Kim F. Storm <storm@cua.dk>
parents:
58424
diff
changeset
|
1034 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1035 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1036 if (indicate_bob_p != row->indicate_bob_p |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1037 || 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
|
1038 || indicate_eob_p != row->indicate_eob_p |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1039 || indicate_bottom_line_p != row->indicate_bottom_line_p) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1040 row->redraw_fringe_bitmaps_p = 1; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1041 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1042 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1043 |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
1044 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
|
1045 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
|
1046 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
|
1047 |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1048 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
|
1049 bitmap_cache[y] = -1; |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1050 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1051 #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
|
1052 (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
|
1053 ? 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
|
1054 : (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
|
1055 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
|
1056 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1057 #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
|
1058 (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
|
1059 ? 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
|
1060 : (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
|
1061 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
|
1062 |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1063 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1064 for (y = 0, rn = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1065 y < yb && rn < nrows; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1066 y += row->height, rn++) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1067 { |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1068 int left, right; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1069 unsigned left_face_id, right_face_id; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1070 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1071 row = w->desired_matrix->rows + rn; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1072 cur = w->current_matrix->rows + rn; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1073 if (!row->enabled_p) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1074 row = cur; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1075 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1076 left_face_id = right_face_id = DEFAULT_FACE_ID; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1077 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1078 /* 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
|
1079 if (WINDOW_LEFT_FRINGE_WIDTH (w) == 0) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1080 left = NO_FRINGE_BITMAP; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1081 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
|
1082 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1083 left = row->left_user_fringe_bitmap; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1084 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
|
1085 } |
58532
6fee0102eafe
(update_window_fringes): Prefer truncation bitmaps over
Kim F. Storm <storm@cua.dk>
parents:
58443
diff
changeset
|
1086 else if (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
|
1087 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
|
1088 else if (row->indicate_bob_p && EQ (boundary_top, Qleft)) |
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
1089 left = ((row->indicate_eob_p && EQ (boundary_bot, Qleft)) |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1090 ? LEFT_FRINGE (1, Qtop_bottom, row->ends_at_zv_p) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1091 : LEFT_FRINGE (2, Qtop, 0)); |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
1092 else if (row->indicate_eob_p && EQ (boundary_bot, Qleft)) |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1093 left = LEFT_FRINGE (3, Qbottom, row->ends_at_zv_p); |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1094 else if (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
|
1095 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
|
1096 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
|
1097 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
|
1098 else if (row->indicate_top_line_p && EQ (arrow_top, Qleft)) |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1099 left = LEFT_FRINGE (6, Qup, 0); |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
1100 else if (row->indicate_bottom_line_p && EQ (arrow_bot, Qleft)) |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1101 left = LEFT_FRINGE (7, Qdown, 0); |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1102 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1103 left = NO_FRINGE_BITMAP; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1104 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1105 /* 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
|
1106 if (WINDOW_RIGHT_FRINGE_WIDTH (w) == 0) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1107 right = NO_FRINGE_BITMAP; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1108 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
|
1109 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1110 right = row->right_user_fringe_bitmap; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1111 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
|
1112 } |
58532
6fee0102eafe
(update_window_fringes): Prefer truncation bitmaps over
Kim F. Storm <storm@cua.dk>
parents:
58443
diff
changeset
|
1113 else if (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
|
1114 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
|
1115 else if (row->indicate_bob_p && EQ (boundary_top, Qright)) |
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
1116 right = ((row->indicate_eob_p && EQ (boundary_bot, Qright)) |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1117 ? RIGHT_FRINGE (1, Qtop_bottom, row->ends_at_zv_p) |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1118 : RIGHT_FRINGE (2, Qtop, 0)); |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
1119 else if (row->indicate_eob_p && EQ (boundary_bot, Qright)) |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1120 right = RIGHT_FRINGE (3, Qbottom, row->ends_at_zv_p); |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1121 else if (row->continued_p) |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1122 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
|
1123 else if (row->indicate_top_line_p && EQ (arrow_top, Qright)) |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1124 right = RIGHT_FRINGE (6, Qup, 0); |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
1125 else if (row->indicate_bottom_line_p && EQ (arrow_bot, Qright)) |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1126 right = RIGHT_FRINGE (7, Qdown, 0); |
57246
36ab9b017a42
(update_window_fringes): Handle new formats of
Kim F. Storm <storm@cua.dk>
parents:
54230
diff
changeset
|
1127 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
|
1128 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
|
1129 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1130 right = NO_FRINGE_BITMAP; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1131 |
65062
8370ced2ae75
(update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents:
64770
diff
changeset
|
1132 if (row->y != cur->y |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1133 || 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
|
1134 || 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
|
1135 || left != cur->left_fringe_bitmap |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1136 || right != cur->right_fringe_bitmap |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1137 || 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
|
1138 || right_face_id != cur->right_fringe_face_id |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1139 || cur->redraw_fringe_bitmaps_p) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1140 { |
65062
8370ced2ae75
(update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents:
64770
diff
changeset
|
1141 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
|
1142 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
|
1143 { |
8370ced2ae75
(update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents:
64770
diff
changeset
|
1144 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
|
1145 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
|
1146 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
|
1147 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
|
1148 cur->right_fringe_face_id = right_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
|
1149 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1150 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1151 |
69616
c00e99faf809
(draw_fringe_bitmap): Don't calculate default overlay arrow
Kim F. Storm <storm@cua.dk>
parents:
69490
diff
changeset
|
1152 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
|
1153 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
|
1154 |
61634
e188b7249c28
(draw_fringe_bitmap): Use overlay_arrow_bitmap from row
Kim F. Storm <storm@cua.dk>
parents:
60834
diff
changeset
|
1155 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
|
1156 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1157 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
|
1158 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
|
1159 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1160 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1161 row->left_fringe_bitmap = left; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1162 row->right_fringe_bitmap = right; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1163 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
|
1164 row->right_fringe_face_id = right_face_id; |
58057
33d7af04fba1
(update_window_fringes): Update fringe bitmaps if
Kim F. Storm <storm@cua.dk>
parents:
57371
diff
changeset
|
1165 |
33d7af04fba1
(update_window_fringes): Update fringe bitmaps if
Kim F. Storm <storm@cua.dk>
parents:
57371
diff
changeset
|
1166 if (rn > 0 && row->redraw_fringe_bitmaps_p) |
33d7af04fba1
(update_window_fringes): Update fringe bitmaps if
Kim F. Storm <storm@cua.dk>
parents:
57371
diff
changeset
|
1167 row[-1].redraw_fringe_bitmaps_p = cur[-1].redraw_fringe_bitmaps_p = 1; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1168 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1169 |
65062
8370ced2ae75
(update_window_fringes): Replace FORCE_P arg with KEEP_CURRENT_P arg;
Kim F. Storm <storm@cua.dk>
parents:
64770
diff
changeset
|
1170 return redraw_p && !keep_current_p; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1171 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1172 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1173 |
54220
50ba59282051
(Fdefine_fringe_bitmap): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
54079
diff
changeset
|
1174 /* 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
|
1175 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1176 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
|
1177 modified and F is visible. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1178 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1179 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
|
1180 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
|
1181 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
|
1182 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
|
1183 |
57371
3c27c0be625d
(draw_window_fringes): Return value now indicates if
Kim F. Storm <storm@cua.dk>
parents:
57316
diff
changeset
|
1184 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
|
1185 */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1186 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1187 void |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1188 compute_fringe_widths (f, redraw) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1189 struct frame *f; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1190 int redraw; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1191 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1192 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
|
1193 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
|
1194 int o_cols = FRAME_FRINGE_COLS (f); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1195 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1196 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
|
1197 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
|
1198 int left_fringe_width, right_fringe_width; |
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 if (!NILP (left_fringe)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1201 left_fringe = Fcdr (left_fringe); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1202 if (!NILP (right_fringe)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1203 right_fringe = Fcdr (right_fringe); |
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 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
|
1206 XINT (left_fringe)); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1207 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
|
1208 XINT (right_fringe)); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1209 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1210 if (left_fringe_width || right_fringe_width) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1211 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1212 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
|
1213 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
|
1214 int conf_wid = left_wid + right_wid; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1215 int font_wid = FRAME_COLUMN_WIDTH (f); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1216 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
|
1217 int real_wid = cols * font_wid; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1218 if (left_wid && right_wid) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1219 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1220 if (left_fringe_width < 0) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1221 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1222 /* 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
|
1223 FRAME_LEFT_FRINGE_WIDTH (f) = left_wid; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1224 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
|
1225 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1226 else if (right_fringe_width < 0) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1227 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1228 /* 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
|
1229 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
|
1230 FRAME_RIGHT_FRINGE_WIDTH (f) = right_wid; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1231 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1232 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1233 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1234 /* Adjust both fringes with an equal amount. |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1235 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
|
1236 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
|
1237 int fill = real_wid - conf_wid; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1238 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
|
1239 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
|
1240 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1241 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1242 else if (left_fringe_width) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1243 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1244 FRAME_LEFT_FRINGE_WIDTH (f) = real_wid; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1245 FRAME_RIGHT_FRINGE_WIDTH (f) = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1246 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1247 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1248 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1249 FRAME_LEFT_FRINGE_WIDTH (f) = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1250 FRAME_RIGHT_FRINGE_WIDTH (f) = real_wid; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1251 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1252 FRAME_FRINGE_COLS (f) = cols; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1253 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1254 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1255 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1256 FRAME_LEFT_FRINGE_WIDTH (f) = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1257 FRAME_RIGHT_FRINGE_WIDTH (f) = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1258 FRAME_FRINGE_COLS (f) = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1259 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1260 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1261 if (redraw && FRAME_VISIBLE_P (f)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1262 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
|
1263 o_right != FRAME_RIGHT_FRINGE_WIDTH (f) || |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1264 o_cols != FRAME_FRINGE_COLS (f)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1265 redraw_frame (f); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1266 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1267 |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1268 |
57270 | 1269 /* Free resources used by a user-defined bitmap. */ |
1270 | |
58089
fb4cd138f0b8
(destroy_fringe_bitmap): Fix return type.
Kim F. Storm <storm@cua.dk>
parents:
58057
diff
changeset
|
1271 void |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1272 destroy_fringe_bitmap (n) |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1273 int n; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1274 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1275 struct fringe_bitmap **fbp; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1276 |
59401
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1277 fringe_faces[n] = Qnil; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1278 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1279 fbp = &fringe_bitmaps[n]; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1280 if (*fbp && (*fbp)->dynamic) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1281 { |
83037
03a73693678e
Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents:
53970
diff
changeset
|
1282 /* XXX Is SELECTED_FRAME OK here? */ |
83212 | 1283 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
|
1284 if (rif && rif->destroy_fringe_bitmap) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1285 rif->destroy_fringe_bitmap (n); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1286 xfree (*fbp); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1287 *fbp = NULL; |
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 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1290 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
|
1291 && 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
|
1292 max_used_fringe_bitmap--; |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1293 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1294 |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1295 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1296 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
|
1297 1, 1, 0, |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1298 doc: /* Destroy fringe bitmap BITMAP. |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1299 If BITMAP overrides a standard fringe bitmap, the original bitmap is restored. */) |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1300 (bitmap) |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1301 Lisp_Object bitmap; |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1302 { |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1303 int n; |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1304 |
57270 | 1305 CHECK_SYMBOL (bitmap); |
1306 n = lookup_fringe_bitmap (bitmap); | |
1307 if (!n) | |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1308 return Qnil; |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1309 |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1310 destroy_fringe_bitmap (n); |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1311 |
57270 | 1312 if (n >= MAX_STANDARD_FRINGE_BITMAPS) |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1313 { |
57270 | 1314 Vfringe_bitmaps = Fdelq (bitmap, Vfringe_bitmaps); |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1315 /* It would be better to remove the fringe property. */ |
57270 | 1316 Fput (bitmap, Qfringe, Qnil); |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1317 } |
57270 | 1318 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1319 return Qnil; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1320 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1321 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1322 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1323 /* Initialize bitmap bit. |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1324 |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1325 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
|
1326 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
|
1327 |
53955
7d8c228c1f02
(init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents:
53940
diff
changeset
|
1328 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
|
1329 |
7d8c228c1f02
(init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents:
53940
diff
changeset
|
1330 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
|
1331 */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1332 |
84559
acac15277b75
(init_fringe_bitmap) <swap nibble>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84541
diff
changeset
|
1333 #if defined (HAVE_X_WINDOWS) |
acac15277b75
(init_fringe_bitmap) <swap nibble>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84541
diff
changeset
|
1334 static unsigned char swap_nibble[16] = { |
acac15277b75
(init_fringe_bitmap) <swap nibble>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84541
diff
changeset
|
1335 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
|
1336 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
|
1337 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
|
1338 0x3, 0xb, 0x7, 0xf}; /* 0011 1011 0111 1111 */ |
acac15277b75
(init_fringe_bitmap) <swap nibble>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84541
diff
changeset
|
1339 #endif /* HAVE_X_WINDOWS */ |
acac15277b75
(init_fringe_bitmap) <swap nibble>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
84541
diff
changeset
|
1340 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1341 void |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1342 init_fringe_bitmap (which, fb, once_p) |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1343 int which; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1344 struct fringe_bitmap *fb; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1345 int once_p; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1346 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1347 if (once_p || fb->dynamic) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1348 { |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1349 #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
|
1350 unsigned short *bits = fb->bits; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1351 int j; |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1352 |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1353 if (fb->width <= 8) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1354 { |
53936
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1355 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
|
1356 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
|
1357 { |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1358 unsigned short b = *bits++; |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1359 unsigned char c; |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1360 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
|
1361 | (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
|
1362 *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
|
1363 } |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1364 } |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1365 else |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1366 { |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1367 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
|
1368 { |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1369 unsigned short b = *bits; |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1370 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
|
1371 | (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
|
1372 | (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
|
1373 | (swap_nibble[(b>>12) & 0xf])); |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1374 *bits++ = (b >> (16 - fb->width)); |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1375 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1376 } |
53955
7d8c228c1f02
(init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents:
53940
diff
changeset
|
1377 #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
|
1378 |
7d8c228c1f02
(init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents:
53940
diff
changeset
|
1379 #if defined (MAC_OS) && defined (WORDS_BIG_ENDIAN) |
7d8c228c1f02
(init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents:
53940
diff
changeset
|
1380 unsigned short *bits = fb->bits; |
53970
2362f6a6a58a
(init_fringe_bitmap): Define j in MAC_OS code.
Stephen Eglen <stephen@gnu.org>
parents:
53966
diff
changeset
|
1381 int j; |
53955
7d8c228c1f02
(init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents:
53940
diff
changeset
|
1382 for (j = 0; j < fb->height; j++) |
7d8c228c1f02
(init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents:
53940
diff
changeset
|
1383 { |
7d8c228c1f02
(init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents:
53940
diff
changeset
|
1384 unsigned short b = *bits; |
7d8c228c1f02
(init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents:
53940
diff
changeset
|
1385 *bits++ = ((b >> 8) & 0xff) | ((b & 0xff) << 8); |
7d8c228c1f02
(init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents:
53940
diff
changeset
|
1386 } |
7d8c228c1f02
(init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents:
53940
diff
changeset
|
1387 #endif /* MAC_OS && WORDS_BIG_ENDIAN */ |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1388 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1389 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1390 if (!once_p) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1391 { |
83214
2bd6d4c2d21c
Removed C99ism in init_fringe_bitmap.
Karoly Lorentey <lorentey@elte.hu>
parents:
83213
diff
changeset
|
1392 /* XXX Is SELECTED_FRAME OK here? */ |
2bd6d4c2d21c
Removed C99ism in init_fringe_bitmap.
Karoly Lorentey <lorentey@elte.hu>
parents:
83213
diff
changeset
|
1393 struct redisplay_interface *rif = FRAME_RIF (SELECTED_FRAME ()); |
2bd6d4c2d21c
Removed C99ism in init_fringe_bitmap.
Karoly Lorentey <lorentey@elte.hu>
parents:
83213
diff
changeset
|
1394 |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1395 destroy_fringe_bitmap (which); |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1396 |
57267
617e54beffb6
* fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents:
57258
diff
changeset
|
1397 if (rif && rif->define_fringe_bitmap) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1398 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
|
1399 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1400 fringe_bitmaps[which] = fb; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1401 if (which >= max_used_fringe_bitmap) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1402 max_used_fringe_bitmap = which + 1; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1403 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1404 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1405 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1406 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1407 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
|
1408 2, 5, 0, |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1409 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
|
1410 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
|
1411 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
|
1412 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
|
1413 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
|
1414 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
|
1415 indicating the positioning of the bitmap relative to the rows where it |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1416 is used; the default is to center the bitmap. Fourth arg may also be a |
4dd0e0a7fd9e
(struct fringe_bitmap): Change member bits from char to
Kim F. Storm <storm@cua.dk>
parents:
53900
diff
changeset
|
1417 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
|
1418 should be repeated. |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1419 If BITMAP already exists, the existing definition is replaced. */) |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1420 (bitmap, bits, height, width, align) |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1421 Lisp_Object bitmap, bits, height, width, align; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1422 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1423 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
|
1424 unsigned short *b; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1425 struct fringe_bitmap fb, *xfb; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1426 int fill1 = 0, fill2 = 0; |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1427 |
57270 | 1428 CHECK_SYMBOL (bitmap); |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1429 |
58268
fc159de41e11
(Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
58089
diff
changeset
|
1430 if (STRINGP (bits)) |
fc159de41e11
(Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
58089
diff
changeset
|
1431 h = SCHARS (bits); |
fc159de41e11
(Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
58089
diff
changeset
|
1432 else if (VECTORP (bits)) |
fc159de41e11
(Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
58089
diff
changeset
|
1433 h = XVECTOR (bits)->size; |
fc159de41e11
(Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
58089
diff
changeset
|
1434 else |
71834
bf40c8c83e7a
(Fdefine_fringe_bitmap): Cleanup wrong_type_argument use.
Kim F. Storm <storm@cua.dk>
parents:
71659
diff
changeset
|
1435 wrong_type_argument (Qsequencep, bits); |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1436 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1437 if (NILP (height)) |
58268
fc159de41e11
(Fdefine_fringe_bitmap): Always set 'h'. Simplify.
Kim F. Storm <storm@cua.dk>
parents:
58089
diff
changeset
|
1438 fb.height = h; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1439 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1440 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1441 CHECK_NUMBER (height); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1442 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
|
1443 if (fb.height > h) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1444 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1445 fill1 = (fb.height - h) / 2; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1446 fill2 = fb.height - h - fill1; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1447 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1448 } |
54220
50ba59282051
(Fdefine_fringe_bitmap): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
54079
diff
changeset
|
1449 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1450 if (NILP (width)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1451 fb.width = 8; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1452 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1453 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1454 CHECK_NUMBER (width); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1455 fb.width = min (XINT (width), 255); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1456 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1457 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1458 fb.period = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1459 fb.align = ALIGN_BITMAP_CENTER; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1460 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1461 if (CONSP (align)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1462 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1463 Lisp_Object period = XCDR (align); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1464 if (CONSP (period)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1465 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1466 period = XCAR (period); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1467 if (!NILP (period)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1468 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1469 fb.period = fb.height; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1470 fb.height = 255; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1471 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1472 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1473 align = XCAR (align); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1474 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1475 if (EQ (align, Qtop)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1476 fb.align = ALIGN_BITMAP_TOP; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1477 else if (EQ (align, Qbottom)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1478 fb.align = ALIGN_BITMAP_BOTTOM; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1479 else if (!NILP (align) && !EQ (align, Qcenter)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1480 error ("Bad align argument"); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1481 |
57277
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1482 n = lookup_fringe_bitmap (bitmap); |
57270 | 1483 if (!n) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1484 { |
57277
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1485 if (max_used_fringe_bitmap < max_fringe_bitmaps) |
53966
26dc8943ee64
Lisp_Object/int mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53955
diff
changeset
|
1486 n = max_used_fringe_bitmap++; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1487 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1488 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1489 for (n = MAX_STANDARD_FRINGE_BITMAPS; |
57277
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1490 n < max_fringe_bitmaps; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1491 n++) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1492 if (fringe_bitmaps[n] == NULL) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1493 break; |
57277
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1494 |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1495 if (n == max_fringe_bitmaps) |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1496 { |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1497 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
|
1498 error ("No free fringe bitmap slots"); |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1499 |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1500 i = max_fringe_bitmaps; |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1501 max_fringe_bitmaps += 20; |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1502 fringe_bitmaps |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1503 = ((struct fringe_bitmap **) |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1504 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
|
1505 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
|
1506 = (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
|
1507 |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1508 for (; i < max_fringe_bitmaps; i++) |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1509 { |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1510 fringe_bitmaps[i] = NULL; |
59401
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1511 fringe_faces[i] = Qnil; |
57277
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1512 } |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1513 } |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1514 } |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1515 |
57270 | 1516 Vfringe_bitmaps = Fcons (bitmap, Vfringe_bitmaps); |
1517 Fput (bitmap, Qfringe, make_number (n)); | |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1518 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1519 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1520 fb.dynamic = 1; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1521 |
54079
e1b6171f91b8
(Fdefine_fringe_bitmap): Use && instead of & to avoid
Andreas Schwab <schwab@suse.de>
parents:
53970
diff
changeset
|
1522 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
|
1523 + fb.height * BYTES_PER_BITMAP_ROW); |
e1b6171f91b8
(Fdefine_fringe_bitmap): Use && instead of & to avoid
Andreas Schwab <schwab@suse.de>
parents:
53970
diff
changeset
|
1524 fb.bits = b = (unsigned short *) (xfb + 1); |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1525 bzero (b, fb.height); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1526 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1527 j = 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1528 while (j < fb.height) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1529 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1530 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
|
1531 b[j++] = 0; |
54079
e1b6171f91b8
(Fdefine_fringe_bitmap): Use && instead of & to avoid
Andreas Schwab <schwab@suse.de>
parents:
53970
diff
changeset
|
1532 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
|
1533 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1534 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
|
1535 b[j++] = NUMBERP (elt) ? XINT (elt) : 0; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1536 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1537 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
|
1538 b[j++] = 0; |
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 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1541 *xfb = fb; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1542 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1543 init_fringe_bitmap (n, xfb, 0); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1544 |
57270 | 1545 return bitmap; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1546 } |
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 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
|
1549 1, 2, 0, |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1550 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
|
1551 If FACE is nil, reset face to default fringe face. */) |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1552 (bitmap, face) |
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1553 Lisp_Object bitmap, face; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1554 { |
57270 | 1555 int n; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1556 int face_id; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1557 |
57270 | 1558 CHECK_SYMBOL (bitmap); |
1559 n = lookup_fringe_bitmap (bitmap); | |
1560 if (!n) | |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1561 error ("Undefined fringe bitmap"); |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1562 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1563 if (!NILP (face)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1564 { |
60834
94900ab8eef0
(draw_fringe_bitmap_1, Fset_fringe_bitmap_face):
Kim F. Storm <storm@cua.dk>
parents:
59581
diff
changeset
|
1565 face_id = lookup_derived_face (SELECTED_FRAME (), face, |
94900ab8eef0
(draw_fringe_bitmap_1, Fset_fringe_bitmap_face):
Kim F. Storm <storm@cua.dk>
parents:
59581
diff
changeset
|
1566 'A', FRINGE_FACE_ID, 1); |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1567 if (face_id < 0) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1568 error ("No such face"); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1569 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1570 |
59401
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1571 fringe_faces[n] = face; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1572 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1573 return Qnil; |
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 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
|
1577 0, 2, 0, |
54220
50ba59282051
(Fdefine_fringe_bitmap): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
54079
diff
changeset
|
1578 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
|
1579 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
|
1580 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
|
1581 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
|
1582 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
|
1583 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
|
1584 Return nil if POS is not visible in WINDOW. */) |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1585 (pos, window) |
53940
33cf8d1b409d
(Ffringe_bitmaps_at_pos): Add missing arg declarations.
Kim F. Storm <storm@cua.dk>
parents:
53936
diff
changeset
|
1586 Lisp_Object pos, window; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1587 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1588 struct window *w; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1589 struct glyph_row *row; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1590 int textpos; |
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 if (NILP (window)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1593 window = selected_window; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1594 CHECK_WINDOW (window); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1595 w = XWINDOW (window); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1596 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1597 if (!NILP (pos)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1598 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1599 CHECK_NUMBER_COERCE_MARKER (pos); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1600 textpos = XINT (pos); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1601 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1602 else if (w == XWINDOW (selected_window)) |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1603 textpos = PT; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1604 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1605 textpos = XMARKER (w->pointm)->charpos; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1606 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1607 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
|
1608 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
|
1609 if (row) |
57316
3eb68ef1dcb7
(Ffringe_bitmaps_at_pos): Change return value from cons
Kim F. Storm <storm@cua.dk>
parents:
57277
diff
changeset
|
1610 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
|
1611 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
|
1612 (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
|
1613 : 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
|
1614 : 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
|
1615 else |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1616 return Qnil; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1617 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1618 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1619 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1620 /*********************************************************************** |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1621 Initialization |
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 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1624 void |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1625 syms_of_fringe () |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1626 { |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1627 Qtruncation = intern ("truncation"); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1628 staticpro (&Qtruncation); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1629 Qcontinuation = intern ("continuation"); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1630 staticpro (&Qcontinuation); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1631 Qoverlay_arrow = intern ("overlay-arrow"); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1632 staticpro (&Qoverlay_arrow); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1633 Qempty_line = intern ("empty-line"); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1634 staticpro (&Qempty_line); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1635 Qtop_bottom = intern ("top-bottom"); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1636 staticpro (&Qtop_bottom); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1637 Qhollow_small = intern ("hollow-small"); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1638 staticpro (&Qhollow_small); |
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1639 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1640 defsubr (&Sdestroy_fringe_bitmap); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1641 defsubr (&Sdefine_fringe_bitmap); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1642 defsubr (&Sfringe_bitmaps_at_pos); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1643 defsubr (&Sset_fringe_bitmap_face); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1644 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1645 DEFVAR_LISP ("overflow-newline-into-fringe", &Voverflow_newline_into_fringe, |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1646 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
|
1647 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
|
1648 (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
|
1649 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
|
1650 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
|
1651 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
|
1652 Voverflow_newline_into_fringe = Qt; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1653 |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1654 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
|
1655 doc: /* List of fringe bitmap symbols. */); |
57258
36eef73e00fa
(Vfringe_bitmaps): New variable.
Kim F. Storm <storm@cua.dk>
parents:
57246
diff
changeset
|
1656 Vfringe_bitmaps = Qnil; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1657 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1658 |
59401
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1659 /* Garbage collection hook */ |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1660 |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1661 void |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1662 mark_fringe_data () |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1663 { |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1664 int i; |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1665 |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1666 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
|
1667 if (!NILP (fringe_faces[i])) |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1668 mark_object (fringe_faces[i]); |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1669 } |
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1670 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1671 /* Initialize this module when Emacs starts. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1672 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1673 void |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1674 init_fringe_once () |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1675 { |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1676 int bt; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1677 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1678 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
|
1679 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
|
1680 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1681 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1682 void |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1683 init_fringe () |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1684 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1685 int i; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1686 |
57277
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1687 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
|
1688 |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1689 fringe_bitmaps |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1690 = (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
|
1691 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
|
1692 = (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
|
1693 |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1694 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
|
1695 { |
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1696 fringe_bitmaps[i] = NULL; |
59401
8f5e8e079790
(fringe_faces): Change to Lisp_Object pointer.
Kim F. Storm <storm@cua.dk>
parents:
58532
diff
changeset
|
1697 fringe_faces[i] = Qnil; |
57277
85230b6628b3
Remove limit on number of bitmaps.
Kim F. Storm <storm@cua.dk>
parents:
57270
diff
changeset
|
1698 } |
53879
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 |
69490
a9aa9b45a386
(w32_init_fringe, w32_reset_fringes): Restore to being conditional on
Juanma Barranquero <lekktu@gmail.com>
parents:
69487
diff
changeset
|
1701 #if defined (HAVE_NTGUI) || defined (MAC_OS) |
53879
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 void |
69490
a9aa9b45a386
(w32_init_fringe, w32_reset_fringes): Restore to being conditional on
Juanma Barranquero <lekktu@gmail.com>
parents:
69487
diff
changeset
|
1704 #ifdef HAVE_NTGUI |
84541
95d7506cb981
(w32_init_fringe, mac_init_fringe): Add rif argument.
Jason Rumney <jasonr@gnu.org>
parents:
83648
diff
changeset
|
1705 w32_init_fringe (rif) |
69487
606d39d5dc60
(mac_init_fringe) [MAC_OS]: New function.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69086
diff
changeset
|
1706 #else /* MAC_OS */ |
84541
95d7506cb981
(w32_init_fringe, mac_init_fringe): Add rif argument.
Jason Rumney <jasonr@gnu.org>
parents:
83648
diff
changeset
|
1707 mac_init_fringe (rif) |
69487
606d39d5dc60
(mac_init_fringe) [MAC_OS]: New function.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69086
diff
changeset
|
1708 #endif |
84541
95d7506cb981
(w32_init_fringe, mac_init_fringe): Add rif argument.
Jason Rumney <jasonr@gnu.org>
parents:
83648
diff
changeset
|
1709 struct redisplay_interface *rif; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1710 { |
69049
28b3892bfcda
(enum fringe_bitmap_type): Remove. Change all uses
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
1711 int bt; |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1712 |
57267
617e54beffb6
* fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents:
57258
diff
changeset
|
1713 if (!rif) |
617e54beffb6
* fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents:
57258
diff
changeset
|
1714 return; |
617e54beffb6
* fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents:
57258
diff
changeset
|
1715 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1716 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
|
1717 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1718 struct fringe_bitmap *fb = &standard_bitmaps[bt]; |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1719 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
|
1720 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1721 } |
69487
606d39d5dc60
(mac_init_fringe) [MAC_OS]: New function.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69086
diff
changeset
|
1722 #endif |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1723 |
69490
a9aa9b45a386
(w32_init_fringe, w32_reset_fringes): Restore to being conditional on
Juanma Barranquero <lekktu@gmail.com>
parents:
69487
diff
changeset
|
1724 #ifdef HAVE_NTGUI |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1725 void |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1726 w32_reset_fringes () |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1727 { |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1728 /* Destroy row bitmaps. */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1729 int bt; |
83581
29192b6da477
(w32_init_fringe w32_reset_fringes) [HAVE_NTGUI]:
Jason Rumney <jasonr@gnu.org>
parents:
83554
diff
changeset
|
1730 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
|
1731 |
57267
617e54beffb6
* fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents:
57258
diff
changeset
|
1732 if (!rif) |
617e54beffb6
* fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents:
57258
diff
changeset
|
1733 return; |
617e54beffb6
* fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
Kim F. Storm <storm@cua.dk>
parents:
57258
diff
changeset
|
1734 |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1735 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
|
1736 rif->destroy_fringe_bitmap (bt); |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1737 } |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1738 |
53955
7d8c228c1f02
(init_fringe_bitmap) [MAC_OS, WORDS_BIG_ENDIAN]: Perform byte-swapping.
Kim F. Storm <storm@cua.dk>
parents:
53940
diff
changeset
|
1739 #endif /* HAVE_NTGUI */ |
53879
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1740 |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1741 #endif /* HAVE_WINDOW_SYSTEM */ |
e3771c262410
New file. Move original fringe related declarations
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1742 |
53900 | 1743 /* arch-tag: 04596920-43eb-473d-b319-82712338162d |
1744 (do not change this comment) */ |