]> Sergey Matveev's repositories - nnn.git/commitdiff
Update right click sel
authorArun Prakash Jana <engineerarun@gmail.com>
Sun, 1 Mar 2020 07:14:28 +0000 (12:44 +0530)
committerArun Prakash Jana <engineerarun@gmail.com>
Sun, 1 Mar 2020 07:14:28 +0000 (12:44 +0530)
src/nnn.c

index b44ed61ff64149a48135788871cc65bc381911e8..63297e14d66a32aae883822832357be3a3c6bdfa 100644 (file)
--- a/src/nnn.c
+++ b/src/nnn.c
 #define RFILTER '\\'
 #define CASE ':'
 #define MSGWAIT '$'
+#define SELECT ' '
 #define REGEX_MAX 48
 #define ENTRY_INCR 64 /* Number of dir 'entry' structures to allocate per shot */
 #define NAMEBUF_INCR 0x800 /* 64 dir entries at once, avg. 32 chars per filename = 64*32B = 2KB */
@@ -5174,7 +5175,8 @@ nochange:
                                /* Handle right click selection */
                                if (event.bstate == BUTTON3_PRESSED) {
                                        rightclicksel = 1;
-                                       goto selection;
+                                       presel = SELECT;
+                                       goto nochange;
                                }
 
                                currentmouse ^= 1;
@@ -5612,7 +5614,6 @@ nochange:
                        /* Repopulate as directory content may have changed */
                        goto begin;
                }
-selection:
                case SEL_SEL:
                        if (!ndents)
                                goto nochange;
@@ -5643,14 +5644,13 @@ selection:
                        if (!nselected)
                                unlink(g_selpath);
 #ifndef NOMOUSE
-                       if (rightclicksel) {
+                       if (rightclicksel)
                                rightclicksel = 0;
-                               break;
-                       }
+                       else
 #endif
-                       /* move cursor to the next entry if this is not the last entry */
-                       if (!cfg.picker && cur != ndents - 1)
-                               move_cursor((cur + 1) % ndents, 0);
+                               /* move cursor to the next entry if this is not the last entry */
+                               if (!cfg.picker && cur != ndents - 1)
+                                       move_cursor((cur + 1) % ndents, 0);
                        break;
                case SEL_SELMUL:
                        if (!ndents)