diff --git a/TermTk/TTkWidgets/TTkTerminal/terminal.py b/TermTk/TTkWidgets/TTkTerminal/terminal.py index 1be57592..a0ec994a 100644 --- a/TermTk/TTkWidgets/TTkTerminal/terminal.py +++ b/TermTk/TTkWidgets/TTkTerminal/terminal.py @@ -837,7 +837,7 @@ class TTkTerminal(TTkWidget): return True if ( not self._mouse.reportDrag and evt.evt in (TTkK.Drag, TTkK.Move)): - _termLog.mouse(f"{self._mouse.reportDrag=} {evt.evt in (TTkK.Drag, TTkK.Move)=}") + # _termLog.mouse(f"{self._mouse.reportDrag=} {evt.evt in (TTkK.Drag, TTkK.Move)=}") return True x,y = evt.x+1, evt.y+1 @@ -860,7 +860,7 @@ class TTkTerminal(TTkWidget): TTkK.WHEEL_Up: (k, 0,'M'), TTkK.WHEEL_Down:(k, 1,'M')}.get( evt.evt,(0,0,'M')) - _termLog.mouse(f'Mouse: [<{k+km};{x};{y}{pr}') + # _termLog.mouse(f'Mouse: [<{k+km};{x};{y}{pr}') self._inout.write(f'\033[<{k+km};{x};{y}{pr}'.encode()) else: head = { @@ -875,7 +875,7 @@ class TTkTerminal(TTkWidget): bah = bytearray(head) bah.append((x+32)%0xff) bah.append((y+32)%0xff) - _termLog.mouse(f'Mouse: '+bah.decode().replace('\033','')) + # _termLog.mouse(f'Mouse: '+bah.decode().replace('\033','')) self._inout.write(bah) return True diff --git a/TermTk/TTkWidgets/TTkTerminal/terminal_alt.py b/TermTk/TTkWidgets/TTkTerminal/terminal_alt.py index e40cd27c..9cbcaddb 100644 --- a/TermTk/TTkWidgets/TTkTerminal/terminal_alt.py +++ b/TermTk/TTkWidgets/TTkTerminal/terminal_alt.py @@ -300,7 +300,7 @@ class _TTkTerminalAltScreen(): l = len(self._canvas._data) #TODO: Avoid this HACK baseData = [' ']*w - baseColors = [TTkColor.RST]*w + baseColors = [self._color]*w bkData = self._canvas._data[-bkl:] bkColors = self._canvas._colors[-bkl:] self._canvas._data[y:y] = [baseData.copy() for _ in range(ps)] @@ -317,7 +317,7 @@ class _TTkTerminalAltScreen(): t=min(b,max(t,y)) #TODO: Avoid this HACK baseData = [' ']*w - baseColors = [TTkColor.RST]*w + baseColors = [self._color]*w # Split the content in 3 slices [top, center, bottom] topd = self._canvas._data[:t] topc = self._canvas._colors[:t] @@ -346,7 +346,7 @@ class _TTkTerminalAltScreen(): self._canvas._data[y][x:x+ps] = [] self._canvas._colors[y][x:x+ps] = [] self._canvas._data[y] += [' ']*ps - self._canvas._colors[y] += [TTkColor.RST]*ps + self._canvas._colors[y] += [self._color]*ps # CSI # P # CSI Pm # P @@ -372,7 +372,7 @@ class _TTkTerminalAltScreen(): w,h = self._w, self._h #TODO: Avoid this HACK baseData = [' ']*w - baseColors = [TTkColor.RST]*w + baseColors = [self._color]*w # Split the content in 3 slices [top, center, bottom] topd = self._canvas._data[:t] topc = self._canvas._colors[:t] @@ -455,7 +455,7 @@ class _TTkTerminalAltScreen(): w,h = self._w, self._h #TODO: Avoid this HACK baseData = [' ']*w - baseColors = [TTkColor.RST]*w + baseColors = [self._color]*w # Split the content in 3 slices [top, center, bottom] topd = self._canvas._data[:t] topc = self._canvas._colors[:t] @@ -497,7 +497,7 @@ class _TTkTerminalAltScreen(): w,h = self._w, self._h ps = min(ps,w-x) self._canvas._data[y][x:x+ps] = [' ']*ps - self._canvas._colors[y][x:x+ps] = [TTkColor.RST]*ps + self._canvas._colors[y][x:x+ps] = [self._color]*ps self._canvas._data[y] = self._canvas._data[y][:w] self._canvas._colors[y] = self._canvas._colors[y][:w]