Ticket #3571: 3571-FIX-FOR-WEdit-get-rid-of-mouse-event-pump.patch

src/editor/editwidget.c

@@ -212 +212 @@
 edit_restore_size (WEdit * edit)
 {
     edit->drag_state = MCEDIT_DRAG_NORMAL;
+    WIDGET (edit)->mouse.forced_capture = FALSE;
     widget_set_size (WIDGET (edit), edit->y_prev, edit->x_prev, edit->lines_prev, edit->cols_prev);
     dlg_redraw (WIDGET (edit)->owner);
 }
@@ -1010 +1011 @@
 
     if (msg == MSG_MOUSE_UP)
     {
-        /* Exit drag mode. */
+        /* Exit move/resize mode. */
         edit_execute_cmd (edit, CK_Enter, -1);
         return;
     }
 
+    if (msg != MSG_MOUSE_DRAG)
+        /**
+         * We ignore any other events. Specifically, MSG_MOUSE_DOWN.
+         *
+         * When the move/resize is initiated by the menu, we let the user
+         * stop it by clicking with the mouse. Which is why we don't want
+         * a mouse down to affect the window.
+         */
+        return;
+
     /* Convert point to global coordinates for easier calculations. */
     global_x = event->x + w->x;
     global_y = event->y + w->y;
@@ -1086 +1097 @@
                 else
                 {
                     /* start window move */
-                    edit->drag_state_start = event->x;
                     edit_execute_cmd (edit, CK_WindowMove, -1);
+                    edit->drag_state_start = event->x;
                 }
                 break;
             }
@@ -1355 +1366 @@
  *
  * @param edit    editor object
  * @param command action id
- * @return TRUE if mouse actions was handled, FALSE otherwise
+ * @return TRUE if the action was handled, FALSE otherwise
  */
 
 gboolean
 edit_handle_move_resize (WEdit * edit, long command)
 {
+    Widget *w = WIDGET (edit);
     gboolean ret = FALSE;
 
     if (edit->fullscreen)
     {
         edit->drag_state = MCEDIT_DRAG_NORMAL;
+        w->mouse.forced_capture = FALSE;
         return ret;
     }
 
@@ -1379 +1392 @@
             edit->drag_state = MCEDIT_DRAG_MOVE;
             edit_save_size (edit);
             edit_status (edit, TRUE);   /* redraw frame and status */
+            /**
+             * If a user initiates a move by the menu, not by the mouse, we
+             * make a subsequent mouse drag pull the frame from its middle.
+             * (We can instead choose '0' to pull it from the corner.)
+             */
+            edit->drag_state_start = w->cols / 2;
             ret = TRUE;
             break;
         case CK_WindowResize:
@@ -1444 +1463 @@
         break;
     }
 
+    /**
+     * - We let the user stop a resize/move operation by clicking with the
+     *   mouse anywhere. ("clicking" = pressing and releasing a button.)
+     * - We let the user perform a resize/move operation by a mouse drag
+     *   initiated anywhere.
+     *
+     * "Anywhere" means: inside or outside the window. We make this happen
+     * with the 'forced_capture' flag.
+     */
+    w->mouse.forced_capture = (edit->drag_state != MCEDIT_DRAG_NORMAL);
+
     return ret;
 }