Ticket #3571: 3571-Rename-mouse.was_drag-to-mouse.last_msg.patch

lib/widget/mouse.c

@@ -132 +132 @@
             msg = MSG_MOUSE_UP;
 
             if (in_widget)
-                *click = !w->mouse.was_drag;
+                /* If the mouse hasn't been dragged since the MSG_MOUSE_DOWN, we trigger a click. */
+                *click = (w->mouse.last_msg == MSG_MOUSE_DOWN);
 
             /*
              * When using xterm, event->buttons reports the buttons' state
@@ -158 +159 @@
     }
 
     if (msg != 0)
-        /* Rememer the current state for next event. */
-        w->mouse.was_drag = ((event->type & GPM_DRAG) != 0);
+        /* Record the current event type for the benefit of the next event. */
+        w->mouse.last_msg = msg;
 
     init_mouse_event (&local, msg, event, w);
 

lib/widget/widget-common.c

@@ -149 +149 @@
     w->mouse_callback = mouse_callback;
     w->set_options = widget_default_set_options_callback;
     w->owner = NULL;
-    w->mouse.capture = FALSE;
     w->mouse.forced_capture = FALSE;
+    w->mouse.capture = FALSE;
+    w->mouse.last_msg = 0;
     w->mouse.last_buttons_down = 0;
-    w->mouse.was_drag = FALSE;
 
     /* Almost all widgets want to put the cursor in a suitable place */
     w->options = W_WANT_CURSOR;

lib/widget/widget-common.h

@@ -112 +112 @@
     /* Mouse-related fields. */
     struct
     {
+        /* Public members: */
+        gboolean forced_capture;        /* Overrides the 'capture' member. Set explicitly by the programmer. */
+
+        /* Implementation details: */
         gboolean capture;       /* Whether the widget "owns" the mouse. */
-        gboolean forced_capture;        /* Overrides the above. Set explicitly by the programmer. */
+        mouse_msg_t last_msg;   /* The previous event type processed. */
         int last_buttons_down;
-        gboolean was_drag;
     } mouse;
 };