pymud 0.21.2a1__py3-none-any.whl → 0.21.2a2__py3-none-any.whl

pymud/extras.py

@@ -276,33 +276,35 @@ class VSplitWindow(Window):
                     
                 else:
                     # 有split window
-                    # 复制上半部分，正序复制，确保即使有自动折行时，第一行也保持在屏幕最顶部
-                    lineno = start_lineno
-                    while y < upper and lineno < line_count:
-                        line = ui_content.get_line(lineno)
-                        visible_line_to_row_col[y] = (lineno, horizontal_scroll)
-                        x = 0
-                        x, y = copy_line(line, lineno, x, y, is_input=True)
-                        lineno += 1
-                        y += 1
+                    
 
-                    # x = 0
-                    # x, y = copy_line([("","-"*width)], lineno, x, y, is_input=False)
-                    # y += 1
 
-                    # 复制下半部分，倒序复制，确保即使有自动折行时，最后一行也保持在屏幕最底部
+                    # 先复制下半部分，倒序复制，确保即使有自动折行时，最后一行也保持在屏幕最底部
                     y = total
                     lineno = line_count
 
-                    while y >= below and lineno >= 0:
+                    while y > below and lineno >= 0:
                         lineno -= 1
                         # Take the next line and copy it in the real screen.
                         display_lines = ui_content.get_height_for_line(lineno, width, None)
                         y -= display_lines
+                        if y <= below:
+                            break
                         line = ui_content.get_line(lineno)
                         visible_line_to_row_col[y] = (lineno, horizontal_scroll)
                         copy_line(line, lineno, 0, y, is_input=True)
 
+                    # 复制上半部分，正序复制，确保即使有自动折行时，第一行也保持在屏幕最顶部
+                    y = -vertical_scroll_2
+                    lineno = start_lineno
+                    while y <= below and lineno < line_count:
+                        line = ui_content.get_line(lineno)
+                        visible_line_to_row_col[y] = (lineno, horizontal_scroll)
+                        x = 0
+                        x, y = copy_line(line, lineno, x, y, is_input=True)
+                        lineno += 1
+                        y += 1
+
                     # 最后复制分割线，若上下有由于折行额外占用的内容，都用分割线给覆盖掉
                     copy_line([("","-"*width)], -1, 0, upper + 1, is_input=False)
                     

pymud/pymud.py

@@ -9,7 +9,7 @@ from prompt_toolkit.buffer import Buffer
 from prompt_toolkit.application import Application
 from prompt_toolkit.filters import Condition
 from prompt_toolkit.key_binding import KeyBindings
-from prompt_toolkit.layout import ConditionalContainer, Float, VSplit, HSplit, Window, WindowAlign, ScrollbarMargin, NumberedMargin
+from prompt_toolkit.layout import ConditionalContainer, Float, VSplit, HSplit, Window, WindowAlign, ScrollbarMargin, NumberedMargin, to_dimension
 from prompt_toolkit.layout.layout import Layout
 from prompt_toolkit.layout.controls import FormattedTextControl
 from prompt_toolkit.layout.dimension import D
@@ -398,11 +398,26 @@ class PyMudApp:
         else:
             b = None
             
-        if isinstance(b, Buffer):
+        if isinstance(b, SessionBuffer):
             if lines < 0:
-                b.cursor_up(-1 * lines)
-            elif lines > 0:
-                b.cursor_down(lines)
+                if b.start_lineno < 0:
+                    self.console._scroll_up()
+                    b.start_lineno = b.lineCount - self.get_height() * 3 // 2
+                else:
+                    b.start_lineno += lines
+                    if b.start_lineno < 0:
+                        b.start_lineno = 0
+
+            else:
+                if b.start_lineno < 0:
+                    return
+
+                b.start_lineno += lines
+ 
+                if b.start_lineno >= b.lineCount - self.get_height():
+                    b.start_lineno = -1
+
+
 
     def page_up(self, event: KeyPressEvent) -> None:
         "快捷键PageUp: 用于向上翻页。翻页页数为显示窗口行数的一半减去一行。"

