pymud 0.21.4.post4__py3-none-any.whl → 0.21.5__py3-none-any.whl

pymud/extras.py

@@ -502,7 +502,11 @@ class SessionSelectionState:
     start_col: int = -1
     end_col: int = -1
     def is_valid(self):
-        return abs(self.start_row - self.end_row) + abs(self.start_col - self.end_col) > 0
+        return  (self.start_row >= 0) and \
+                (self.start_col >= 0) and \
+                (self.end_row >= 0) and \
+                (self.end_col >= 0) and \
+                abs(self.start_row - self.end_row) + abs(self.start_col - self.end_col) > 0
 
     @property
     def rows(self):
@@ -622,6 +626,7 @@ class SessionBuffer(BufferBase):
         if line.endswith(self.newline):
             line = line.rstrip(self.newline)
             newline_after_append = True
+            
         if not self.newline in line:
             if self._isnewline:
                 self._lines.append(line)
@@ -655,6 +660,8 @@ class SessionBuffer(BufferBase):
         self._lines.clear()
         self.nosplit()
 
+    def forceNewline(self):
+        self._isnewline = True
 
     @property
     def lineCount(self):
@@ -709,9 +716,11 @@ class PyMudBufferControl(UIControl):
 
         # 为MUD显示进行校正的处理，包括对齐校正，换行颜色校正等
         self.FULL_BLOCKS = set("▂▃▅▆▇▄█━")
+        self.TABLE_LINES  = set("┠┌└├┬┼┴╭╰─┨┘┐┤╮╯╔╚╠╦╪╩═╗╝╣┃││║")
         self.SINGLE_LINES = set("┠┌└├┬┼┴╭╰─")
-        self.SINGLE_LINES_LEFT = set("┨┘┐┤")
+        self.SINGLE_LINES_LEFT = set("┨┘┐┤╮╯")
         self.DOUBLE_LINES = set("╔╚╠╦╪╩═")
+        self.DOUBLE_LINES_LEFT = set("╗╝╣")
         self.ALL_COLOR_REGX  = re.compile(r"(?:\[[\d;]+m)+")
         self.AVAI_COLOR_REGX = re.compile(r"(?:\[[\d;]+m)+(?!$)")
         self._color_start = ""
