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

Shutdown cleanly

Browse Source
This commit is contained in:
Kovid Goyal 2016-10-20 07:56:48 +05:30
parent 0e89f3cda1
commit 2d9ae7c01f
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kitty/boss.py
View File

@ -18,6 +18,7 @@ class Boss(QObject):
def __init__(self, opts, parent): def __init__(self, opts, parent):
QObject.__init__(self, parent) QObject.__init__(self, parent)
self.shutting_down = False
self.write_buf = memoryview(b'') self.write_buf = memoryview(b'')
self.read_notifier = QSocketNotifier(create_pty()[0], QSocketNotifier.Read, self) self.read_notifier = QSocketNotifier(create_pty()[0], QSocketNotifier.Read, self)
self.read_notifier.activated.connect(self.read_ready) self.read_notifier.activated.connect(self.read_ready)
@ -38,14 +39,21 @@ class Boss(QObject):
self.term.apply_opts(opts) self.term.apply_opts(opts)
def read_ready(self, read_fd): def read_ready(self, read_fd):
if self.shutting_down:
return
try:
data = os.read(read_fd, io.DEFAULT_BUFFER_SIZE) data = os.read(read_fd, io.DEFAULT_BUFFER_SIZE)
except EnvironmentError:
data = b''
if not data: if not data:
# EOF # EOF
self.read_notifier.setEnabled(False)
self.parent().child_process_died() self.parent().child_process_died()
return return
self.stream.feed(data) self.stream.feed(data)
def write_ready(self, write_fd): def write_ready(self, write_fd):
if not self.shutting_down:
while self.write_buf: while self.write_buf:
n = os.write(write_fd, self.write_buf) n = os.write(write_fd, self.write_buf)
if not n: if not n:
@ -62,6 +70,6 @@ class Boss(QObject):
resize_pty(cells_per_line, lines_per_screen) resize_pty(cells_per_line, lines_per_screen)
def shutdown(self): def shutdown(self):
del self.master_fd self.shutting_down = True
del self.slave_fd self.read_notifier.setEnabled(False)
hangup() hangup()