Revision: 38586
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38586
Author: jesterking
Date: 2011-07-21 20:57:23 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
Prepare for NDOF event handling all the way to keymaps (and keymap editor).
Modified Paths:
--------------
branches/merwin-spacenav/source/blender/windowmanager/wm_event_types.h
Modified: branches/merwin-spacenav/source/blender/windowmanager/wm_event_types.h
===================================================================
--- branches/merwin-spacenav/source/blender/windowmanager/wm_event_types.h
2011-07-21 20:54:47 UTC (rev 38585)
+++ branches/merwin-spacenav/source/blender/windowmanager/wm_event_types.h
2011-07-21 20:57:23 UTC (rev 38586)
@@ -125,6 +125,7 @@
NDOF_BUTTON_8,
NDOF_BUTTON_9,
NDOF_BUTTON_10,
+ NDOF_LAST
};
@@ -290,8 +291,11 @@
/* test whether the event is tweak event */
#define ISTWEAK(event) (event >= EVT_TWEAK_L && event <= EVT_GESTURE)
+ /* test whether the event is a NDOF event */
+#define ISNDOF(event) (event >= NDOF_MOTION && event < NDOF_LAST)
+
/* test whether event type is acceptable as hotkey, excluding modifiers */
-#define ISHOTKEY(event) ((ISKEYBOARD(event) || ISMOUSE(event)) &&
event!=ESCKEY && !(event>=LEFTCTRLKEY && event<=LEFTSHIFTKEY) &&
!(event>=UNKNOWNKEY && event<=GRLESSKEY))
+#define ISHOTKEY(event) ((ISKEYBOARD(event) || ISMOUSE(event) ||
ISNDOF(event)) && event!=ESCKEY && !(event>=LEFTCTRLKEY && event<=LEFTSHIFTKEY)
&& !(event>=UNKNOWNKEY && event<=GRLESSKEY))
/* **************** BLENDER GESTURE EVENTS (0x5000) **************** */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
