GitHub #52: Pass through initial click-to-select to underlying edit mode

mfp/gui/input_manager.py

@@ -14,6 +14,9 @@
 from ..gui_slave import MFPGUI
 
 class InputManager (object):
+    class InputNeedsRequeue (Exception):
+        pass 
+
     def __init__(self, window):
         self.window = window
         self.global_mode = None
@@ -158,5 +161,15 @@ def handle_event(self, stage, event):
                 self.pointer_obj_time = None 
         else:
             return False
-        return self.handle_keysym(keysym)
 
+        retry_count = 0
+        while True:
+            try: 
+                retry_count += 1
+                rv = self.handle_keysym(keysym)
+            except self.InputNeedsRequeue, e:
+                if retry_count < 5:
+                    continue
+                else:
+                    return False 
+            return rv 

mfp/gui/modes/clickable.py

@@ -28,12 +28,6 @@ def __init__(self, window, element, descrip):
         self.bind("M1DOUBLEUP", self.unclick, "Send click up")
         self.bind("M1TRIPLEUP", self.unclick, "Send click up")
 
-    def enable(self):
-        if (self.manager.pointer_obj is self.widget 
-            and 1 in self.manager.keyseq.mouse_buttons):
-            self.clickstate = True
-            self.widget.clicked()
-
     def disable(self):
         if self.clickstate:
             self.widget.unclicked()

mfp/gui/modes/patch_control.py

@@ -39,6 +39,7 @@ def drag_start(self):
         if self.manager.pointer_obj and self.manager.pointer_obj not in self.window.selected:
             self.window.unselect_all()
             self.window.select(self.manager.pointer_obj)
+            raise self.manager.InputNeedsRequeue()
 
         self.drag_started = True
         self.drag_start_x = self.manager.pointer_ev_x

mfp/gui/modes/patch_edit.py

@@ -182,6 +182,7 @@ def drag_start(self):
             self.window.unselect_all()
             self.window.select(self.manager.pointer_obj)
             self.enable_selection_edit()
+            raise self.manager.InputNeedsRequeue()
 
         self.drag_started = True
         if (self.manager.pointer_obj is None 
@@ -252,12 +253,10 @@ def drag_end(self):
     def selbox_start(self, select_mode):
         self.selbox_started = True
 
-        if (self.manager.pointer_obj is not None and
-            self.manager.pointer_obj not in self.window.selected):
-
-            if select_mode:
+        if (self.manager.pointer_obj is not None):
+            if self.manager.pointer_obj not in self.window.selected:
                 self.window.select(self.manager.pointer_obj)
-            else:
+            elif (not select_mode) and self.manager.pointer_obj in self.window.selected:
                 self.window.unselect(self.manager.pointer_obj)
 
             if self.window.selected:
@@ -281,9 +280,6 @@ def selbox_motion(self, select_mode):
         px = self.manager.pointer_ev_x
         py = self.manager.pointer_ev_y
 
-        dx = px - self.drag_last_x
-        dy = py - self.drag_last_y
-
         self.drag_last_x = px
         self.drag_last_y = py
 
@@ -298,10 +294,12 @@ def selbox_motion(self, select_mode):
                     self.window.select(obj)
                     self.enable_selection_edit()
             else:
+                if obj not in self.selbox_changed:
+                    self.selbox_changed.append(obj)
                 if obj in self.window.selected:
-                    if obj not in self.selbox_changed:
-                        self.selbox_changed.append(obj)
                     self.window.unselect(obj)
+                else: 
+                    self.window.select(obj)
 
             if not self.window.selected:
                 self.disable_selection_edit()
@@ -321,6 +319,7 @@ def selbox_motion(self, select_mode):
 
     def selbox_end(self):
         self.selbox_started = False
+        self.selbox_changed = [] 
         self.window.hide_selection_box()
         return True