xshell-like 0.2.1__tar.gz → 0.2.2__tar.gz

{xshell_like-0.2.1/xshell_like.egg-info → xshell_like-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xshell-like
-Version: 0.2.1
+Version: 0.2.2
 Summary: 类 Xshell 终端工具：SSH/串口、批量连接、多页签、会话管理、SFTP、免密部署
 Author: weixin_53700778
 License: MIT

{xshell_like-0.2.1 → xshell_like-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "xshell-like"
-version = "0.2.1"
+version = "0.2.2"
 description = "类 Xshell 终端工具：SSH/串口、批量连接、多页签、会话管理、SFTP、免密部署"
 readme = "README.md"
 requires-python = ">=3.10"

{xshell_like-0.2.1 → xshell_like-0.2.2}/tests/test_terminal.py

@@ -139,3 +139,49 @@ def test_cursor_follows_ansi_cursor_move():
     assert tb.cursor == (0, 1)
     tb.feed(b"\x1b[1A")  # CUU: up one row, column unchanged → row 0, col 0
     assert tb.cursor == (0, 0)
+
+
+# ---------- resize anchoring (xterm semantics) ----------
+
+def test_grow_keeps_content_at_top_blanks_below():
+    tb = TerminalBuffer(cols=20, rows=6)
+    tb.feed(b"line1\r\nline2\r\nline3\r\nline4")
+    tb.resize(20, 12)
+    lines = [ln.rstrip() for ln in tb.render().splitlines()]
+    assert lines[0] == "line1" and lines[3] == "line4"
+    assert all(not ln for ln in lines[4:])
+    assert tb.cursor == (5, 3)
+
+
+def test_shrink_keeps_cursor_line_visible():
+    """Regression: pyte's own shrink truncates the bottom and drops the prompt
+    line — after SIGWINCH the remote repainted it mid-screen with blank space
+    above. xterm semantics: the cursor line must stay visible."""
+    tb = TerminalBuffer(cols=20, rows=8)
+    tb.feed(b"l1\r\nl2\r\nl3\r\nprompt$ ")
+    tb.resize(20, 3)
+    lines = [ln.rstrip() for ln in tb.render().splitlines()]
+    assert lines[-1].startswith("prompt$")  # cursor line kept at the bottom
+    assert len(lines) == 3
+    assert tb.cursor[1] <= 2  # cursor clamped into the shrunken screen
+
+
+def test_shrink_then_grow_no_blank_gap_above_content():
+    tb = TerminalBuffer(cols=20, rows=8)
+    tb.feed(b"l1\r\nl2\r\nl3\r\nprompt$ ")
+    tb.resize(20, 3)   # user drags the window smaller
+    tb.resize(20, 8)   # ...then bigger again
+    lines = [ln.rstrip() for ln in tb.render().splitlines()]
+    assert lines[0] == "l2"  # l1 went to scrollback, content anchored to top
+    assert lines[2].startswith("prompt$")
+    assert all(not ln for ln in lines[3:])  # blanks BELOW content, never above
+
+
+def test_shrink_drops_top_lines_into_scrollback():
+    tb = TerminalBuffer(cols=20, rows=6)
+    tb.feed(b"a\r\nb\r\nc\r\nd\r\ne\r\nf\r\nprompt$ ")  # cursor on row 6
+    tb.resize(20, 4)  # cursor line must survive -> 3 top lines to scrollback
+    sb = tb.scrollback
+    assert "a" in sb and "b" in sb and "c" in sb
+    lines = [ln.rstrip() for ln in tb.render().splitlines()]
+    assert lines[-1].startswith("prompt$")

{xshell_like-0.2.1 → xshell_like-0.2.2}/xshell/__main__.py

@@ -3,12 +3,17 @@ import sys
 
 
 def main() -> int:
+    from PySide6.QtCore import Qt
     from PySide6.QtWidgets import QApplication
 
     from xshell.core.storage import SessionStore
     from xshell.ui.main_window import MainWindow
     from xshell.ui.theme import apply_theme
 
+    # honor the display's fractional scaling exactly (HiDPI / 4K screens)
+    QApplication.setHighDpiScaleFactorRoundingPolicy(
+        Qt.HighDpiScaleFactorRoundingPolicy.PassThrough
+    )
     app = QApplication(sys.argv)
     app.setApplicationName("xshell-like")
     app.setOrganizationName("xshell-like")

{xshell_like-0.2.1 → xshell_like-0.2.2}/xshell/core/terminal.py

@@ -69,8 +69,34 @@ class TerminalBuffer:
         rows = max(2, int(rows))
         if cols == self.cols and rows == self.rows:
             return
-        # pyte signature is resize(lines, columns) — rows first!
-        self.screen.resize(rows, cols)
+        old_rows = self.rows
+        buffer = self.screen.buffer
+        cursor_y = min(self.screen.cursor.y, old_rows - 1)
+
+        # Line dimension is handled HERE, with xterm semantics: content is
+        # top-anchored and a shrink drops lines from the TOP into scrollback
+        # so the cursor's line (the prompt!) stays visible. pyte's own resize
+        # keeps cursor.y absolute instead — after a shrink the prompt line is
+        # dropped and the remote's SIGWINCH repaint lands mid-screen with
+        # blank space above it ("content doesn't fill the window").
+        drop = max(0, cursor_y - (rows - 1)) if rows < old_rows else 0
+        for y in range(drop):
+            row = buffer.get(y)
+            if row is not None:
+                self.screen.history.top.append(row)
+        old_rows_list = [buffer.get(y) for y in range(old_rows)]
+        buffer.clear()
+        for new_y in range(rows):
+            src = old_rows_list[drop + new_y] if drop + new_y < old_rows else None
+            if src is not None:
+                buffer[new_y] = src
+        self.screen.cursor.y = max(0, min(cursor_y - drop, rows - 1))
+        self.screen.lines = rows
+
+        # Column dimension: pyte truncates/pads the right side fine. With
+        # lines already equal, its resize only runs the column logic.
+        pyte.Screen.resize(self.screen, rows, cols)
+        self.screen.dirty = set(range(rows))
 
     # ---------- output ----------
 
@@ -109,7 +135,7 @@ class TerminalBuffer:
             current_style = style
             run.append(char.data if char.data else " ")
         parts.append(self._wrap("".join(run), current_style))
-        return "".join(parts).rstrip(" ") or " "
+        return "".join(parts).rstrip(" ") or " "
 
     @staticmethod
     def _char_style(char: Char) -> Optional[str]:
@@ -144,7 +170,7 @@ class TerminalBuffer:
             text.replace("&", "&amp;")
             .replace("<", "&lt;")
             .replace(">", "&gt;")
-            .replace(" ", " ")
+            .replace(" ", " ")
         )
         if not style:
             return text

{xshell_like-0.2.1 → xshell_like-0.2.2/xshell_like.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xshell-like
-Version: 0.2.1
+Version: 0.2.2
 Summary: 类 Xshell 终端工具：SSH/串口、批量连接、多页签、会话管理、SFTP、免密部署
 Author: weixin_53700778
 License: MIT