Support extra side mouse buttons in MacVim (X1 and X2)

ychin · ychin · commit bd913cea8308 · 2025-01-25T17:04:34.000-08:00
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
@@ -1166,7 +1166,7 @@ Mouse clicks can be mapped.  The codes for mouse clicks are:
 
 The X1 and X2 buttons refer to the extra buttons found on some mice.  The
 'Microsoft Explorer' mouse has these buttons available to the right thumb.
-Currently X1 and X2 only work on Win32 and X11 environments.
+Currently X1 and X2 only work on MacVim, Win32, and X11 environments.
 
 Examples: >
 	:noremap <MiddleMouse> <LeftMouse><MiddleMouse>
diff --git a/src/MacVim/MMBackend.m b/src/MacVim/MMBackend.m
@@ -3793,9 +3793,9 @@ static unsigned eventModifierFlagsToVimMouseModMask(unsigned modifierFlags)
 
 static int eventButtonNumberToVimMouseButton(int buttonNumber)
 {
-    static int mouseButton[] = { MOUSE_LEFT, MOUSE_RIGHT, MOUSE_MIDDLE };
+    static int mouseButton[] = { MOUSE_LEFT, MOUSE_RIGHT, MOUSE_MIDDLE, MOUSE_X1, MOUSE_X2 };
 
-    return (buttonNumber >= 0 && buttonNumber < 3)
+    return (buttonNumber >= 0 && buttonNumber < 5)
             ? mouseButton[buttonNumber] : -1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3793,9 +3793,9 @@ static unsigned eventModifierFlagsToVimMouseModMask(unsigned modifierFlags)`
`3793`	`3793`
`3794`	`3794`	`static int eventButtonNumberToVimMouseButton(int buttonNumber)`
`3795`	`3795`	`{`
`3796`		`- static int mouseButton[] = { MOUSE_LEFT, MOUSE_RIGHT, MOUSE_MIDDLE };`
	`3796`	`+ static int mouseButton[] = { MOUSE_LEFT, MOUSE_RIGHT, MOUSE_MIDDLE, MOUSE_X1, MOUSE_X2 };`
`3797`	`3797`
`3798`		`- return (buttonNumber >= 0 && buttonNumber < 3)`
	`3798`	`+ return (buttonNumber >= 0 && buttonNumber < 5)`
`3799`	`3799`	`? mouseButton[buttonNumber] : -1;`
`3800`	`3800`	`}`
`3801`	`3801`