@@ -733,12 +742,11 @@ class PyMudBufferControl(UIControl):
         """
         return False
 
-
     def width_correction(self, line: str) -> str:
         new_str = []
         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)
@@ -751,12 +759,18 @@ class PyMudBufferControl(UIControl):
                 elif ch in self.SINGLE_LINES_LEFT:
                     new_str.append("─")
                     new_str.append(ch)
-                elif idx == len(line) - 1:
-                    new_str.append(" ")
+                elif ch in self.DOUBLE_LINES_LEFT:
+                    new_str.append("═")
                     new_str.append(ch)
                 else:
-                    new_str.append(ch)
-                    new_str.append(' ')
+                    right = str.rstrip(line[idx+1:])
+                    right_len = fragment_list_width(to_formatted_text(ANSI(right)))
+                    if ((idx == len(line) - 1) or (right_len == 0)) and (ch in self.TABLE_LINES):
+                        new_str.append(" ")
+                        new_str.append(ch)
+                    else:
+                        new_str.append(ch)
+                        new_str.append(' ')
             else:
                 new_str.append(ch)
 
@@ -838,9 +852,14 @@ class PyMudBufferControl(UIControl):
             
             # 其他校正
             line = self.line_correction(line)
+            #line = self.return_correction(line)
 
             # 处理ANSI标记（生成FormmatedText）
             fragments = to_formatted_text(ANSI(line))
+            #fragments = explode_text_fragments(fragments)
+
+            # if Settings.client["beautify"]:
+            #     fragments = self.fragment_correction(fragments)
 
             # 选择内容标识
             selected_fragment = " class:selected "
@@ -850,8 +869,10 @@ class PyMudBufferControl(UIControl):
 
             if selection_at_line:
                 from_, to = selection_at_line
-                # from_ = source_to_display(from_)
-                # to = source_to_display(to)
+                total_display = fragment_list_width(fragments)
+                if to == len(buffer.getLine(i)):
+                    to = total_display
+
 
                 fragments = explode_text_fragments(fragments)
 
@@ -860,12 +881,14 @@ class PyMudBufferControl(UIControl):
                     # visualize the selection.
                     return [(selected_fragment, " ")]
                 else:
-                    for i in range(from_, to):
+                    for i in range(from_, min(to, total_display+1)):
                         if i < len(fragments):
                             old_fragment, old_text, *_ = fragments[i]
                             fragments[i] = (old_fragment + selected_fragment, old_text)
-                        elif i == len(fragments):
-                            fragments.append((selected_fragment, " "))
+                        # elif i == len(fragments):
+                        #     fragments.append((selected_fragment, " "))
+
+
 
             return fragments
 
@@ -930,9 +953,8 @@ class PyMudBufferControl(UIControl):
                         buffer.selection.end_row = position.y
                         buffer.selection.end_col = position.x
 
-                        if buffer.selection.start_row == buffer.selection.end_row and buffer.selection.start_col == buffer.selection.end_col:
-                            buffer.selection = SessionSelectionState(-1, -1, -1, -1)
-
+                    if not buffer.selection.is_valid():
+                        buffer.exit_selection()
 
                     # Select word around cursor on double click.
                     # Two MOUSE_UP events in a short timespan are considered a double click.

pymud/pymud.py

@@ -1084,12 +1084,8 @@ class PyMudApp:
         "命令行回车按键处理"
         cmd_line = buffer.text
         space_index = cmd_line.find(" ")
-        
-        if len(cmd_line) == 0:
-            if self.current_session:
-                self.current_session.writeline("")
-        
-        elif cmd_line[0] != Settings.client["appcmdflag"]:
+
+        if (len(cmd_line) >= 1) and (cmd_line[0] != Settings.client["appcmdflag"]):
             if self.current_session:
                 self.current_session.last_command = cmd_line
 
@@ -1101,6 +1097,7 @@ class PyMudApp:
             if self.current_session:
                 if len(cmd_line) == 0:
                     self.current_session.writeline("")
+        
                 else:
                     try:
                         self.current_session.log.log(f"{Settings.gettext('msg_cmdline_input')} {cmd_line}\n")

pymud/session.py

@@ -810,6 +810,9 @@ class Session:
         else:
             if Settings.client["echo_input"]:
                 self.writetobuffer(f"\x1b[32m{line}\x1b[0m", True)
+            elif len(line) == 0:
+                # 当向服务器仅送出空行时，本地强制后续显示换行
+                self.buffer.forceNewline()
             else:
                 self.log.log(f"\x1b[32m{line}\x1b[0m\n")
 

pymud/settings.py

@@ -15,7 +15,7 @@ class Settings:
     "APP 简要描述"
     __version__   = importlib.metadata.version("pymud")
     "APP 当前版本"
-    __release__   = "2025-06-08"
+    __release__   = "2025-06-09"
     "APP 当前版本发布日期"
     __author__    = "本牛(newstart)@北侠"
     "APP 作者"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymud
-Version: 0.21.4.post4
+Version: 0.21.5
 Summary: a MUD Client written in Python
 Author-email: "newstart@pkuxkx" <crapex@hotmail.com>
 Maintainer-email: "newstart@pkuxkx" <crapex@hotmail.com>
@@ -66,6 +66,12 @@ Dynamic: license-file
 
 ## 版本更新信息
 
+### 0.21.5 (2025-06-09)
+
++ 功能完善: 完善了美化功能，已知情况下，应该不会出现断行和不对齐问题了。
++ 功能完善: 向服务器仅送出回车符号时，本地显示也强制换行。在出现『未完待续』情况时，回车后不会再跟在后面显示了，而是会强制从下一行开始。
++ 功能完善: 当对行进行双击选择时，背景增加的选择标记（灰色）会按照实际显示的宽度进行匹配，而不是按照原始数据的宽度进行匹配。
+
 ### 0.21.4 (2025-06-08)
 
 + 问题修复: 修复了在多行选择碰到空行时，会导致从头开始全选的问题。

{pymud-0.21.4.post4.dist-info → pymud-0.21.5.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=-rpiNCxDshb4tEN0a3W1DVWLWlkIhapoHZpsEFjeQoI,37300
+pymud/extras.py,sha256=iadkEIIiRoFjRX8ezMxK3Dud6wuVf14ZbluXC0hfmuU,38284
 pymud/i18n.py,sha256=qLgvrmYhVfkTHKpbBR-LfYMOrGgi0skHrelbsj7ItbE,3034
 pymud/logger.py,sha256=F2LBUogdzv2WXHo10CNorDh2VleAX1Wbwmxc3zznHlM,5823
 pymud/main.py,sha256=zaSjNhpbX3FMulKg-UNFrdiIJO8sOmmrUQrkPOalB-4,10224
@@ -10,14 +10,14 @@ pymud/modules.py,sha256=CsOqY1c59CrejltCS4wf7QqdCr5k_ghel8AUqlKVGIw,11873
 pymud/objects.py,sha256=NlKAQnV6v9lSkz94zmgb513HPxskY8-tXnOdrYhuktc,38629
 pymud/pkuxkx.py,sha256=qDVry-Vd6MNui0NKWZFT52IpmP1sKS5Dz74EDY4tVGQ,14740
 pymud/protocol.py,sha256=noptJs6K0L9qM8VZIeP65H4k9FPLGJqxvm3qY2iAwvI,48315
-pymud/pymud.py,sha256=SrPGSls1QqrfSzctNpHV1gt_-M9WpOWi5cGH2VF8W6w,53483
-pymud/session.py,sha256=sTswAPEl5GWcxzYmgovG8lOlflNTd5k8ggW6zJ6vcMY,154690
-pymud/settings.py,sha256=V4wHKP2UjmX_l2bKJoUJSfNbH7vs3GZlN4u-1tRFbxA,7697
+pymud/pymud.py,sha256=K1tTKlkE6y3oZDsP2t6iN5XNMQ1R_QE2um1JgI8THRg,53381
+pymud/session.py,sha256=_ReMajT7uhTmyOppnUd9VScSFe6Hbl_smEaOD_hXJxc,154851
+pymud/settings.py,sha256=YE-RWG-TRD92gIXsVrwY0VOCvjudl-68naFcgOfCJ7I,7697
 pymud/lang/i18n_chs.py,sha256=2cyaHHLwpYEBBwuQXyRTxa1opX53fTv1f8_QDQeGlC0,16836
 pymud/lang/i18n_eng.py,sha256=jcPz6Y5UuxJBQLY_e8UnEF3GYTlnAD44C14Oj7sK-QI,45935
-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,,
+pymud-0.21.5.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymud-0.21.5.dist-info/METADATA,sha256=YawLwvGN7CGEHNvmX5VGL3ADyDDiTHyze67MW-ySDXM,47052
+pymud-0.21.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pymud-0.21.5.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
+pymud-0.21.5.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
+pymud-0.21.5.dist-info/RECORD,,