[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51702] trunk/blender/source/blender/ windowmanager: Event system cleanup: bringing KM_CLICK back in control.
Ton Roosendaal
ton at blender.org
Sun Oct 28 12:19:39 CET 2012
Revision: 51702
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51702
Author: ton
Date: 2012-10-28 11:19:35 +0000 (Sun, 28 Oct 2012)
Log Message:
-----------
Event system cleanup: bringing KM_CLICK back in control.
- Solved Modal Keymap hijack of event codes
(with note this should be coded better)
- Added dedicated state variable check_click in event to trigger it
All this in an attempt to get code understandable and predictable again. :)
This solves error like:
- editmode mesh
- select a vertex
- grab it, press control for grid snap
- on LMB assign, it also did an extrude.
Modified Paths:
--------------
trunk/blender/source/blender/windowmanager/WM_types.h
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/source/blender/windowmanager/WM_types.h
===================================================================
--- trunk/blender/source/blender/windowmanager/WM_types.h 2012-10-28 09:26:50 UTC (rev 51701)
+++ trunk/blender/source/blender/windowmanager/WM_types.h 2012-10-28 11:19:35 UTC (rev 51702)
@@ -424,7 +424,7 @@
char ascii; /* from ghost, fallback if utf8 isn't set */
char pad;
- /* previous state */
+ /* previous state, used for double click and the 'click' */
short prevtype;
short prevval;
int prevx, prevy;
@@ -435,7 +435,8 @@
short shift, ctrl, alt, oskey; /* oskey is apple or windowskey, value denotes order of pressed */
short keymodifier; /* rawkey modifier */
- short pad1;
+ /* set in case a KM_PRESS went by unhandled */
+ short check_click;
/* keymap item, set by handler (weak?) */
const char *keymap_idname;
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2012-10-28 09:26:50 UTC (rev 51701)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2012-10-28 11:19:35 UTC (rev 51702)
@@ -1375,13 +1375,30 @@
for (kmi = keymap->items.first; kmi; kmi = kmi->next) {
if (wm_eventmatch(event, kmi)) {
+ event->prevtype = event->type;
+ event->prevval = event->val;
event->type = EVT_MODAL_MAP;
event->val = kmi->propvalue;
+
+ break;
}
}
}
}
+/* bad hacking event system... better restore event type for checking of KM_CLICK for example */
+/* XXX modal maps could use different method (ton) */
+static void wm_event_modalmap_end(wmEvent *event)
+{
+ if (event->type == EVT_MODAL_MAP) {
+ event->type = event->prevtype;
+ event->prevtype = 0;
+ event->val = event->prevval;
+ event->prevval = 0;
+ }
+
+}
+
/* Warning: this function removes a modal handler, when finished */
static int wm_handler_operator_call(bContext *C, ListBase *handlers, wmEventHandler *handler,
wmEvent *event, PointerRNA *properties)
@@ -1408,7 +1425,8 @@
retval = ot->modal(C, op, event);
OPERATOR_RETVAL_CHECK(retval);
-
+ wm_event_modalmap_end(event);
+
/* when this is _not_ the case the modal modifier may have loaded
* a new blend file (demo mode does this), so we have to assume
* the event, operator etc have all been freed. - campbell */
@@ -1862,32 +1880,45 @@
static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
{
int action = wm_handlers_do_intern(C, event, handlers);
-
- /* test for CLICK events */
- if (wm_action_not_handled(action)) {
- wmWindow *win = CTX_wm_window(C);
- if (win && win->eventstate->prevtype == event->type) {
+ if (!ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE) && !ISTIMER(event->type)) {
+
+ /* test for CLICK events */
+ if (wm_action_not_handled(action)) {
+ wmWindow *win = CTX_wm_window(C);
- if (event->val == KM_RELEASE && win->eventstate->prevval == KM_PRESS) {
- event->val = KM_CLICK;
- action |= wm_handlers_do_intern(C, event, handlers);
+ /* eventstate stores if previous event was a KM_PRESS, in case that
+ wasn't handled, the KM_RELEASE will become a KM_CLICK */
+
+ if (event->val == KM_PRESS) {
+ win->eventstate->check_click = TRUE;
+ }
+
+ if (win && win->eventstate->prevtype == event->type) {
- /* revert value if not handled */
- if (wm_action_not_handled(action)) {
+ if (event->val == KM_RELEASE && win->eventstate->prevval == KM_PRESS && win->eventstate->check_click == TRUE) {
+ event->val = KM_CLICK;
+ // printf("add KM_CLICK\n");
+ action |= wm_handlers_do_intern(C, event, handlers);
+
event->val = KM_RELEASE;
}
- }
- else if (event->val == KM_DBL_CLICK) {
- event->val = KM_PRESS;
- action |= wm_handlers_do_intern(C, event, handlers);
-
- /* revert value if not handled */
- if (wm_action_not_handled(action)) {
- event->val = KM_DBL_CLICK;
+ else if (event->val == KM_DBL_CLICK) {
+ event->val = KM_PRESS;
+ action |= wm_handlers_do_intern(C, event, handlers);
+
+ /* revert value if not handled */
+ if (wm_action_not_handled(action)) {
+ event->val = KM_DBL_CLICK;
+ }
}
}
}
+ else {
+ wmWindow *win = CTX_wm_window(C);
+
+ win->eventstate->check_click = 0;
+ }
}
return action;
@@ -2792,7 +2823,7 @@
/* copy to event state */
evt->val = event.val;
evt->type = event.type;
-
+
if (win->active == 0) {
int cx, cy;
More information about the Bf-blender-cvs
mailing list