Ticket #2530: mc-git20110403-dont-reset-selection-on-gpm-click.diff

src/editor/edit-widget.h

@@ -95 +95 @@
     int column1;                /* position of column highlight start */
     int column2;                /* position of column highlight end */
     long bracket;               /* position of a matching bracket */
+    gboolean mark_dragged;      /* flag to save if mouse was dragged to select something */
 
     /* cache speedup for line lookups */
     int caches_valid;

src/editor/editwidget.c

@@ -159 +159 @@
         goto update;
     }
 
-    /* A lone up mustn't do anything */
-    if (edit->mark2 != -1 && event->type & (GPM_UP | GPM_DRAG))
-        return MOU_NORMAL;
-
     if (event->type & (GPM_DOWN | GPM_UP))
         edit_push_key_press (edit);
 
@@ -195 +191 @@
         edit_move_to_prev_col (edit, edit_bol (edit, edit->curs1));
 
     if (event->type & GPM_DOWN)
+        edit->mark_dragged = FALSE; /* reset dragged flag */
+
+    if ((event->type & GPM_DRAG) && !edit->mark_dragged)
     {
-        edit_mark_cmd (edit, 1);        /* reset */
-        edit->highlight = 0;
+        edit_mark_cmd (edit, 1); /* clear selection */
+        edit_mark_cmd (edit, 0); /* begin selection */
+        edit->mark_dragged = TRUE;
     }
-
-    if (!(event->type & GPM_DRAG))
-        edit_mark_cmd (edit, 0);
+    else if ((event->type & GPM_UP) && edit->mark_dragged)
+        edit_mark_cmd (edit, 0); /* end selection */
 
   update:
     edit_find_bracket (edit);