pymud 0.21.4.post2__py3-none-any.whl → 0.21.4.post4__py3-none-any.whl

pymud/extras.py

@@ -271,7 +271,7 @@ class VSplitWindow(Window):
                     # 复制上半部分，正序复制，确保即使有自动折行时，第一行也保持在屏幕最顶部
                     y = -vertical_scroll_2
                     lineno = start_lineno
-                    while y < below and lineno < line_count:
+                    while y <= upper and lineno < line_count:
                         line = ui_content.get_line(lineno)
                         visible_line_to_row_col[y] = (lineno, horizontal_scroll)
                         x = 0
@@ -358,7 +358,7 @@ class VSplitWindow(Window):
             if not b:
                 return
             start_lineno = b.start_lineno
-            if (start_lineno >= 0) and (start_lineno < b.lineCount - (len(info.displayed_lines) - 1) // 2):
+            if (start_lineno >= 0) and (start_lineno < b.lineCount - (info.window_height - 1) // 2):
                 b.start_lineno = b.start_lineno + 1
             else:
                 b.start_lineno = -1
@@ -381,9 +381,8 @@ class VSplitWindow(Window):
             elif start_lineno == 0:
                 b.start_lineno = 0
 
-            else:
-                b.start_lineno = b.lineCount - (len(info.displayed_lines) - 1) // 2
-
+            elif b.start_lineno < 0 and b.lineCount >= info.window_height:
+                b.start_lineno = b.lineCount - (info.window_height - 1) // 2
 
 
 class EasternButton(Button):
@@ -503,21 +502,7 @@ class SessionSelectionState:
     start_col: int = -1
     end_col: int = -1
     def is_valid(self):
-        if self.start_row >= 0 and self.end_row >= 0 and self.start_col >= 0 and self.end_col >= 0:
-            if (self.start_row == self.end_row) and (self.start_col == self.end_col):
-                return False
-            # elif self.start_row > self.end_row:
-            #     srow, scol = self.end_row, self.end_col
-            #     erow, ecol = self.start_row, self.start_col
-            #     self.start_row, self.end_row = srow, erow
-            #     self.start_col, self.end_col = scol, ecol
-            # elif self.start_row == self.end_row and self.start_col > self.end_col:
-            #     scol, ecol = self.end_col, self.start_col
-            #     self.start_col, self.end_col = scol, ecol
-
-            return True
-
-        return False
+        return abs(self.start_row - self.end_row) + abs(self.start_col - self.end_col) > 0
 
     @property
     def rows(self):
@@ -654,7 +639,7 @@ class SessionBuffer(BufferBase):
         self._isnewline = newline_after_append
 
         ## limit buffered lines
-        if len(self._lines) > self.max_buffered_lines:
+        if self.start_lineno < 0 and len(self._lines) > self.max_buffered_lines:
             diff = len(self._lines) - self.max_buffered_lines
             del self._lines[:diff]
             ## adjust selection
@@ -665,10 +650,11 @@ class SessionBuffer(BufferBase):
         get_app().invalidate()
 
     def clear(self):
+        self.exit_selection()
+        self._isnewline = True
         self._lines.clear()
-        self.selection = SessionSelectionState(-1, -1, -1, -1)
+        self.nosplit()
 
-        get_app().invalidate()
 
     @property
     def lineCount(self):
@@ -722,7 +708,7 @@ class PyMudBufferControl(UIControl):
         self.buffer = buffer
 
         # 为MUD显示进行校正的处理，包括对齐校正，换行颜色校正等
-        self.FULL_BLOCKS = set("▂▃▅▆▇▄█━◇◆")
+        self.FULL_BLOCKS = set("▂▃▅▆▇▄█━")
         self.SINGLE_LINES = set("┠┌└├┬┼┴╭╰─")
         self.SINGLE_LINES_LEFT = set("┨┘┐┤")
         self.DOUBLE_LINES = set("╔╚╠╦╪╩═")
@@ -753,7 +739,6 @@ class PyMudBufferControl(UIControl):
         for idx, ch in enumerate(line):
      
             if (east_asian_width(ch) in "FWA") and (wcwidth(ch) == 1):
-                
                 if ch in self.FULL_BLOCKS:
                     new_str.append(ch)
                     new_str.append(ch)
@@ -802,7 +787,7 @@ class PyMudBufferControl(UIControl):
         # 处理Tab(\r)符号（^I）对齐
         line = self.tab_correction(line)
 
-        line += "\u200B"    # 最后添加一个不可见字符，用于允许选择行时选到最后一个字符
+        line += " "    # 最后添加一个空格，用于允许选择行时选到最后一个字符
 
         return line
 

{pymud-0.21.4.post2.dist-info → pymud-0.21.4.post4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymud
-Version: 0.21.4.post2
+Version: 0.21.4.post4
 Summary: a MUD Client written in Python
 Author-email: "newstart@pkuxkx" <crapex@hotmail.com>
 Maintainer-email: "newstart@pkuxkx" <crapex@hotmail.com>

{pymud-0.21.4.post2.dist-info → pymud-0.21.4.post4.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=rNuDaKk65Cwc9K6t0-BpqNUORs8-8X5Xsv6YaLQ7hc4,9839
 pymud/dialogs.py,sha256=1xo5NJjch-u7RSRcclhvUE4gi8POgiZWK84lNx_HJbs,6891
-pymud/extras.py,sha256=hanyH3_mTagZplG72ENBcqGz-QaSD0EBR2rA8be15Ts,37944
+pymud/extras.py,sha256=-rpiNCxDshb4tEN0a3W1DVWLWlkIhapoHZpsEFjeQoI,37300
 pymud/i18n.py,sha256=qLgvrmYhVfkTHKpbBR-LfYMOrGgi0skHrelbsj7ItbE,3034
 pymud/logger.py,sha256=F2LBUogdzv2WXHo10CNorDh2VleAX1Wbwmxc3zznHlM,5823
 pymud/main.py,sha256=zaSjNhpbX3FMulKg-UNFrdiIJO8sOmmrUQrkPOalB-4,10224
@@ -15,9 +15,9 @@ pymud/session.py,sha256=sTswAPEl5GWcxzYmgovG8lOlflNTd5k8ggW6zJ6vcMY,154690
 pymud/settings.py,sha256=V4wHKP2UjmX_l2bKJoUJSfNbH7vs3GZlN4u-1tRFbxA,7697
 pymud/lang/i18n_chs.py,sha256=2cyaHHLwpYEBBwuQXyRTxa1opX53fTv1f8_QDQeGlC0,16836
 pymud/lang/i18n_eng.py,sha256=jcPz6Y5UuxJBQLY_e8UnEF3GYTlnAD44C14Oj7sK-QI,45935
-pymud-0.21.4.post2.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymud-0.21.4.post2.dist-info/METADATA,sha256=4B4ve7Q2LXY5wMzmmPbge1sGxYlBq-fFRI8uu4LUPXg,46537
-pymud-0.21.4.post2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pymud-0.21.4.post2.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
-pymud-0.21.4.post2.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
-pymud-0.21.4.post2.dist-info/RECORD,,
+pymud-0.21.4.post4.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymud-0.21.4.post4.dist-info/METADATA,sha256=gJWAlyqUnFxb1mtHbjXl30Zd5LSuAAtUDKvUy_LVSjg,46537
+pymud-0.21.4.post4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pymud-0.21.4.post4.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
+pymud-0.21.4.post4.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
+pymud-0.21.4.post4.dist-info/RECORD,,