pymud 0.21.4.post4__py3-none-any.whl → 0.21.4.post5__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):
@@ -737,8 +741,8 @@ class PyMudBufferControl(UIControl):
     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 +755,15 @@ 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(" ")
-                    new_str.append(ch)
                 else:
-                    new_str.append(ch)
-                    new_str.append(' ')
+                    right = line[idx+1:]
+                    right_len = fragment_list_width(to_formatted_text(ANSI(right)))
+                    if right_len == 0:
+                        new_str.append(" ")
+                        new_str.append(ch)
+                    else:
+                        new_str.append(ch)
+                        new_str.append(' ')
             else:
                 new_str.append(ch)
 
@@ -791,6 +798,43 @@ class PyMudBufferControl(UIControl):
 
         return line
 
+    def fragment_correction(self, fragments: StyleAndTextTuples):
+        """
+        处理ANSI标记，包括颜色标记，下划线标记等
+        """
+        new_fragments = []
+        frag_count = len(fragments)
+        for i  in range(0, frag_count):
+            style, text, *_ = fragments[i]
+            new_text = []
+
+            for j, ch in enumerate(text):
+                if (east_asian_width(ch) in "FWA") and (wcwidth(ch) == 1):
+                    if ch in self.FULL_BLOCKS:
+                        new_text.append(ch * 2)
+                    elif ch in self.SINGLE_LINES:
+                        new_text.append(ch)
+                        new_text.append("─")
+                    elif ch in self.DOUBLE_LINES:
+                        new_text.append(ch)
+                        new_text.append("═")
+                    elif ch in self.SINGLE_LINES_LEFT:
+                        new_text.append("─")
+                        new_text.append(ch)
+                    elif (i == frag_count - 1) and (j == len(ch) - 1):
+                        new_text.append(" ")
+                        new_text.append(ch)
+                    else:
+                        new_text.append(ch)
+                        new_text.append(' ')
+                else:
+                    new_text.append(ch)
+
+            fragments[i] = (style, "".join(new_text))
+            
+        return fragments
+
+
     def create_content(self, width: int, height: int) -> UIContent:
         """
         Generate the content for this user control.
@@ -838,9 +882,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 "
@@ -930,9 +979,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-0.21.4.post4.dist-info → pymud-0.21.4.post5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymud
-Version: 0.21.4.post4
+Version: 0.21.4.post5
 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.post4.dist-info → pymud-0.21.4.post5.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=WAtLEyKgdsEn0-BumToX6BfV29d5iXn7SUyAWM2JPZw,39146
 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.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.4.post5.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymud-0.21.4.post5.dist-info/METADATA,sha256=vPX5Gp0V0ZHqPWUcWhaMVeeSDIn0roS7ZrlGmud44aI,46537
+pymud-0.21.4.post5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pymud-0.21.4.post5.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
+pymud-0.21.4.post5.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
+pymud-0.21.4.post5.dist-info/RECORD,,