From 7390acc2b4ab01ac6947ac158136a4c2eba747e2 Mon Sep 17 00:00:00 2001 From: Martin Poirier Date: Fri, 7 Nov 2003 01:52:31 +0000 Subject: [PATCH] Middle mouse emulation fix. I know Ton fixed this already, but I modified it to be more in accordance with what we decided to do in Space.c --- source/blender/src/space.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/source/blender/src/space.c b/source/blender/src/space.c index d9b4f82a85a..52518d2b230 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -153,7 +153,6 @@ extern void StartKetsjiShell(ScrArea *area, char* startscenename, struct Main* m */ void space_mipmap_button_function(int event); - unsigned short convert_for_nonumpad(unsigned short event); void free_soundspace(SpaceSound *ssound); @@ -572,17 +571,17 @@ void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) case MIDDLEMOUSE: /* use '&' here, because of alt+leftmouse which emulates middlemouse */ if(U.flag & VIEWMOVE) { - if((G.qual & LR_SHIFTKEY)) + if((G.qual==LR_SHIFTKEY) || ((U.flag & TWOBUTTONMOUSE) && (G.qual==(LR_ALTKEY|LR_SHIFTKEY)))) viewmove(0); - else if(G.qual & LR_CTRLKEY) + else if((G.qual==LR_CTRLKEY) || ((U.flag & TWOBUTTONMOUSE) && (G.qual==(LR_ALTKEY|LR_CTRLKEY)))) viewmove(2); - else + else if((G.qual==0) || ((U.flag & TWOBUTTONMOUSE) && (G.qual==LR_ALTKEY))) viewmove(1); } else { - if((G.qual & LR_SHIFTKEY)) + if((G.qual==LR_SHIFTKEY) || ((U.flag & TWOBUTTONMOUSE) && (G.qual==(LR_ALTKEY|LR_SHIFTKEY)))) viewmove(1); - else if(G.qual & LR_CTRLKEY) + else if((G.qual==LR_CTRLKEY) || ((U.flag & TWOBUTTONMOUSE) && (G.qual==(LR_ALTKEY|LR_CTRLKEY)))) viewmove(2); else viewmove(0); @@ -705,19 +704,19 @@ void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) case MIDDLEMOUSE: /* use '&' here, because of alt+leftmouse which emulates middlemouse */ if(U.flag & VIEWMOVE) { - if((G.qual & LR_SHIFTKEY)) + if((G.qual==LR_SHIFTKEY) || ((U.flag & TWOBUTTONMOUSE) && (G.qual==(LR_ALTKEY|LR_SHIFTKEY)))) viewmove(0); - else if(G.qual & LR_CTRLKEY) + else if((G.qual==LR_CTRLKEY) || ((U.flag & TWOBUTTONMOUSE) && (G.qual==(LR_ALTKEY|LR_CTRLKEY)))) viewmove(2); - else + else if((G.qual==0) || ((U.flag & TWOBUTTONMOUSE) && (G.qual==LR_ALTKEY))) viewmove(1); } else { - if((G.qual & LR_SHIFTKEY)) + if((G.qual==LR_SHIFTKEY) || ((U.flag & TWOBUTTONMOUSE) && (G.qual==(LR_ALTKEY|LR_SHIFTKEY)))) viewmove(1); - else if(G.qual & LR_CTRLKEY) + else if((G.qual==LR_CTRLKEY) || ((U.flag & TWOBUTTONMOUSE) && (G.qual==(LR_ALTKEY|LR_CTRLKEY)))) viewmove(2); - else + else if((G.qual==0) || ((U.flag & TWOBUTTONMOUSE) && (G.qual==LR_ALTKEY))) viewmove(0); } break;