mwxlib 0.95.2__py3-none-any.whl → 0.95.3__py3-none-any.whl

mwx/__init__.py

@@ -13,7 +13,7 @@ from .controls import Button, ToggleButton, TextCtrl, Choice, Gauge, Indicator
 
 ## Plugman
 ## from . import graphman
-## from .graphman import Frame as GraphFrame, Layer, Thread, Graph
+## from .graphman import Frame as ViewFrame, Layer, Thread, Graph
 
 ## Matplot
 ## from .matplot2 import MatplotPanel

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.95.2"
+__version__ = "0.95.3"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial

mwx/nutshell.py

@@ -1082,9 +1082,6 @@ class EditorInterface(CtrlInterface):
         """Goto char position with selection."""
         if pos is None or pos < 0:
             return
-        ## if pos < 0:
-        ##     pos += self.TextLength + 1 # Counts end-of-buffer (+1:\0)
-        ##     return
         org = self.cpos
         if org == pos:
             return
@@ -1095,7 +1092,7 @@ class EditorInterface(CtrlInterface):
             
             if interactive:
                 ## Update the caret position/status manually.
-                ## To update caret status, shake L/R w/o modifier #TODO: better idea?
+                ## To update caret status, shake L/R w/o modifier
                 ## Don't do this if selection is active.
                 vk = wx.UIActionSimulator()
                 modkeys = [k for k in (wx.WXK_CONTROL, wx.WXK_ALT, wx.WXK_SHIFT)
@@ -1296,7 +1293,7 @@ class EditorInterface(CtrlInterface):
     @can_edit
     def kill_line(self):
         p = self.eol
-        if p == self.cpos:
+        if p == self.cpos: # caret at end of line
             if self.get_char(p) == '\r': p += 1
             if self.get_char(p) == '\n': p += 1
         self.Replace(self.cpos, p, '')
@@ -1304,11 +1301,7 @@ class EditorInterface(CtrlInterface):
     @can_edit
     def backward_kill_line(self):
         p = self.bol
-        text, lp = self.CurLine
-        if text[:lp] == sys.ps2: # caret at the prompt head
-            p -= len(sys.ps2)
-            lp -= len(sys.ps2)
-        if text[:lp] == '' and p: # caret at the beginning of the line
+        if p == self.cpos > 0: # caret at beginning of line
             if self.get_char(p-1) == '\n': p -= 1
             if self.get_char(p-1) == '\r': p -= 1
         self.Replace(p, self.cpos, '')
@@ -2440,6 +2433,8 @@ class Nautilus(Shell, EditorInterface):
                'escape pressed' : (-1, self.on_enter_escmap),
                 'space pressed' : (0, self.OnSpace),
            '*backspace pressed' : (0, self.OnBackspace),
+          'C-backspace pressed' : (0, _F(self.backward_kill_word)),
+          'S-backspace pressed' : (0, _F(self.backward_kill_line)),
                 'enter pressed' : (0, self.OnEnter),
               'C-enter pressed' : (0, _F(self.insertLineBreak)),
             'C-S-enter pressed' : (0, _F(self.insertLineBreak)),
@@ -2692,6 +2687,30 @@ class Nautilus(Shell, EditorInterface):
             return
         evt.Skip()
     
+    @can_edit
+    def backward_kill_line(self):
+        p = max(self.bol, self.bolc) # for debugger mode: bol <= bolc
+        text, lp = self.CurLine
+        if text[:lp] == sys.ps2:
+            self.Replace(p - lp, p, '') # eats ps2:prompt
+            return
+        if p == self.cpos > 0: # caret at beginning of line
+            if self.get_char(p-1) == '\n': p -= 1
+            if self.get_char(p-1) == '\r': p -= 1
+        self.Replace(p, self.cpos, '')
+    
+    @can_edit
+    def backward_kill_word(self):
+        p = self.cpos
+        text, lp = self.CurLine
+        if text[:lp] == sys.ps2:
+            self.goto_char(p - lp) # skips ps2:prompt
+        self.WordLeft()
+        q = max(self.bol, self.bolc) # for debugger mode: bol <= bolc
+        if self.cpos < q:
+            self.goto_char(q) # Don't skip back prompt
+        self.Replace(self.cpos, p, '')
+    
     def OnEnter(self, evt):
         """Called when enter pressed."""
         if not self.CanEdit():

{mwxlib-0.95.2.dist-info → mwxlib-0.95.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.95.2
+Version: 0.95.3
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
 Author: Kazuya O'moto

{mwxlib-0.95.2.dist-info → mwxlib-0.95.3.dist-info}/RECORD

@@ -1,14 +1,14 @@
-mwx/__init__.py,sha256=TbTijMLO3dsX4wargOd3z-z5wjMK8fcogBBr_mgCnSs,815
+mwx/__init__.py,sha256=SNSLQc0IGuE6LDT5mzaAxXRgcH_k6cRVS3gXzFQqdZM,814
 mwx/bookshelf.py,sha256=DAhMQk3_J4rdE50adBMFu5wNz3WdMh_zzJ37O9ncceo,5103
 mwx/controls.py,sha256=JBMUbDgHFf4Dx0PofCdnoQExBnGjxiAeSGkdS_0Qgo4,47673
-mwx/framework.py,sha256=dVj9vz-jGDsVUDa3H4urXRWwe6v6I2unrc7fx6rQEJg,75531
+mwx/framework.py,sha256=t-d8fgYP_fJ9vTxJ9ZZ7POWK7RNds_-q-iGhEI6IVHU,75531
 mwx/graphman.py,sha256=PacQF1Of6oaqw26uFoXaAK9IrwggGRwoJe9uCP5JZ28,70373
 mwx/images.py,sha256=mrnUYH12I3XLVSZcEXlpVltX0XMxufbl2yRvDIQJZqc,49957
 mwx/matplot2.py,sha256=nA7RLW1tf5kQfrenFnrAF900DbrpOUldc3SGaJgJKi0,32794
 mwx/matplot2g.py,sha256=faKpuBdp4H_g-HKfRdxV17AwHtXcfRi2F0myE3cjM04,65393
 mwx/matplot2lg.py,sha256=gI_L_GofQrg5TIgZFMgYu8-7IRoe6VCRG3Ub35ChSpQ,27177
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=DS_Q63RmOpINAmkZkDCYzVS35iGZNSv254gLrSUm9yo,135846
+mwx/nutshell.py,sha256=mGWw2biIKyunTMyrRbLHNdmFLpxVCIP5UTsaeS2m4gw,136594
 mwx/utilus.py,sha256=Uwj6vbNUUztwOswPG75xtsT2y_PZqh3QiJraxmA9iT0,37401
 mwx/wxmon.py,sha256=6es-jVz9Ht7vZnG7VBJcaNYLHY0PnZtij60SXcZRTeY,12727
 mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
@@ -21,8 +21,8 @@ mwx/plugins/frame_listview.py,sha256=fY27r_8ttf2hi-T0CPgY_LGbH9xKkQmSIqgaALMyVCM
 mwx/plugins/line_profile.py,sha256=--9NIc3x5EfRB3L59JvD7rzENQHyiYfu7wWJo6AuMkA,820
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=KaHooM32hrGGgqw75Cbt8lAvACwC6RXadob9LGgNnEc,16806
-mwxlib-0.95.2.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.95.2.dist-info/METADATA,sha256=MlRm2EglFJRORLtyTPSH85NX07m1oL2TY3JtPoHqQ10,1925
-mwxlib-0.95.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mwxlib-0.95.2.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.95.2.dist-info/RECORD,,
+mwxlib-0.95.3.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.95.3.dist-info/METADATA,sha256=zRgIwaO-S04HK4GufhqvHET5KYJTKeyIfct8i36pHXw,1925
+mwxlib-0.95.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mwxlib-0.95.3.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.95.3.dist-info/RECORD,,