diff --git a/TermTk/TTkCore/TTkTerm/input.py b/TermTk/TTkCore/TTkTerm/input.py index e8afcf34..ac00dbfa 100644 --- a/TermTk/TTkCore/TTkTerm/input.py +++ b/TermTk/TTkCore/TTkTerm/input.py @@ -33,7 +33,7 @@ if platform.system() == 'Linux': elif platform.system() == 'Darwin': from .readinputlinux import ReadInput elif platform.system() == 'Windows': - raise NotImplementedError('Windows OS not yet supported') + from .readinputwindows import ReadInput from TermTk.TTkCore.log import TTkLog from TermTk.TTkCore.constant import TTkK diff --git a/TermTk/TTkCore/TTkTerm/readinputwindows.py b/TermTk/TTkCore/TTkTerm/readinputwindows.py new file mode 100644 index 00000000..392d03a9 --- /dev/null +++ b/TermTk/TTkCore/TTkTerm/readinputwindows.py @@ -0,0 +1,36 @@ +# MIT License +# +# Copyright (c) 2022 Eugenio Parodi +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +class ReadInput(): + def __init__(self): + pass + + def close(self): + pass + + def cont(self): + pass + + def read(self): + from time import sleep + sleep(5) + yield "" diff --git a/TermTk/TTkCore/TTkTerm/term.py b/TermTk/TTkCore/TTkTerm/term.py index bed6bb1e..dc4fa866 100644 --- a/TermTk/TTkCore/TTkTerm/term.py +++ b/TermTk/TTkCore/TTkTerm/term.py @@ -23,8 +23,13 @@ __all__ = ['TTkTerm'] import importlib.util +import platform if importlib.util.find_spec('pyodideProxy'): from .term_pyodide import TTkTerm -else: +elif platform.system() == 'Linux': from .term_unix import TTkTerm +elif platform.system() == 'Darwin': + from .term_unix import TTkTerm +elif platform.system() == 'Windows': + from .term_windows import TTkTerm \ No newline at end of file diff --git a/TermTk/TTkCore/TTkTerm/term_base.py b/TermTk/TTkCore/TTkTerm/term_base.py index dd80a39a..ede911a6 100644 --- a/TermTk/TTkCore/TTkTerm/term_base.py +++ b/TermTk/TTkCore/TTkTerm/term_base.py @@ -148,5 +148,5 @@ class TTkTermBase(): flush = lambda *args: None setEcho = lambda *args: None CRNL = lambda *args: None - getTerminalSize = lambda *args: None + getTerminalSize = lambda *args: (80,24) registerResizeCb = lambda *args: None \ No newline at end of file diff --git a/TermTk/TTkCore/TTkTerm/term_windows.py b/TermTk/TTkCore/TTkTerm/term_windows.py new file mode 100644 index 00000000..74b4801b --- /dev/null +++ b/TermTk/TTkCore/TTkTerm/term_windows.py @@ -0,0 +1,73 @@ +# MIT License +# +# Copyright (c) 2022 Eugenio Parodi +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +import sys, os, signal +from threading import Thread, Lock + +from .term_base import TTkTermBase +from TermTk.TTkCore.log import TTkLog + +class TTkTerm(TTkTermBase): + @staticmethod + def _push(*args): + try: + sys.stdout.write(str(*args)) + sys.stdout.flush() + except BlockingIOError as e: + TTkLog.fatal(f"{e=} {e.characters_written=}") + except Exception as e: + TTkLog.fatal(e) + TTkTermBase.push = _push + + @staticmethod + def _flush(): + sys.stdout.flush() + TTkTermBase.flush = _flush + + @staticmethod + def _getTerminalSize(): + try: + return os.get_terminal_size() + except OSError as e: + print(f'ERROR: {e}') + TTkTermBase.getTerminalSize = _getTerminalSize + + @staticmethod + def _sigWinChThreaded(): + if not TTkTerm._sigWinChMutex.acquire(blocking=False): return + while (TTkTerm.width, TTkTerm.height) != (wh:=TTkTerm.getTerminalSize()): + TTkTerm.width, TTkTerm.height = wh + if TTkTerm._sigWinChCb is not None: + TTkTerm._sigWinChCb(TTkTerm.width, TTkTerm.height) + TTkTerm._sigWinChMutex.release() + + @staticmethod + def _sigWinCh(signum, frame): + Thread(target=TTkTerm._sigWinChThreaded).start() + + # @staticmethod + # def _registerResizeCb(callback): + # TTkTerm._sigWinChCb = callback + # # Dummy call to retrieve the terminal size + # TTkTerm._sigWinCh(signal.SIGWINCH, None) + # signal.signal(signal.SIGWINCH, TTkTerm._sigWinCh) + # TTkTermBase.registerResizeCb = _registerResizeCb \ No newline at end of file