diff options
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index e770ced45e3..e130e6d2de9 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -808,20 +808,24 @@ int WM_userdef_event_map(int kmitype) static void wm_eventemulation(wmEvent *event) { + static int mmb_emulated = 0; /* this should be in a data structure somwhere */ + /* middlemouse emulation */ if(U.flag & USER_TWOBUTTONMOUSE) { - if(event->type == LEFTMOUSE && event->alt) { + if(event->type == LEFTMOUSE && (event->alt || mmb_emulated == KM_PRESS)) { event->type = MIDDLEMOUSE; event->alt = 0; + mmb_emulated = event->val; } } #ifdef __APPLE__ /* rightmouse emulation */ if(U.flag & USER_TWOBUTTONMOUSE) { - if(event->type == LEFTMOUSE && event->oskey) { + if(event->type == LEFTMOUSE && (event->oskey || mmb_emulated == KM_PRESS) { event->type = RIGHTMOUSE; event->oskey = 0; + mmb_emulated = event->val; } } #endif |