Skip to content

fix(TTk): register signal event callbacks on init to avoid exception #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
slook wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(TTk): register signal event callbacks on init to avoid exception #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion libs/pyTermTk/TermTk/TTkCore/drivers/unix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
__all__ = ['TTkSignalDriver','TTkInputDriver']

import sys, os, re
import signal
import atexit, signal
from select import select

try: import fcntl, termios, tty
Expand Down Expand Up @@ -84,6 +84,7 @@ def init():
signal.signal(signal.SIGCONT, TTkSignalDriver._SIGCONT) # Resume
signal.signal(signal.SIGINT, TTkSignalDriver._SIGINT) # Ctrl-C

@atexit.register
def exit():
signal.signal(signal.SIGINT, signal.SIG_DFL)

Expand Down
3 changes: 2 additions & 1 deletion libs/pyTermTk/TermTk/TTkCore/drivers/unix_gpm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import sys
import os
import re
import signal
import atexit, signal
from select import select

import ctypes
Expand Down Expand Up @@ -279,6 +279,7 @@ def init():
signal.signal(signal.SIGCONT, TTkSignalDriver._SIGCONT) # Resume
signal.signal(signal.SIGINT, TTkSignalDriver._SIGINT) # Ctrl-C

@atexit.register
def exit():
signal.signal(signal.SIGINT, signal.SIG_DFL)

Expand Down
3 changes: 2 additions & 1 deletion libs/pyTermTk/TermTk/TTkCore/drivers/windows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

__all__ = ['TTkSignalDriver','TTkInputDriver']

import signal
import atexit, signal

from ctypes import Structure, Union, byref, wintypes, windll

Expand Down Expand Up @@ -360,6 +360,7 @@ def init():
# signal.signal(signal.SIGCONT, TTkSignalDriver._SIGCONT) # Resume
signal.signal(signal.SIGINT, TTkSignalDriver._SIGINT) # Ctrl-C

@atexit.register
def exit():
signal.signal(signal.SIGINT, signal.SIG_DFL)

Expand Down
11 changes: 3 additions & 8 deletions libs/pyTermTk/TermTk/TTkCore/ttk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ def __init__(self, *,
TTkSignalDriver.sigStop.connect(self._SIGSTOP)
TTkSignalDriver.sigCont.connect(self._SIGCONT)
TTkSignalDriver.sigInt.connect( self._SIGINT)
TTkSignalDriver.init()

self._drawMutex = threading.Lock()
self._paintEvent = threading.Event()
self._paintEvent.set()
Expand All @@ -167,6 +169,7 @@ def __init__(self, *,
self._showMouseCursor = True

TTkHelper.registerRootWidget(self)
TTkTerm.registerResizeCb(self._win_resize_cb)

frame = 0
time = time.time()
Expand Down Expand Up @@ -200,13 +203,6 @@ def _mainloop(self) -> None:
TTkLog.debug( "Starting Main Loop..." )
TTkLog.debug(f"screen = ({TTkTerm.getTerminalSize()})")

# Register events
TTkSignalDriver.init()

TTkLog.debug("Signal Event Registered")

TTkTerm.registerResizeCb(self._win_resize_cb)

self._timer.timeout.connect(self._time_event)
self._timer.start(0.1)
self.show()
Expand All @@ -231,7 +227,6 @@ def _mainloop(self) -> None:
TTkHelper.quitEvent.emit()
self._quit_timer()
self._timer.join()
TTkSignalDriver.exit()
self.quit()
TTkTerm.exit()
for e in self._exceptions:
Expand Down
6 changes: 3 additions & 3 deletions tools/check.import.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ __check(){
-e "drivers/_unused_.unix_thread.py:import threading" \
-e "drivers/_unused_.unix_thread.py:import queue" \
-e "drivers/unix.py:import sys, os, re" \
-e "drivers/unix.py:import signal" \
-e "drivers/unix.py:import atexit, signal" \
-e "drivers/unix.py:from select import select" \
-e "drivers/windows.py:import signal" \
-e "drivers/windows.py:import atexit, signal" \
-e "drivers/windows.py:from ctypes import Structure, Union, byref, wintypes, windll" \
-e "drivers/pyodide.py:from pyodide import __version__ as pyodideVersion" \
-e "drivers/term_windows.py:import sys, os" \
Expand All @@ -90,7 +90,7 @@ __check(){
-e "drivers/unix_gpm.py:import os" \
-e "drivers/unix_gpm.py:import re" \
-e "drivers/unix_gpm.py:import ctypes" \
-e "drivers/unix_gpm.py:import signal" \
-e "drivers/unix_gpm.py:import atexit, signal" \
-e "drivers/unix_gpm.py:from select import select" \
-e "drivers/term_pyodide.py:import pyodideProxy" \
-e "drivers/term_pyodide.py:from ..TTkTerm.term_base import TTkTermBase" \
Expand Down