{pymud-0.21.2a1.dist-info → pymud-0.21.2a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymud
-Version: 0.21.2a1
+Version: 0.21.2a2
 Summary: a MUD Client written in Python
 Author-email: "newstart@pkuxkx" <crapex@hotmail.com>
 Maintainer-email: "newstart@pkuxkx" <crapex@hotmail.com>
@@ -66,7 +66,7 @@ Dynamic: license-file
 
 ## 版本更新信息
 
-### 0.22.0 (2025-05-27) 本版传错了，已无法使用。
+### 0.22.0 (2025-05-31) 本版传错了，已无法使用。
 
 + 问题修复: 修复了当自动重连启动时，即使会话关闭了，也会自动重连的问题。
 + 实现调整: 重写了专用的SessionBuffer与SessionBufferControl，降低内存使用。

{pymud-0.21.2a1.dist-info → pymud-0.21.2a2.dist-info}/RECORD

@@ -2,7 +2,7 @@ pymud/__init__.py,sha256=oeHz0NM7_DwChCY8f_vQ_fBq0e_HoTd0cahCFwaavWE,806
 pymud/__main__.py,sha256=lIOBiJmi8X-EWXVIx_OoxSgUZ0FYKlZI8hXVnLUYTJQ,61
 pymud/decorators.py,sha256=XaxcZqHw4s44lC2EAgB5kZmbNvJnHGmpZnoW75tUeNY,9844
 pymud/dialogs.py,sha256=4kHycr47UgKQUHGX-KMZvERuWViPjT4hNrGhbe4j-NU,7056
-pymud/extras.py,sha256=b0D7dblleQKKuGRW7TMQadqfG-UPSbVgAHVTV05CzQg,35602
+pymud/extras.py,sha256=aXpxgcJxwMzREKV66ltbxpQiYbyDJKGuO3AJYhDmZy0,35599
 pymud/i18n.py,sha256=qLgvrmYhVfkTHKpbBR-LfYMOrGgi0skHrelbsj7ItbE,3034
 pymud/logger.py,sha256=WCsfXVkgl63qdq1RQEDJBnM7U0S6u8TeORFSMhcoydI,5840
 pymud/main.py,sha256=zaSjNhpbX3FMulKg-UNFrdiIJO8sOmmrUQrkPOalB-4,10224
@@ -10,14 +10,14 @@ pymud/modules.py,sha256=DoCregng5iAj_Hq_yUvRPreRTv2Ehb6sV6_4jfdbsik,11912
 pymud/objects.py,sha256=ZOxNjlPD_d4jk5DMBcXgYcvkt9d8xZih0IQtQlA3f1Y,38668
 pymud/pkuxkx.py,sha256=qDVry-Vd6MNui0NKWZFT52IpmP1sKS5Dz74EDY4tVGQ,14740
 pymud/protocol.py,sha256=KNKJYj9HFRoUy-jigNfhiQdDOM_kRSJE17QFpBarQTg,48335
-pymud/pymud.py,sha256=TEN8xwWjOyMSMEhEVhYBzEe4S7sH8wzgokP19mIhlg4,53058
+pymud/pymud.py,sha256=RSq0Nj0UJHrbsuLDYN-s3KmguBmn0YrhCN33i1zENGM,53529
 pymud/session.py,sha256=K7AUm6JcTryEvknZnMrvS-UfNEDFyMZSD7yiRXivLRM,155063
 pymud/settings.py,sha256=S2sBEM7YtaDOVu3UpGfHBaU7zSB3Zhs7w-Z7PtdS0WQ,7697
 pymud/lang/i18n_chs.py,sha256=2cyaHHLwpYEBBwuQXyRTxa1opX53fTv1f8_QDQeGlC0,16836
 pymud/lang/i18n_eng.py,sha256=jcPz6Y5UuxJBQLY_e8UnEF3GYTlnAD44C14Oj7sK-QI,45935
-pymud-0.21.2a1.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymud-0.21.2a1.dist-info/METADATA,sha256=UGS0dauMo_3wXg4Az_lhkYsfTz_ivEdlKD8EIfZw6QM,44840
-pymud-0.21.2a1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pymud-0.21.2a1.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
-pymud-0.21.2a1.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
-pymud-0.21.2a1.dist-info/RECORD,,
+pymud-0.21.2a2.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymud-0.21.2a2.dist-info/METADATA,sha256=FRQF7ACh0pzWQRcP7Nsyo-IZE4jb6ilcSRv9ZaL92-M,44840
+pymud-0.21.2a2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pymud-0.21.2a2.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
+pymud-0.21.2a2.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
+pymud-0.21.2a2.dist-info/RECORD,,