archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Removed redundant ghostwindow->commandqual veriable, which caused to hang

Browse Source 
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.
This commit is contained in:
Ton Roosendaal
2005-05-04 08:46:14 +00:00
parent e05e85523f
commit 4664431d76
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/src/ghostwinlay.c
View File

@@ -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