diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-05-04 12:46:14 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-05-04 12:46:14 +0400 |
| commit | 4664431d76bfc22ecdef026fd2622ff9af26d04c (patch) | |
| tree | c56ecea4b2e5e88d59d400672dd061f5f73692df /source/blender/src/ghostwinlay.c | |
| parent | e05e85523f37577f4ce7b08709e9535aec569d86 (diff) | |
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.
Diffstat (limited to 'source/blender/src/ghostwinlay.c')
| -rw-r--r-- | source/blender/src/ghostwinlay.c | 9 |
1 files changed, 1 insertions, 8 deletions
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 |