Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,14 @@ test: .venv
# tests/pytest/test_001_demo.py -r test.input.bin
# Play the test stream
# tests/pytest/test_001_demo.py -p test.input.bin
mkdir -p tmp
wget -O tmp/test.input.001.bin https://github.com/ceccopierangiolieugenio/binaryRepo/raw/master/pyTermTk/tests/test.input.001.bin
wget -O tmp/test.input.002.bin https://github.com/ceccopierangiolieugenio/binaryRepo/raw/master/pyTermTk/tests/test.input.002.bin
wget -O tmp/test.input.003.bin https://github.com/ceccopierangiolieugenio/binaryRepo/raw/master/pyTermTk/tests/test.input.003.bin
tools/check.import.sh
. .venv/bin/activate ; \
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude .venv,build,tmp,experiments ;
. .venv/bin/activate ; \
pytest tests/pytest
mkdir -p tmp
wget -O tmp/test.input.001.bin https://github.com/ceccopierangiolieugenio/binaryRepo/raw/master/pyTermTk/tests/test.input.001.bin
wget -O tmp/test.input.002.bin https://github.com/ceccopierangiolieugenio/binaryRepo/raw/master/pyTermTk/tests/test.input.002.bin
wget -O tmp/test.input.003.bin https://github.com/ceccopierangiolieugenio/binaryRepo/raw/master/pyTermTk/tests/test.input.003.bin
. .venv/bin/activate ; \
pytest tests/pytest/run_*
15 changes: 15 additions & 0 deletions docs/MDNotes/internals/threads.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Summary of the main pyTermTk Threading (26/Oct/2025) [8148cf0a]
```text

MainThread (mainlop)
│ └─▶ Wait on inputQueue ─> Signal ┬─▶ inputEvent
│ ▲ └─▶ pasteEvent
│ │
│ (push to inputQueue)
├─▶ TTkInput Thread │
│ └─▶ Wait on select(Stdin)
└─▶ TTk (Draw)
└─▶ Wait on timeout (~65 fps) ──▶ Refresh Screen

```
17 changes: 13 additions & 4 deletions libs/pyTermTk/TermTk/TTkCore/TTkTerm/input_thread.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@

import threading, queue

from typing import Optional

from ..drivers import TTkInputDriver

from TermTk.TTkCore.log import TTkLog
Expand All @@ -40,10 +42,11 @@
class TTkInput:
inputEvent = pyTTkSignal(TTkKeyEvent, TTkMouseEvent)
pasteEvent = pyTTkSignal(str)
exceptionRaised = pyTTkSignal(Exception)
_pasteBuffer = ""
_bracketedPaste = False
_readInput = None
_inputThread = None
_inputThread:Optional[threading.Thread] = None
_inputQueue = None
_leftLastTime = 0
_midLastTime = 0
Expand All @@ -69,6 +72,8 @@ def close() -> None:
TTkTerm.setMouse(False, False)
if TTkInput._readInput:
TTkInput._readInput.close()
if TTkInput._inputThread and TTkInput._inputThread.is_alive():
TTkInput._inputThread.join()

@staticmethod
def stop() -> None:
Expand Down Expand Up @@ -106,9 +111,13 @@ def start() -> None:

@staticmethod
def _run():
for stdinRead in TTkInput._readInput.read():
outq = TTkInput.key_process(stdinRead)
TTkInput._inputQueue.put(outq)
try:
for stdinRead in TTkInput._readInput.read():
outq = TTkInput.key_process(stdinRead)
TTkInput._inputQueue.put(outq)
except Exception as e:
TTkInput._inputQueue.put(None)
TTkInput.exceptionRaised.emit(e)
TTkInput._inputQueue.put(None)

@staticmethod
Expand Down
9 changes: 7 additions & 2 deletions libs/pyTermTk/TermTk/TTkCore/TTkTerm/term_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
__all__ = ['TTkTermBase']

import os
from enum import Flag
from typing import Callable, TextIO

class TTkTermBase():
'''TTkTermBase'''
Expand Down Expand Up @@ -79,7 +81,8 @@ def show(cursorType):
def hide():
TTkTermBase.push(TTkTermBase.Cursor.HIDE)

class Sigmask():
class Sigmask(Flag):
NONE = 0x0000
CTRL_C = 0x0001
CTRL_S = 0x0002
CTRL_Z = 0x0004
Expand Down Expand Up @@ -158,4 +161,6 @@ def escTitle(txt = "") -> str:
setEcho = lambda *args: None
CRNL = lambda *args: None
getTerminalSize = lambda *args: (80,24)
registerResizeCb = lambda *args: None
registerResizeCb:Callable[[Callable[[int,int],None]],None] = lambda w,h: None
getStdErr:Callable[[None],TextIO] = lambda : TextIO()
setStdErr:Callable[[TextIO],None] = lambda tio: None
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

##################################
# Experimental Driver - Unused #
##################################

__all__ = []

import sys, os
Expand Down
14 changes: 13 additions & 1 deletion libs/pyTermTk/TermTk/TTkCore/drivers/term_unix_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import sys, os, signal
from threading import Thread, Lock

from typing import Callable, TextIO

try: import termios
except Exception as e:
print(f'ERROR: {e}')
Expand Down Expand Up @@ -122,9 +124,19 @@ def _sigWinCh(signum, frame):
Thread(target=_TTkTerm._sigWinChThreaded).start()

@staticmethod
def _registerResizeCb(callback):
def _registerResizeCb(callback:Callable[[int,int],None]) -> None:
_TTkTerm._sigWinChCb = callback
# Dummy call to retrieve the terminal size
_TTkTerm._sigWinCh(signal.SIGWINCH, None)
signal.signal(signal.SIGWINCH, _TTkTerm._sigWinCh)
TTkTermBase.registerResizeCb = _registerResizeCb

