KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

query terminal kitten: Return fast when run in non-kitty terminals

Browse Source
This commit is contained in:
Kovid Goyal 2022-04-30 14:25:39 +05:30
parent f2df629634
commit 9811d677e5
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kittens/query_terminal/main.py
View File

@ -173,17 +173,22 @@ def do_queries(queries: Iterable[str], cli_opts: QueryTerminalCLIOptions) -> Dic
actions = tuple(all_queries[x]() for x in queries)
qstring = ''.join(a.query_code() for a in actions)
received = b''
pat = re.compile(rb'\x1b\[\?.+?c')
def more_needed(data: bytes) -> bool:
nonlocal received
received += data
has_da1_response = pat.search(received) is not None
if has_da1_response:
return False
for a in actions:
if a.more_needed(received):
return True
return False
return has_da1_response
with TTYIO() as ttyio:
ttyio.send(qstring)
ttyio.send('\x1b[c') # DA1 query https://vt100.net/docs/vt510-rm/DA1.html
ttyio.recv(more_needed, timeout=cli_opts.wait_for)
return {a.name: a.output_line() for a in actions}
@ -214,7 +219,7 @@ If a particular :italic:`query` is unsupported by the running kitty version, the
:italic:`data` will be blank.
Note that when calling this from another program, be very careful not to perform
any I/O on the terminal device until thos kitten exits.
any I/O on the terminal device until this kitten exits.
Available queries are: