vim: src/testdir/keycode_check.vim comparison

comparison src/testdir/keycode_check.vim @ 31137:548241980a27 v9.0.0903

patch 9.0.0903: key code checker doesn't check modifyOtherKeys resource Commit: https://github.com/vim/vim/commit/236dffab43f919bdbc565e6edc38eb27e7a5b657 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Nov 18 21:20:25 2022 +0000 patch 9.0.0903: key code checker doesn't check modifyOtherKeys resource Problem: Key code checker doesn't check modifyOtherKeys resource. Solution: Request the modifyOtherKeys resource value. Drop resource DCS responses.

author	Bram Moolenaar <Bram@vim.org>
date	Fri, 18 Nov 2022 22:30:04 +0100
parents	17e171cf2cca
children	0ecb16d5f86f

comparison

equal deleted inserted replaced

-:9423dacd1538
+:548241980a27
 echo 'No terminal results yet'
 return
 endif
 sort(terms)
-var items = ['protocol', 'version', 'status']
+var items = ['protocol', 'version', 'status', 'resource']
 	      + key_entries->copy()->map((_, v) => v[1])
 # For each terminal compute the needed width, add two.
 # You may need to increase the terminal width to avoid wrapping.
 var widths = []
 &t_TE = "\<Esc>[>4;m"
 var proto_name = 'none'
 if proto == 1
 &t_TI = ""
 elseif proto == 2
-# Enable modifyOtherKeys level 2 - no status is reported
+# Enable modifyOtherKeys level 2
-&t_TI = "\<Esc>[>4;2m"
+# Request the resource value: DCS + Q modifyOtherKeys ST
+&t_TI = "\<Esc>[>4;2m" .. "\<Esc>P+Q6d6f646966794f746865724b657973\<Esc>\\"
 proto_name = 'mok2'
 elseif proto == 3
 # Enable Kitty keyboard protocol and request the status
 &t_TI = "\<Esc>[>1u" .. "\<Esc>[?u"
 proto_name = 'kitty'
 &t_TI ..= "\<Esc>[>c"
 # Pattern that matches the line with the version response.
 const version_pattern = "\<Esc>\\[>\\d\\+;\\d\\+;\\d*c"
+# Pattern that matches the resource value response:
+#    DCS 1 + R Pt ST    valid
+#    DCS 0 + R Pt ST    invalid
+const resource_pattern = "\<Esc>P[01]+R.*\<Esc>\\\\"
 # Pattern that matches the line with the status.  Currently what terminals
 # return for the Kitty keyboard protocol.
-const status_pattern = "\<Esc>\\[?\\d\\+u"
+const kitty_status_pattern = "\<Esc>\\[?\\d\\+u"
 ch_logfile('keylog', 'w')
 # executing a dummy shell command will output t_TI
 !echo >/dev/null
 	  endif
 	endif
 endfor
 endif
 if reltime(startTime)->reltimefloat() > 3
+# break out after three seconds
 break
 endif
 endwhile
 echo 'seenVersion: ' seenVersion
 keycodes[name] = {}
 endif
 keycodes[name]['protocol'] = proto_name
 keycodes[name]['version'] = ''
 keycodes[name]['status'] = ''
+keycodes[name]['resource'] = ''
 # Check the log file for a status and the version response
 ch_logfile('', '')
 var log = readfile('keylog')
 delete('keylog')
 for line in log
 if line =~ 'raw key input'
 var code = substitute(line, '.*raw key input: "\([^"]*\).*', '\1', '')
+# Check for resource value response
+if code =~ resource_pattern
+	var resource = substitute(code, '.*\(' .. resource_pattern .. '\).*', '\1', '')
+	# use the value as the resource, "=30" means zero
+	resource = substitute(resource, '.*\(=\p\+\).*', '\1', '')
+	if keycodes[name]['resource'] != ''
+	  echomsg 'Another resource found after ' .. keycodes[name]['resource']
+	endif
+	keycodes[name]['resource'] = resource
+endif
 # Check for kitty keyboard protocol status
-if code =~ status_pattern
+if code =~ kitty_status_pattern
-	var status = substitute(code, '.*\(' .. status_pattern .. '\).*', '\1', '')
+	var status = substitute(code, '.*\(' .. kitty_status_pattern .. '\).*', '\1', '')
-	keycodes[name]['status'] = Literal2hex(status)
+	# use the response itself as the status
+	status = Literal2hex(status)
+	if keycodes[name]['status'] != ''
+	  echomsg 'Another status found after ' .. keycodes[name]['status']
+	endif
+	keycodes[name]['status'] = status
 endif
 if code =~ version_pattern
 	var version = substitute(code, '.*\(' .. version_pattern .. '\).*', '\1', '')
 	keycodes[name]['version'] = Literal2hex(version)
 endfor
 echo "For Alt to work you may need to press the Windows/Super key as well"
 echo "When a key press doesn't get to Vim (e.g. when using Alt) press x"
+# The log of ignored typeahead is left around for debugging, start with an
+# empty file here.
+delete('keylog-ignore')
 for entry in key_entries
 # Consume any typeahead.  Wait a bit for any responses to arrive.
-sleep 100m
+ch_logfile('keylog-ignore', 'a')
-while getchar(1)
+while 1
-getchar()
 sleep 100m
+if !getchar(1)
+	break
+endif
+while getchar(1)
+	getchar()
+endwhile
 endwhile
+ch_logfile('', '')
 ch_logfile('keylog', 'w')
 echo $'Press the {entry[0]} key (q to quit):'
 var r = getcharstr()
 ch_logfile('', '')
 if r == 'q'
 break
 endif
 log = readfile('keylog')
-if entry[1] == 'Tab'
+delete('keylog')
-# keep a copy
-rename('keylog', 'keylog-tab')
-else
-delete('keylog')
-endif
 if len(log) < 2
 echoerr 'failed to read result'
 return
 endif
 var done = false
 	# Remove any XTGETTCAP replies.
 	const cappat = "\<Esc>P[01]+\\k\\+=\\x*\<Esc>\\\\"
 	code = substitute(code, cappat, '', 'g')
 	# Remove any kitty status reply
-	code = substitute(code, status_pattern, '', 'g')
+	code = substitute(code, kitty_status_pattern, '', 'g')
 	if code == ''
 	  continue
 	endif
 	# Convert the literal bytes into hex.  If 'x' was pressed then clear

Mercurial > vim

comparison src/testdir/keycode_check.vim @ 31137:548241980a27 v9.0.0903