patch 9.0.0793: MS-Windows: mouse scroll events only work with the dll

Problem:    MS-Windows: mouse scroll events only work with the dll.
Solution:   Accept CSI codes for MS-Windows without the GUI. (Christopher
            Plewright, closes #11401)

diff --git a/src/getchar.c b/src/getchar.c
index 1ed2fbf1a2dfda150c7c200df7490abc3b661ff8..bbc6d6ec298b226d5798aee91f910324182479ba 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1745,8 +1745,10 @@ vgetc(void)
 
            // Get two extra bytes for special keys
            if (c == K_SPECIAL
-#ifdef FEAT_GUI
-                   || (c == CSI)
+#if defined(FEAT_GUI) || defined(MSWIN)
+                   // GUI codes start with CSI; MS-Windows sends mouse scroll
+                   // events with CSI.
+                   || c == CSI
 #endif
               )
            {

diff --git a/src/os_win32.c b/src/os_win32.c
index 5c845c638eccdfe332d9fb3e4dc4d3ef78b2f5b0..03b3ac03712ac2f60e5597f06f63b33e4245842e 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -1231,7 +1231,6 @@ mch_bevalterm_changed(void)
 }
 # endif
 
-#ifdef VIMDLL
 /*
  * Win32 console mouse scroll event handler.
  * Loosely based on the _OnMouseWheel() function in gui_w32.c
@@ -1264,10 +1263,8 @@ decode_mouse_wheel(MOUSE_EVENT_RECORD *pmer)
     g_yMouse = pmer->dwMousePosition.Y;
 
 #ifdef FEAT_PROP_POPUP
-    int lcol;
-    int lrow;
-    lcol = g_xMouse;
-    lrow = g_yMouse;
+    int lcol = g_xMouse;
+    int lrow = g_yMouse;
     wp = mouse_find_win(&lrow, &lcol, FAIL_POPUP);
     if (wp != NULL && popup_is_popup(wp))
     {
@@ -1312,9 +1309,9 @@ decode_mouse_wheel(MOUSE_EVENT_RECORD *pmer)
 
     // Decode the win32 console key modifers into Vim mouse modifers.
     if (pmer->dwControlKeyState & SHIFT_PRESSED)
-       modifiers |= MOD_MASK_SHIFT; //MOUSE_SHIFT;
+       modifiers |= MOD_MASK_SHIFT; // MOUSE_SHIFT;
     if (pmer->dwControlKeyState & (RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED))
-       modifiers |= MOD_MASK_CTRL; //MOUSE_CTRL;
+       modifiers |= MOD_MASK_CTRL; // MOUSE_CTRL;
     if (pmer->dwControlKeyState & (RIGHT_ALT_PRESSED  | LEFT_ALT_PRESSED))
        modifiers |= MOD_MASK_ALT; // MOUSE_ALT;
 
@@ -1324,7 +1321,6 @@ decode_mouse_wheel(MOUSE_EVENT_RECORD *pmer)
 
     return;
 }
-#endif
 
 /*
  * Decode a MOUSE_EVENT.  If it's a valid event, return MOUSE_LEFT,
@@ -1395,17 +1391,17 @@ decode_mouse_event(
        return FALSE;
     }
 
-    // unprocessed mouse click?
+    // If there is an unprocessed mouse click drop this one.
     if (g_nMouseClick != -1)
        return TRUE;
-#ifdef VIMDLL
+
     if (pmer->dwEventFlags == MOUSE_WHEELED
                                       || pmer->dwEventFlags == MOUSE_HWHEELED)
     {
        decode_mouse_wheel(pmer);
        return TRUE;  // we now should have a mouse scroll in g_nMouseClick
     }
-#endif
+
     nButton = -1;
     g_xMouse = pmer->dwMousePosition.X;
     g_yMouse = pmer->dwMousePosition.Y;

diff --git a/src/version.c b/src/version.c
index 8111f85049dfdb3279603ffe0b6f6affe9f8143e..6d9d87c49ef0360dc5fe7629a2f6145c2f45bc11 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    793,
 /**/
     792,
 /**/