1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
|
;;; redisplay-testsuite.el --- Test suite for redisplay.
;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
;; Author: Chong Yidong <cyd@stupidchicken.com>
;; Keywords: internal
;; Human-Keywords: internal
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
;;; Commentary:
;; Type M-x test-redisplay RET to generate the test buffer.
;;; Code:
(defun test-insert-overlay (text &rest props)
(let ((opoint (point))
overlay)
(insert text)
(setq overlay (make-overlay opoint (point)))
(while props
(overlay-put overlay (car props) (cadr props))
(setq props (cddr props)))
overlay))
(defun test-redisplay-1 ()
(insert "Test 1: Displaying adjacent and overlapping overlays:\n\n")
(insert " Expected: gnu emacs\n")
(insert " Results: ")
(test-insert-overlay "n" 'before-string "g" 'after-string "u ")
(test-insert-overlay "ma" 'before-string "e" 'after-string "cs")
(insert "\n\n")
(insert " Expected: gnu emacs\n")
(insert " Results: ")
(test-insert-overlay "u" 'before-string "gn")
(test-insert-overlay "ma" 'before-string " e" 'after-string "cs")
(insert "\n\n")
(insert " Expected: gnu emacs\n")
(insert " Results: ")
(test-insert-overlay "XXX" 'display "u "
'before-string "gn" 'after-string "em")
(test-insert-overlay "a" 'after-string "cs")
(insert "\n\n")
(insert " Expected: gnu emacs\n")
(insert " Results: ")
(test-insert-overlay "u " 'before-string "gn" 'after-string "em")
(test-insert-overlay "XXX" 'display "a" 'after-string "cs")
(insert "\n\n"))
(defun test-redisplay-2 ()
(insert "Test 2: Mouse highlighting. Move your mouse over the letters XXX:\n\n")
(insert " Expected: "
(propertize "xxxXXXxxx" 'face 'highlight)
"...---...\n Test: ")
(test-insert-overlay "XXX" 'before-string "xxx" 'after-string "xxx"
'mouse-face 'highlight )
(test-insert-overlay "---" 'before-string "..." 'after-string "...")
(insert "\n\n Expected: "
(propertize "xxxXXX" 'face 'highlight)
"...---...\n Test: ")
(test-insert-overlay "XXX" 'before-string "xxx" 'mouse-face 'highlight)
(test-insert-overlay "---" 'before-string "..." 'after-string "...")
(insert "\n\n Expected: "
(propertize "XXX" 'face 'highlight)
"...---...\n Test: ")
(test-insert-overlay "..." 'display "XXX" 'mouse-face 'highlight)
(test-insert-overlay "---" 'before-string "..." 'after-string "...")
(insert "\n\n Expected: "
(propertize "XXXxxx" 'face 'highlight)
"...\n Test: ")
(test-insert-overlay "..." 'display "XXX" 'after-string "xxx"
'mouse-face 'highlight)
(test-insert-overlay "error" 'display "...")
(insert "\n\n Expected: "
"---..."
(propertize "xxxXXX" 'face 'highlight)
"\n Test: ")
(test-insert-overlay "xxx" 'display "---" 'after-string "...")
(test-insert-overlay "error" 'before-string "xxx" 'display "XXX"
'mouse-face 'highlight)
(insert "\n\n Expected: "
"...---..."
(propertize "xxxXXXxxx" 'face 'highlight)
"\n Test: ")
(test-insert-overlay "---" 'before-string "..." 'after-string "...")
(test-insert-overlay "XXX" 'before-string "xxx" 'after-string "xxx"
'mouse-face 'highlight)
(insert "\n\n Expected: "
"..."
(propertize "XXX" 'face 'highlight)
"...\n Test: ")
(test-insert-overlay "---"
'display (propertize "XXX" 'mouse-face 'highlight)
'before-string "..."
'after-string "...")
(insert "\n\n Expected: "
(propertize "XXX\n" 'face 'highlight)
"\n Test: ")
(test-insert-overlay "XXX\n" 'mouse-face 'highlight)
(insert "\n\n"))
(defun test-redisplay-3 ()
(insert "Test 3: Overlay with strings and images:\n\n")
(let ((img-data "#define x_width 8
#define x_height 8
static unsigned char x_bits[] = {0xff, 0x81, 0xbd, 0xa5, 0xa5, 0xbd, 0x81, 0xff };"))
;; Control
(insert " Expected: AB"
(propertize "X" 'display `(image :data ,img-data :type xbm))
"CD\n")
;; Overlay with before, after, and image display string.
(insert " Result 1: ")
(let ((opoint (point)))
(insert "AXD\n")
(let ((ov (make-overlay (1+ opoint) (+ 2 opoint))))
(overlay-put ov 'before-string "B")
(overlay-put ov 'after-string "C")
(overlay-put ov 'display
`(image :data ,img-data :type xbm))))
;; Overlay with before and after string, and image text prop.
(insert " Result 2: ")
(let ((opoint (point)))
(insert "AXD\n")
(let ((ov (make-overlay (1+ opoint) (+ 2 opoint))))
(overlay-put ov 'before-string "B")
(overlay-put ov 'after-string "C")
(put-text-property (1+ opoint) (+ 2 opoint) 'display
`(image :data ,img-data :type xbm))))
;; Overlays with adjacent before and after strings, and image text
;; prop.
(insert " Result 3: ")
(let ((opoint (point)))
(insert "AXD\n")
(let ((ov1 (make-overlay opoint (1+ opoint)))
(ov2 (make-overlay (+ 2 opoint) (+ 3 opoint))))
(overlay-put ov1 'after-string "B")
(overlay-put ov2 'before-string "C")
(put-text-property (1+ opoint) (+ 2 opoint) 'display
`(image :data ,img-data :type xbm))))
;; Three overlays.
(insert " Result 4: ")
(let ((opoint (point)))
(insert "AXD\n\n")
(let ((ov1 (make-overlay opoint (1+ opoint)))
(ov2 (make-overlay (+ 2 opoint) (+ 3 opoint)))
(ov3 (make-overlay (1+ opoint) (+ 2 opoint))))
(overlay-put ov1 'after-string "B")
(overlay-put ov2 'before-string "C")
(overlay-put ov3 'display `(image :data ,img-data :type xbm))))))
(defun test-redisplay-4 ()
(insert "Test 4: Overlay strings and invisibility:\n\n")
;; Before and after strings with non-nil `invisibility'.
(insert " Expected: ABC\n")
(insert " Result: ")
(let ((opoint (point)))
(insert "ABC\n")
(let ((ov (make-overlay (1+ opoint) (+ 2 opoint))))
(overlay-put ov 'before-string
(propertize "XX" 'invisible
'test-redisplay--simple-invis))
(overlay-put ov 'after-string
(propertize "XX" 'invisible
'test-redisplay--simple-invis))))
;; Before and after strings bogus `invisibility' property (value is
;; not listed in `buffer-invisibility-spec').
(insert "\n Expected: ABC")
(insert "\n Result: ")
(let ((opoint (point)))
(insert "B\n")
(let ((ov (make-overlay opoint (1+ opoint))))
(overlay-put ov 'before-string
(propertize "A" 'invisible 'bogus-invis-spec))
(overlay-put ov 'after-string
(propertize "C" 'invisible 'bogus-invis-spec))))
;; Before/after string with ellipsis `invisibility' property.
(insert "\n Expected: ...B...")
(insert "\n Result: ")
(let ((opoint (point)))
(insert "B\n")
(let ((ov (make-overlay opoint (1+ opoint))))
(overlay-put ov 'before-string
(propertize "A" 'invisible 'test-redisplay--ellipsis-invis))
(overlay-put ov 'after-string
(propertize "C" 'invisible 'test-redisplay--ellipsis-invis))))
;; Before/after string with partial ellipsis `invisibility' property.
(insert "\n Expected: A...ABC...C")
(insert "\n Result: ")
(let ((opoint (point)))
(insert "B\n")
(let ((ov (make-overlay opoint (1+ opoint)))
(a "AAA")
(c "CCC"))
(put-text-property 1 2 'invisible 'test-redisplay--ellipsis-invis a)
(put-text-property 1 2 'invisible 'test-redisplay--ellipsis-invis c)
(overlay-put ov 'before-string a)
(overlay-put ov 'after-string c)))
;; Display string with `invisibility' property.
(insert "\n Expected: ABC")
(insert "\n Result: ")
(let ((opoint (point)))
(insert "AYBC\n")
(let ((ov (make-overlay (1+ opoint) (+ 2 opoint))))
(overlay-put ov 'display
(propertize "XX" 'invisible
'test-redisplay--simple-invis))))
;; Display string with bogus `invisibility' property.
(insert "\n Expected: ABC")
(insert "\n Result: ")
(let ((opoint (point)))
(insert "AXC\n")
(let ((ov (make-overlay (1+ opoint) (+ 2 opoint))))
(overlay-put ov 'display
(propertize "B" 'invisible 'bogus-invis-spec))))
;; Display string with ellipsis `invisibility' property.
(insert "\n Expected: A...C")
(insert "\n Result: ")
(let ((opoint (point)))
(insert "AXC\n")
(let ((ov (make-overlay (1+ opoint) (+ 2 opoint))))
(overlay-put ov 'display
(propertize "B" 'invisible
'test-redisplay--ellipsis-invis))))
;; Display string with partial `invisibility' property.
(insert "\n Expected: A...C")
(insert "\n Result: ")
(let ((opoint (point)))
(insert "X\n")
(let ((ov (make-overlay opoint (1+ opoint)))
(str "ABC"))
(put-text-property 1 2 'invisible 'test-redisplay--ellipsis-invis str)
(overlay-put ov 'display str)))
;; Overlay string over invisible text and non-default face.
(insert "\n Expected: ..." (propertize "ABC" 'face 'highlight) "XYZ")
(insert "\n Result: ")
(insert (propertize "foo" 'invisible 'test-redisplay--ellipsis-invis))
(let ((ov (make-overlay (point) (point))))
(overlay-put ov 'invisible t)
(overlay-put ov 'window (selected-window))
(overlay-put ov 'after-string
(propertize "ABC" 'face 'highlight)))
(insert "XYZ\n")
;; Overlay strings with partial `invisibility' property and with a
;; display property on the before-string.
(insert "\n Expected: ..."
(propertize "DEF" 'display '(image :type xpm :file "close.xpm"))
(propertize "ABC" 'face 'highlight) "XYZ")
(insert "\n Result: ")
(insert (propertize "foo" 'invisible 'test-redisplay--ellipsis-invis))
(let ((ov (make-overlay (point) (point))))
(overlay-put ov 'invisible t)
(overlay-put ov 'window (selected-window))
(overlay-put ov 'after-string
(propertize "ABC" 'face 'highlight))
(overlay-put ov 'before-string
(propertize "DEF"
'display '(image :type xpm :file "close.xpm"))))
(insert "XYZ\n")
;; Overlay string with 2 adjacent and different invisible
;; properties. This caused an infloop before Emacs 25.
(insert "\n Expected: ABC")
(insert "\n Result: ")
(let ((opoint (point)))
(insert "ABC\n")
(let ((ov (make-overlay (1+ opoint) (+ 2 opoint)))
(str (concat (propertize "X"
'invisible 'test-redisplay--simple-invis)
(propertize "Y"
'invisible 'test-redisplay--simple-invis2))))
(overlay-put ov 'after-string str)))
(insert "\n"))
(defvar test-redisplay-5a-expected-overlay nil)
(defvar test-redisplay-5a-result-overlay nil)
(defvar test-redisplay-5b-expected-overlay nil)
(defvar test-redisplay-5b-result-overlay nil)
(defun test-redisplay-5-toggle (_event)
(interactive "e")
(setq display-raw-bytes-as-hex (not display-raw-bytes-as-hex))
(let ((label (if display-raw-bytes-as-hex "\\x80" "\\200")))
(overlay-put test-redisplay-5a-expected-overlay 'display
(propertize label 'face 'escape-glyph)))
(let ((label (if display-raw-bytes-as-hex "\\x3fffc" "\\777774")))
(overlay-put test-redisplay-5b-expected-overlay 'display
(propertize label 'face 'escape-glyph))))
(defun test-redisplay-5 ()
(insert "Test 5: Display of raw bytes:\n\n")
(insert " Expected: ")
(setq test-redisplay-5a-expected-overlay
(test-insert-overlay " " 'display
(propertize "\\200" 'face 'escape-glyph)))
(insert "\n Result: ")
(setq test-redisplay-5a-result-overlay
(test-insert-overlay " " 'display "\200"))
(insert "\n\n")
(insert " Expected: ")
;; This tests a large codepoint, to make sure the internal buffer we
;; use to produce the representation is large enough.
(aset printable-chars #x3fffc nil)
(setq test-redisplay-5b-expected-overlay
(test-insert-overlay " " 'display
(propertize "\\777774" 'face 'escape-glyph)))
(insert "\n Result: ")
(setq test-redisplay-5b-result-overlay
(test-insert-overlay " " 'display (char-to-string #x3fffc)))
(insert "\n\n")
(insert-button "Toggle between octal and hex display"
'action 'test-redisplay-5-toggle))
(defun test-redisplay ()
(interactive)
(let ((buf (get-buffer "*Redisplay Test*")))
(if buf
(kill-buffer buf))
(switch-to-buffer (get-buffer-create "*Redisplay Test*"))
(erase-buffer)
(setq buffer-invisibility-spec
'(test-redisplay--simple-invis
test-redisplay--simple-invis2
(test-redisplay--ellipsis-invis . t)))
(test-redisplay-1)
(test-redisplay-2)
(test-redisplay-3)
(test-redisplay-4)
(test-redisplay-5)
(goto-char (point-min))))
|
