Git-Mirrors/rnsh
1
0
Fork 0
mirror of https://github.com/markqvist/rnsh.git synced 2025-01-07 05:07:57 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Example: copy window size from stdin just after starting child process.

Browse Source
This commit is contained in:
Aaron Heise 2023-02-09 00:06:37 -06:00
parent 3a935ab6c2
commit 3368a9d5ff
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rnsh/process.py
View File

@ -28,7 +28,7 @@ def tty_add_reader_callback(fd: int, callback: callable, loop: asyncio.AbstractE
data = tty_read(fd) data = tty_read(fd)
# do something with data # do something with data
tty_add_reader_callback(self._si, reader, self._loop) tty_add_reader_callback(self._child_fd, reader, self._loop)
:param fd: file descriptor :param fd: file descriptor
:param callback: callback function :param callback: callback function
@ -173,6 +173,7 @@ class CallbackSubprocess:
self._stdout_cb = stdout_callback self._stdout_cb = stdout_callback
self._terminated_cb = terminated_callback self._terminated_cb = terminated_callback
self._pid: int | None = None self._pid: int | None = None
self._child_fd: int | None = None
def terminate(self, kill_delay: float = 1.0): def terminate(self, kill_delay: float = 1.0):
""" """
@ -225,7 +226,7 @@ class CallbackSubprocess:
:param data: bytes to write :param data: bytes to write
""" """
self.log.debug(f"write({data})") self.log.debug(f"write({data})")
os.write(self._si, data) os.write(self._child_fd, data)
def set_winsize(self, r: int, c: int, h: int, v: int): def set_winsize(self, r: int, c: int, h: int, v: int):
""" """
@ -237,7 +238,7 @@ class CallbackSubprocess:
:return: :return:
""" """
self.log.debug(f"set_winsize({r},{c},{h},{v}") self.log.debug(f"set_winsize({r},{c},{h},{v}")
tty_set_winsize(self._si, r, c, h, v) tty_set_winsize(self._child_fd, r, c, h, v)
def copy_winsize(self, fromfd:int): def copy_winsize(self, fromfd:int):
""" """
@ -253,14 +254,14 @@ class CallbackSubprocess:
:param when: when to apply change: termios.TCSANOW or termios.TCSADRAIN or termios.TCSAFLUSH :param when: when to apply change: termios.TCSANOW or termios.TCSADRAIN or termios.TCSAFLUSH
:param attr: attributes to set :param attr: attributes to set
""" """
termios.tcsetattr(self._si, when, attr) termios.tcsetattr(self._child_fd, when, attr)
def tcgetattr(self) -> list[int | list[int | bytes]]: def tcgetattr(self) -> list[int | list[int | bytes]]:
""" """
Get tty attributes. Get tty attributes.
:return: tty attributes value :return: tty attributes value
""" """
return termios.tcgetattr(self._si) return termios.tcgetattr(self._child_fd)
def start(self): def start(self):
""" """
@ -273,7 +274,7 @@ class CallbackSubprocess:
"LANG": parentenv.get("LANG"), "LANG": parentenv.get("LANG"),
"SHELL": self._command[0]} "SHELL": self._command[0]}
self._pid, self._si = pty.fork() self._pid, self._child_fd = pty.fork()
if self._pid == 0: if self._pid == 0:
try: try:
@ -304,7 +305,7 @@ class CallbackSubprocess:
except: except:
pass pass
tty_add_reader_callback(self._si, functools.partial(reader, self._si, self._stdout_cb), self._loop) tty_add_reader_callback(self._child_fd, functools.partial(reader, self._child_fd, self._stdout_cb), self._loop)
async def main(): async def main():
""" """
@ -356,7 +357,8 @@ async def main():
tty_add_reader_callback(sys.stdin.fileno(), stdin) tty_add_reader_callback(sys.stdin.fileno(), stdin)
process.start() process.start()
# process.tcsetattr(termios.tcgetattr(sys.stdin)) # call_soon called it too soon, not sure why.
loop.call_later(0.001, functools.partial(process.copy_winsize, sys.stdin.fileno()))
val = await retcode val = await retcode
log.debug(f"got retcode {val}") log.debug(f"got retcode {val}")