Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-01-11 17:38:44 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-01-11 17:40:23 +0400
commit50650e28ea5641b200727fcbe14de83fa10e2c49 (patch)
tree8ae157905baa7f0677d90b467ec8a9fb9c746076 /source/blender/makesrna/intern/rna_wm.c
parent1a0c5eb83aaaf18cef25d6d36a2c857c1381516c (diff)
Events: support for buttons 6 & 7 (some trackballs have these) X11 only
Patch by Marcus von Appen Note: this patch makes ISMOUSE accept INBETWEEN_MOUSEMOVE as a mouse event where before it didnt.
Diffstat (limited to 'source/blender/makesrna/intern/rna_wm.c')
-rw-r--r--source/blender/makesrna/intern/rna_wm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 0eda2662e43..f4f2f834398 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -81,6 +81,8 @@ static EnumPropertyItem event_mouse_type_items[] = {
{RIGHTMOUSE, "RIGHTMOUSE", 0, "Right", ""},
{BUTTON4MOUSE, "BUTTON4MOUSE", 0, "Button4", ""},
{BUTTON5MOUSE, "BUTTON5MOUSE", 0, "Button5", ""},
+ {BUTTON6MOUSE, "BUTTON6MOUSE", 0, "Button6", ""},
+ {BUTTON7MOUSE, "BUTTON7MOUSE", 0, "Button7", ""},
{ACTIONMOUSE, "ACTIONMOUSE", 0, "Action", ""},
{SELECTMOUSE, "SELECTMOUSE", 0, "Select", ""},
{0, "", 0, NULL, NULL},
@@ -173,6 +175,8 @@ EnumPropertyItem event_type_items[] = {
{RIGHTMOUSE, "RIGHTMOUSE", 0, "Right Mouse", ""},
{BUTTON4MOUSE, "BUTTON4MOUSE", 0, "Button4 Mouse", ""},
{BUTTON5MOUSE, "BUTTON5MOUSE", 0, "Button5 Mouse", ""},
+ {BUTTON6MOUSE, "BUTTON6MOUSE", 0, "Button6 Mouse", ""},
+ {BUTTON7MOUSE, "BUTTON7MOUSE", 0, "Button7 Mouse", ""},
{ACTIONMOUSE, "ACTIONMOUSE", 0, "Action Mouse", ""},
{SELECTMOUSE, "SELECTMOUSE", 0, "Select Mouse", ""},
{0, "", 0, NULL, NULL},