Revision: 23385
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23385
Author: campbellbarton
Date: 2009-09-21 07:56:43 +0200 (Mon, 21 Sep 2009)
Log Message:
-----------
5 button mouse support from b333rt in IRC with some edits for X11.
Tested in X11 where its fairly confusing.
buttons 4 and 5 are used for the wheel which is well known, but it seems 6 and
7 are used for horizontal scrolling, my mouse assigns the extra 2 buttons to
events 8 & 9.
So the X11 events used for buttons called 4&5 in blender are 8&9 in X11.
The mouse buttons can be re-ordered like this once xorg starts (swaps 6,7 with
8,9)
xmodmap -e "pointer = 1 2 3 4 5 8 9 6 7"
Couldn't test Win32, Apple not supported.
If someone wants to add horizontal scrolling its quite easy.
Modified Paths:
--------------
trunk/blender/intern/ghost/GHOST_Types.h
trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
trunk/blender/source/blender/editors/space_outliner/outliner.c
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/wm_event_types.h
Modified: trunk/blender/intern/ghost/GHOST_Types.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_Types.h 2009-09-21 03:16:26 UTC (rev
23384)
+++ trunk/blender/intern/ghost/GHOST_Types.h 2009-09-21 05:56:43 UTC (rev
23385)
@@ -132,6 +132,8 @@
GHOST_kButtonMaskLeft = 0,
GHOST_kButtonMaskMiddle,
GHOST_kButtonMaskRight,
+ GHOST_kButtonMaskButton4,
+ GHOST_kButtonMaskButton5,
GHOST_kButtonNumMasks
} GHOST_TButtonMask;
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2009-09-21
03:16:26 UTC (rev 23384)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2009-09-21
05:56:43 UTC (rev 23385)
@@ -39,7 +39,6 @@
#endif
#include "GHOST_SystemWin32.h"
-//#include <stdio.h> //for printf()
// win64 doesn't define GWL_USERDATA
#ifdef WIN32
@@ -61,6 +60,23 @@
#define WHEEL_DELTA 120 /* Value for rolling one detent, (old
convention! MS changed it) */
#endif // WHEEL_DELTA
+/*
+ * Defines for mouse buttons 4 and 5 aka xbutton1 and xbutton2.
+ * MSDN: Declared in Winuser.h, include Windows.h
+ * This does not seem to work with MinGW so we define our own here.
+ */
+#ifndef XBUTTON1
+#define XBUTTON1 0x0001
+#endif // XBUTTON1
+#ifndef XBUTTON2
+#define XBUTTON2 0x0002
+#endif // XBUTTON2
+#ifndef WM_XBUTTONUP
+#define WM_XBUTTONUP 524
+#endif // WM_XBUTTONUP
+#ifndef WM_XBUTTONDOWN
+#define WM_XBUTTONDOWN 523
+#endif // WM_XBUTTONDOWN
#include "GHOST_Debug.h"
#include "GHOST_DisplayManagerWin32.h"
@@ -672,6 +688,14 @@
window->registerMouseClickEvent(true);
event =
processButtonEvent(GHOST_kEventButtonDown, window, GHOST_kButtonMaskRight);
break;
+ case WM_XBUTTONDOWN:
+ window->registerMouseClickEvent(true);
+ if ((short) HIWORD(wParam) == XBUTTON1){
+ event =
processButtonEvent(GHOST_kEventButtonDown, window, GHOST_kButtonMaskButton4);
+ }else if((short) HIWORD(wParam) ==
XBUTTON2){
+ event =
processButtonEvent(GHOST_kEventButtonDown, window, GHOST_kButtonMaskButton5);
+ }
+ break;
case WM_LBUTTONUP:
window->registerMouseClickEvent(false);
event =
processButtonEvent(GHOST_kEventButtonUp, window, GHOST_kButtonMaskLeft);
@@ -684,6 +708,14 @@
window->registerMouseClickEvent(false);
event =
processButtonEvent(GHOST_kEventButtonUp, window, GHOST_kButtonMaskRight);
break;
+ case WM_XBUTTONUP:
+ window->registerMouseClickEvent(false);
+ if ((short) HIWORD(wParam) == XBUTTON1){
+ event =
processButtonEvent(GHOST_kEventButtonUp, window, GHOST_kButtonMaskButton4);
+ }else if((short) HIWORD(wParam) ==
XBUTTON2){
+ event =
processButtonEvent(GHOST_kEventButtonUp, window, GHOST_kButtonMaskButton5);
+ }
+ break;
case WM_MOUSEMOVE:
event =
processCursorEvent(GHOST_kEventCursorMove, window);
break;
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2009-09-21
03:16:26 UTC (rev 23384)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2009-09-21
05:56:43 UTC (rev 23385)
@@ -444,10 +444,15 @@
XButtonEvent & xbe = xe->xbutton;
GHOST_TButtonMask gbmask = GHOST_kButtonMaskLeft;
-
switch (xbe.button) {
case Button1 : gbmask = GHOST_kButtonMaskLeft;
break;
case Button3 : gbmask = GHOST_kButtonMaskRight;
break;
+ /* It seems events 6 and 7 are for horizontal
scrolling.
+ * you can re-order button mapping like this...
(swaps 6,7 with 8,9)
+ * xmodmap -e "pointer = 1 2 3 4 5 8 9 6 7"
+ */
+ case 8 : gbmask = GHOST_kButtonMaskButton4;
break; /* Button4 is the wheel */
+ case 9 : gbmask = GHOST_kButtonMaskButton5;
break; /* Button5 is a wheel too */
default:
case Button2 : gbmask =
GHOST_kButtonMaskMiddle; break;
}
Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c
2009-09-21 03:16:26 UTC (rev 23384)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c
2009-09-21 05:56:43 UTC (rev 23385)
@@ -5049,6 +5049,8 @@
str += sprintf(str, formatstr, "Left Mouse", LEFTMOUSE);
str += sprintf(str, formatstr, "Middle Mouse", MIDDLEMOUSE);
str += sprintf(str, formatstr, "Right Mouse", RIGHTMOUSE);
+ str += sprintf(str, formatstr, "Button4 Mouse ", BUTTON4MOUSE);
+ str += sprintf(str, formatstr, "Button5 Mouse ", BUTTON5MOUSE);
str += sprintf(str, formatstr, "Action Mouse", ACTIONMOUSE);
str += sprintf(str, formatstr, "Select Mouse", SELECTMOUSE);
str += sprintf(str, formatstr, "Mouse Move", MOUSEMOVE);
@@ -5071,6 +5073,8 @@
str += sprintf(str, formatstr, "Left Mouse", EVT_TWEAK_L);
str += sprintf(str, formatstr, "Middle Mouse", EVT_TWEAK_M);
str += sprintf(str, formatstr, "Right Mouse", EVT_TWEAK_R);
+ str += sprintf(str, formatstr, "Button4 Mouse ", BUTTON4MOUSE);
+ str += sprintf(str, formatstr, "Button5 Mouse ", BUTTON5MOUSE);
str += sprintf(str, formatstr, "Action Mouse", EVT_TWEAK_A);
str += sprintf(str, formatstr, "Select Mouse", EVT_TWEAK_S);
Modified: trunk/blender/source/blender/makesrna/intern/rna_wm.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_wm.c 2009-09-21
03:16:26 UTC (rev 23384)
+++ trunk/blender/source/blender/makesrna/intern/rna_wm.c 2009-09-21
05:56:43 UTC (rev 23385)
@@ -46,6 +46,8 @@
{LEFTMOUSE, "LEFTMOUSE", 0, "Left Mouse", ""},
{MIDDLEMOUSE, "MIDDLEMOUSE", 0, "Middle Mouse", ""},
{RIGHTMOUSE, "RIGHTMOUSE", 0, "Right Mouse", ""},
+ {BUTTON4MOUSE, "BUTTON4MOUSE", 0, "Button4 Mouse", ""},
+ {BUTTON5MOUSE, "BUTTON5MOUSE", 0, "Button5 Mouse", ""},
{ACTIONMOUSE, "ACTIONMOUSE", 0, "Action Mouse", ""},
{SELECTMOUSE, "SELECTMOUSE", 0, "Select Mouse", ""},
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2009-09-21 03:16:26 UTC (rev 23384)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2009-09-21 05:56:43 UTC (rev 23385)
@@ -1579,6 +1579,10 @@
event.type= LEFTMOUSE;
else if (bd->button == GHOST_kButtonMaskRight)
event.type= RIGHTMOUSE;
+ else if (bd->button == GHOST_kButtonMaskButton4)
+ event.type= BUTTON4MOUSE;
+ else if (bd->button == GHOST_kButtonMaskButton5)
+ event.type= BUTTON5MOUSE;
else
event.type= MIDDLEMOUSE;
Modified: trunk/blender/source/blender/windowmanager/wm_event_types.h
===================================================================
--- trunk/blender/source/blender/windowmanager/wm_event_types.h 2009-09-21
03:16:26 UTC (rev 23384)
+++ trunk/blender/source/blender/windowmanager/wm_event_types.h 2009-09-21
05:56:43 UTC (rev 23385)
@@ -56,6 +56,9 @@
/* only use if you want user option switch possible */
#define ACTIONMOUSE 0x005
#define SELECTMOUSE 0x006
+/* Extra mouse buttons */
+#define BUTTON4MOUSE 0x007
+#define BUTTON5MOUSE 0x008
/* defaults from ghost */
#define WHEELUPMOUSE 0x00a
#define WHEELDOWNMOUSE 0x00b
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
