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
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
|
To: vim_dev@googlegroups.com
Subject: Patch 8.1.1247
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 8.1.1247
Problem: Urxvt mouse codes are not tested.
Solution: Also set 'ttymouse' to "urxvt" in the termcodes test.
Files: src/testdir/test_termcodes.vim
*** ../vim-8.1.1246/src/testdir/test_termcodes.vim 2019-05-01 23:13:53.270968846 +0200
--- src/testdir/test_termcodes.vim 2019-05-02 21:09:32.053517694 +0200
***************
*** 7,17 ****
source shared.vim
" Helper function to emit a terminal escape code.
! func TerminalEscapeCode(code_xterm, code_sgr, row, col, m)
if &ttymouse ==# 'xterm2'
" need to use byte encoding here.
! let str = list2str([a:code_xterm, a:col + 0x20, a:row + 0x20])
if has('iconv')
let bytes = iconv(str, 'utf-8', 'latin1')
else
--- 7,23 ----
source shared.vim
+ " xterm2 and sgr always work, urxvt is optional.
+ let s:test_ttymouse = ['xterm2', 'sgr']
+ if has('mouse_urxvt')
+ call add(s:test_ttymouse, 'urxvt')
+ endif
+
" Helper function to emit a terminal escape code.
! func TerminalEscapeCode(code, row, col, m)
if &ttymouse ==# 'xterm2'
" need to use byte encoding here.
! let str = list2str([a:code + 0x20, a:col + 0x20, a:row + 0x20])
if has('iconv')
let bytes = iconv(str, 'utf-8', 'latin1')
else
***************
*** 20,69 ****
endif
call feedkeys("\<Esc>[M" .. bytes, 'Lx!')
elseif &ttymouse ==# 'sgr'
! call feedkeys(printf("\<Esc>[<%d;%d;%d%s", a:code_sgr, a:col, a:row, a:m), 'Lx!')
endif
endfunc
func MouseLeftClick(row, col)
! call TerminalEscapeCode(0x20, 0, a:row, a:col, 'M')
endfunc
func MouseMiddleClick(row, col)
! call TerminalEscapeCode(0x21, 1, a:row, a:col, 'M')
endfunc
func MouseCtrlLeftClick(row, col)
let ctrl = 0x10
! call TerminalEscapeCode(0x20 + ctrl, 0 + ctrl, a:row, a:col, 'M')
endfunc
func MouseCtrlRightClick(row, col)
let ctrl = 0x10
! call TerminalEscapeCode(0x22 + ctrl, 2 + ctrl, a:row, a:col, 'M')
endfunc
func MouseLeftRelease(row, col)
! call TerminalEscapeCode(0x23, 3, a:row, a:col, 'm')
endfunc
func MouseMiddleRelease(row, col)
! call TerminalEscapeCode(0x23, 3, a:row, a:col, 'm')
endfunc
func MouseRightRelease(row, col)
! call TerminalEscapeCode(0x23, 3, a:row, a:col, 'm')
endfunc
func MouseLeftDrag(row, col)
! call TerminalEscapeCode(0x43, 0x20, a:row, a:col, 'M')
endfunc
func MouseWheelUp(row, col)
! call TerminalEscapeCode(0x40, 0x40, a:row, a:col, 'M')
endfunc
func MouseWheelDown(row, col)
! call TerminalEscapeCode(0x41, 0x41, a:row, a:col, 'M')
endfunc
func Test_xterm_mouse_left_click()
--- 26,77 ----
endif
call feedkeys("\<Esc>[M" .. bytes, 'Lx!')
elseif &ttymouse ==# 'sgr'
! call feedkeys(printf("\<Esc>[<%d;%d;%d%s", a:code, a:col, a:row, a:m), 'Lx!')
! elseif &ttymouse ==# 'urxvt'
! call feedkeys(printf("\<Esc>[%d;%d;%dM", a:code + 0x20, a:col, a:row), 'Lx!')
endif
endfunc
func MouseLeftClick(row, col)
! call TerminalEscapeCode(0, a:row, a:col, 'M')
endfunc
func MouseMiddleClick(row, col)
! call TerminalEscapeCode(1, a:row, a:col, 'M')
endfunc
func MouseCtrlLeftClick(row, col)
let ctrl = 0x10
! call TerminalEscapeCode(0 + ctrl, a:row, a:col, 'M')
endfunc
func MouseCtrlRightClick(row, col)
let ctrl = 0x10
! call TerminalEscapeCode(2 + ctrl, a:row, a:col, 'M')
endfunc
func MouseLeftRelease(row, col)
! call TerminalEscapeCode(3, a:row, a:col, 'm')
endfunc
func MouseMiddleRelease(row, col)
! call TerminalEscapeCode(3, a:row, a:col, 'm')
endfunc
func MouseRightRelease(row, col)
! call TerminalEscapeCode(3, a:row, a:col, 'm')
endfunc
func MouseLeftDrag(row, col)
! call TerminalEscapeCode(0x20, a:row, a:col, 'M')
endfunc
func MouseWheelUp(row, col)
! call TerminalEscapeCode(0x40, a:row, a:col, 'M')
endfunc
func MouseWheelDown(row, col)
! call TerminalEscapeCode(0x41, a:row, a:col, 'M')
endfunc
func Test_xterm_mouse_left_click()
***************
*** 74,80 ****
set mouse=a term=xterm
call setline(1, ['line 1', 'line 2', 'line 3 is a bit longer'])
! for ttymouse_val in ['xterm2', 'sgr']
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
go
--- 82,88 ----
set mouse=a term=xterm
call setline(1, ['line 1', 'line 2', 'line 3 is a bit longer'])
! for ttymouse_val in s:test_ttymouse
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
go
***************
*** 99,105 ****
let save_ttymouse = &ttymouse
set mouse=a term=xterm
! for ttymouse_val in ['xterm2', 'sgr']
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
help
--- 107,113 ----
let save_ttymouse = &ttymouse
set mouse=a term=xterm
! for ttymouse_val in s:test_ttymouse
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
help
***************
*** 138,144 ****
let @* = 'abc'
set mouse=a term=xterm
! for ttymouse_val in ['xterm2', 'sgr']
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
call setline(1, ['123456789', '123456789'])
--- 146,152 ----
let @* = 'abc'
set mouse=a term=xterm
! for ttymouse_val in s:test_ttymouse
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
call setline(1, ['123456789', '123456789'])
***************
*** 179,185 ****
set mouse=a term=xterm
call setline(1, range(1, 100))
! for ttymouse_val in ['xterm2', 'sgr']
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
go
--- 187,193 ----
set mouse=a term=xterm
call setline(1, range(1, 100))
! for ttymouse_val in s:test_ttymouse
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
go
***************
*** 215,221 ****
let save_ttymouse = &ttymouse
set mouse=a term=xterm
! for ttymouse_val in ['xterm2', 'sgr']
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
--- 223,229 ----
let save_ttymouse = &ttymouse
set mouse=a term=xterm
! for ttymouse_val in s:test_ttymouse
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
***************
*** 272,278 ****
let save_laststatus = &laststatus
set mouse=a term=xterm laststatus=2
! for ttymouse_val in ['xterm2', 'sgr']
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
--- 280,286 ----
let save_laststatus = &laststatus
set mouse=a term=xterm laststatus=2
! for ttymouse_val in s:test_ttymouse
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
***************
*** 313,319 ****
set mouse=a term=xterm
let row = 1
! for ttymouse_val in ['xterm2', 'sgr']
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
e Xfoo
--- 321,327 ----
set mouse=a term=xterm
let row = 1
! for ttymouse_val in s:test_ttymouse
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
e Xfoo
***************
*** 361,367 ****
let row = 1
let col = &columns
! for ttymouse_val in ['xterm2', 'sgr']
if ttymouse_val ==# 'xterm2' && col > 223
" When 'ttymouse' is 'xterm2', row/col bigger than 223 are not supported.
continue
--- 369,375 ----
let row = 1
let col = &columns
! for ttymouse_val in s:test_ttymouse
if ttymouse_val ==# 'xterm2' && col > 223
" When 'ttymouse' is 'xterm2', row/col bigger than 223 are not supported.
continue
***************
*** 407,413 ****
set mouse=a term=xterm mousetime=1
let row = 1
! for ttymouse_val in ['xterm2', 'sgr']
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
e Xtab1
--- 415,421 ----
set mouse=a term=xterm mousetime=1
let row = 1
! for ttymouse_val in s:test_ttymouse
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
e Xtab1
***************
*** 456,467 ****
let row = 1
let col = 10
! for ttymouse_val in ['xterm2', 'sgr']
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
e Xtab1
tabnew Xtab2
let a = split(execute(':tabs'), "\n")
call assert_equal(['Tab page 1',
\ ' Xtab1',
--- 464,483 ----
let row = 1
let col = 10
! let round = 0
! for ttymouse_val in s:test_ttymouse
let msg = 'ttymouse=' .. ttymouse_val
exe 'set ttymouse=' .. ttymouse_val
e Xtab1
tabnew Xtab2
+ if round > 0
+ " We need to sleep, or else the first MouseLeftClick() will be
+ " interpreted as a spurious triple-click.
+ sleep 100m
+ endif
+ let round += 1
+
let a = split(execute(':tabs'), "\n")
call assert_equal(['Tab page 1',
\ ' Xtab1',
***************
*** 485,495 ****
\ 'Tab page 3',
\ ' Xtab2'], a, msg)
- if ttymouse_val !=# 'sgr'
- " We need to sleep, or else MouseLeftClick() in next loop
- " iteration will be interpreted as a spurious triple-click.
- sleep 100m
- endif
%bwipe!
endfor
--- 501,506 ----
*** ../vim-8.1.1246/src/version.c 2019-05-02 20:24:08.624617859 +0200
--- src/version.c 2019-05-02 21:11:40.708817159 +0200
***************
*** 769,770 ****
--- 769,772 ----
{ /* Add new patch number below this line */
+ /**/
+ 1247,
/**/
--
Vi beats Emacs to death, and then again!
http://linuxtoday.com/stories/5764.html
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
