Ticket #3954: mc-3954-mouse-with-new-terminfo.patch

lib/tty/key.c

@@ -2127 +2127 @@
 #endif /* KEY_MOUSE */
                           || c == MCKEY_EXTENDED_MOUSE))
     {
-        /* Mouse event */
-        xmouse_get_event (event, c == MCKEY_EXTENDED_MOUSE);
+        /* Mouse event. See tickets 2956 and 3954 for extended mode detection. */
+        xmouse_get_event (event, c == MCKEY_EXTENDED_MOUSE
+#ifdef KEY_MOUSE
+                                 || (c == KEY_MOUSE && xmouse_seq == NULL && xmouse_extended_seq != NULL)
+#endif /* KEY_MOUSE */
+                                 );
         c = (event->type != 0) ? EV_MOUSE : EV_NONE;
     }
     else if (c == MCKEY_BRACKETED_PASTING_START)

lib/tty/mouse.c

@@ -90 +90 @@
 
     case MOUSE_XTERM_NORMAL_TRACKING:
     case MOUSE_XTERM_BUTTON_EVENT_TRACKING:
-        define_sequence (MCKEY_MOUSE, xmouse_seq, MCKEY_NOACTION);
-        define_sequence (MCKEY_EXTENDED_MOUSE, xmouse_extended_seq, MCKEY_NOACTION);
+        if (xmouse_seq != NULL)
+        {
+            define_sequence (MCKEY_MOUSE, xmouse_seq, MCKEY_NOACTION);
+        }
+        if (xmouse_extended_seq != NULL)
+        {
+            define_sequence (MCKEY_EXTENDED_MOUSE, xmouse_extended_seq, MCKEY_NOACTION);
+        }
         break;
 
     default:

lib/tty/tty.c

@@ -361 +361 @@
         }
     }
 
-    /* No termcap for SGR extended mouse (yet), hardcode it for now */
+    /* There's only one termcap entry "kmous", typically containing "\E[M" or "\E[<".
+     * We need the former in xmouse_seq, the latter in xmouse_extended_seq.
+     * See tickets 2956 and 3954 for details. */
     if (xmouse_seq != NULL)
+    {
+        if (strcmp (xmouse_seq, ESC_STR "[<") == 0)
+        {
+            xmouse_seq = NULL;
+        }
         xmouse_extended_seq = ESC_STR "[<";
+    }
 }
 
 /* --------------------------------------------------------------------------------------------- */