@staticmethod
def _setStdErr(ioRedirect:TextIO) -> None:
sys.stderr = ioRedirect
TTkTermBase.setStdErr = _setStdErr

@staticmethod
def _getStdErr() -> TextIO:
return sys.stderr
TTkTermBase.getStdErr = _getStdErr
14 changes: 13 additions & 1 deletion libs/pyTermTk/TermTk/TTkCore/drivers/term_windows.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import sys, os
from threading import Thread, Lock

from typing import TextIO

from ..TTkTerm.term_base import TTkTermBase
from TermTk.TTkCore.log import TTkLog
from .windows import *
Expand Down Expand Up @@ -71,4 +73,14 @@ def _sigWinChThreaded():
def _registerResizeCb(callback):
TTkTerm._sigWinChCb = callback
TTkInputDriver.windowResized.connect(TTkTerm._sigWinCh)
TTkTermBase.registerResizeCb = _registerResizeCb
TTkTermBase.registerResizeCb = _registerResizeCb

@staticmethod
def _setStdErr(ioRedirect:TextIO) -> None:
sys.stderr = ioRedirect
TTkTermBase.setStdErr = _setStdErr

@staticmethod
def _getStdErr() -> TextIO:
return sys.stderr
TTkTermBase.getStdErr = _getStdErr
5 changes: 5 additions & 0 deletions libs/pyTermTk/TermTk/TTkCore/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@ def registerRootWidget(widget: TTk) -> None:
TTkHelper._rootWidget = widget
TTkHelper._rootCanvas.enableDoubleBuffer()

@staticmethod
def cleanRootWidget() -> None:
TTkHelper._rootCanvas = None
TTkHelper._rootWidget = None

quitEvent: pyTTkSignal = pyTTkSignal()

@staticmethod
Expand Down
31 changes: 2 additions & 29 deletions libs/pyTermTk/TermTk/TTkCore/log.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,14 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

__all__ = ['TTkLog', 'ttk_capture_stderr']
__all__ = ['TTkLog']

# This code is inspired by
# https://github.com/ceccopierangiolieugenio/pyCuT/blob/master/cupy/CuTCore/CuDebug.py

import sys
import inspect
import logging
import contextlib
from collections.abc import Callable, Set
from typing import Callable

class _TTkContext:
__slots__ = ['file', 'line', 'function']
Expand Down Expand Up @@ -113,28 +111,3 @@ def fatal(msg):
@staticmethod
def installMessageHandler(mh: Callable):
TTkLog._messageHandler.append(mh)

class TTkStderrHandler:
def write(self, text):
TTkLog.error(text)
return len(text)

def flush(self):
pass

def getvalue(self):
raise NotImplementedError()


@contextlib.contextmanager
def ttk_capture_stderr():
_stderr_bk = sys.stderr
try:
sys.stderr = TTkStderrHandler()
yield
except Exception as e:
sys.stderr = _stderr_bk
TTkLog.critical(f"Caught an exception: {e}")
print(f"Caught an exception: {e}",sys.stderr)
finally:
sys.stderr = _stderr_bk
10 changes: 8 additions & 2 deletions libs/pyTermTk/TermTk/TTkCore/timer_pyodide.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

__all__ = ['TTkTimer']

from typing import Optional
from typing import Optional,Callable

from TermTk.TTkCore.helper import TTkHelper
from TermTk.TTkCore.signal import pyTTkSlot, pyTTkSignal
Expand All @@ -39,7 +39,10 @@ class TTkTimer():
'_delay', '_delayLock', '_quit',
'_stopTime')

def __init__(self, name:Optional[str]=None):
def __init__(
self,
name:Optional[str]=None,
excepthook:Optional[Callable[[Exception],None]]=None):
# Define Signals
self.timeout = pyTTkSignal()
self._running = True
Expand Down Expand Up @@ -81,3 +84,6 @@ def stop(self):
if self._timer:
pyodideProxy.stopTimeout(self._timer)
self._timer = None

def join(self) -> None:
pass
34 changes: 24 additions & 10 deletions libs/pyTermTk/TermTk/TTkCore/timer_unix.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

__all__ = ['TTkTimer']

from typing import Optional
from typing import Optional,Callable

import threading

Expand All @@ -32,8 +32,16 @@
class TTkTimer(threading.Thread):
__slots__ = (
'timeout', '_delay',
'_timer', '_quit', '_start')
def __init__(self, name:Optional[str]=None):
'_timer', '_quit', '_start',
'_excepthook'
)
_delay:float
_excepthook:Optional[Callable[[Exception],None]]
def __init__(
self,
name:Optional[str]=None,
excepthook:Optional[Callable[[Exception],None]]=None):
self._excepthook = excepthook
self.timeout = pyTTkSignal()
self._delay = 0
self._quit = threading.Event()
Expand All @@ -50,14 +58,21 @@ def quit(self):
self._start.set()

def run(self):
while not self._quit.is_set():
self._start.wait()
self._start.clear()
if not self._timer.wait(self._delay):
self.timeout.emit()
try:
while not self._quit.is_set():
self._start.wait()
self._start.clear()
if not self._timer.wait(self._delay):
self.timeout.emit()
except Exception as e:
TTkHelper.quitEvent.disconnect(self.quit)
if self._excepthook:
self._excepthook(e)
else:
raise e

@pyTTkSlot(float)
def start(self, sec=0.0):
def start(self, sec:float=0.0):
self._delay = sec
self._timer.set()
self._timer.clear()
Expand All @@ -68,4 +83,3 @@ def start(self, sec=0.0):
@pyTTkSlot()
def stop(self):
self._timer.set()

Loading