From 4664431d76bfc22ecdef026fd2622ff9af26d04c Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Wed, 4 May 2005 08:46:14 +0000 Subject: Removed redundant ghostwindow->commandqual veriable, which caused to hang on using Apple command keys. For example; starting a TextEdit from the Dock, Command+Q, caused Blender to treat all LMB events as a RMB. The commandqual variable was replaced with normal 'qualifier' key already long ago, should have been removed back then. --- source/blender/src/ghostwinlay.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'source/blender/src/ghostwinlay.c') diff --git a/source/blender/src/ghostwinlay.c b/source/blender/src/ghostwinlay.c index 4699b587853..3d38df1595d 100644 --- a/source/blender/src/ghostwinlay.c +++ b/source/blender/src/ghostwinlay.c @@ -86,7 +86,6 @@ struct _Window { int lmouse[2]; int lqual; /* (LR_SHFTKEY, LR_CTRLKEY, LR_ALTKEY, LR_COMMANDKEY) */ int lmbut; /* (L_MOUSE, M_MOUSE, R_MOUSE) */ - int commandqual; /* Tracks the faked mouse button, if non-zero it is * the event number of the last faked button. @@ -522,7 +521,7 @@ static int event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr private) if (bbut==LEFTMOUSE) { if (val) { - if (win->commandqual) { + if (win->lqual & LR_COMMANDKEY) { bbut= win->faked_mbut= RIGHTMOUSE; } else if ((win->lqual & LR_ALTKEY) && (U.flag & USER_TWOBUTTONMOUSE)) { /* finally, it actually USES the userpref! :) -intrr */ @@ -554,10 +553,6 @@ static int event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr private) int val= (type==GHOST_kEventKeyDown); int bkey= convert_key(kd->key); - if (kd->key == GHOST_kKeyCommand) { - win->commandqual= val; - } - if (bkey) { if (bkey==LEFTSHIFTKEY || bkey==RIGHTSHIFTKEY) { win->lqual= change_bit(win->lqual, LR_SHIFTKEY, val); @@ -607,8 +602,6 @@ static int event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr private) win->lqual= change_bit(win->lqual, LR_COMMANDKEY, 0); window_handle(win, LR_COMMANDKEY, 0); } - /* probably redundant now (ton) */ - win->commandqual= query_qual('C'); /* * XXX quick hack so OSX version works better -- cgit v1.2.3