Browse Source

Merge branch 'main' into TTkTerminal

pull/150/head
Eugenio Parodi 3 years ago
parent
commit
673dfc8318
  1. 5
      TermTk/TTkCore/TTkTerm/readinputlinux.py
  2. 5
      TermTk/TTkCore/TTkTerm/readinputlinux_thread.py
  3. 6
      tools/check.import.sh

5
TermTk/TTkCore/TTkTerm/readinputlinux.py

@ -22,7 +22,8 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
import sys, os, select, re
import sys, os, re
from select import select
try: import fcntl, termios, tty
except Exception as e:
@ -47,7 +48,7 @@ class ReadInput():
def read(self):
rm = re.compile('(\033?[^\033]+)')
while self._readPipe[0] not in (list := select.select( [sys.stdin, self._readPipe[0]], [], [] )[0]):
while self._readPipe[0] not in (list := select( [sys.stdin, self._readPipe[0]], [], [] )[0]):
# Read all the full input
_fl = fcntl.fcntl(sys.stdin, fcntl.F_GETFL)
fcntl.fcntl(sys.stdin, fcntl.F_SETFL, _fl | os.O_NONBLOCK) # Set the input as NONBLOCK to read the full sequence

5
TermTk/TTkCore/TTkTerm/readinputlinux_thread.py

@ -22,7 +22,8 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
import sys, os, select
import sys, os
from select import select
import threading
import queue
@ -49,7 +50,7 @@ class ReadInput():
tty.setcbreak(_fn)
while True:
rlist, _, _ = select.select( [sys.stdin, self._readPipe[0]], [], [] )
rlist, _, _ = select( [sys.stdin, self._readPipe[0]], [], [] )
if self._readPipe[0] in rlist:
break

6
tools/check.import.sh

@ -14,8 +14,10 @@ __check(){
-e "log.py:import logging" \
-e "log.py:from collections.abc import Callable, Set" \
-e "from time" -e "input.py:import platform" \
-e "readinputlinux.py:import sys, os, select" \
-e "readinputlinux_thread.py:import sys, os, select" \
-e "readinputlinux.py:import sys, os" \
-e "readinputlinux.py:from select import select" \
-e "readinputlinux_thread.py:import sys, os" \
-e "readinputlinux_thread.py:from select import select" \
-e "readinputlinux_thread.py:import threading" \
-e "readinputlinux_thread.py:import queue" \
-e "term.py:import importlib.util" \

Loading…
Cancel
Save