diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-10-05 23:10:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-05 23:10:15 +0400 |
| commit | 568cb066162b13983c8454b9d20ec010b2a1251d (patch) | |
| tree | 299c59a2b9d1b8d2f8595a58dba575f2023674c6 /source/blender/windowmanager | |
| parent | 0c7dce887cea687eb61ac3c660de9e84bf36997d (diff) | |
rename Command key to OSKey, Window manager already called it the OSKey but internally it was mixed.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 4 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 4 | ||||
| -rw-r--r-- | source/blender/windowmanager/wm_event_types.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 590d28012f9..334bc79b96a 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2067,7 +2067,7 @@ static int convert_key(GHOST_TKey key) case GHOST_kKeyRightShift: return RIGHTSHIFTKEY; case GHOST_kKeyLeftControl: return LEFTCTRLKEY; case GHOST_kKeyRightControl: return RIGHTCTRLKEY; - case GHOST_kKeyCommand: return COMMANDKEY; + case GHOST_kKeyOS: return OSKEY; case GHOST_kKeyLeftAlt: return LEFTALTKEY; case GHOST_kKeyRightAlt: return RIGHTALTKEY; @@ -2324,7 +2324,7 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int t if(event.val==KM_PRESS && (evt->ctrl || evt->shift || evt->oskey)) event.alt= evt->alt = 3; // define? } - else if (event.type==COMMANDKEY) { + else if (event.type==OSKEY) { event.oskey= evt->oskey= (event.val==KM_PRESS); if(event.val==KM_PRESS && (evt->ctrl || evt->alt || evt->shift)) event.oskey= evt->oskey = 3; // define? diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 328c3e80259..d9d7abd3a68 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -528,7 +528,7 @@ static int query_qual(char qual) left= GHOST_kModifierKeyLeftControl; right= GHOST_kModifierKeyRightControl; } else if (qual=='C') { - left= right= GHOST_kModifierKeyCommand; + left= right= GHOST_kModifierKeyOS; } else { left= GHOST_kModifierKeyLeftAlt; right= GHOST_kModifierKeyRightAlt; @@ -613,7 +613,7 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr private) wm_event_add_ghostevent(wm, win, GHOST_kEventKeyUp, time, &kdata); } if (win->eventstate->oskey && !query_qual('C')) { - kdata.key= GHOST_kKeyCommand; + kdata.key= GHOST_kKeyOS; wm_event_add_ghostevent(wm, win, GHOST_kEventKeyUp, time, &kdata); } /* keymodifier zero, it hangs on hotkeys that open windows otherwise */ diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index e4b56080b03..efc31f6f7c3 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -204,7 +204,7 @@ #define ENDKEY 170 #define UNKNOWNKEY 171 -#define COMMANDKEY 172 +#define OSKEY 172 #define GRLESSKEY 173 /* for event checks */ @@ -215,7 +215,7 @@ #define ISKEYBOARD(event) (event >=' ' && event <=320) /* test whether the event is a modifier key */ -#define ISKEYMODIFIER(event) ((event >= LEFTCTRLKEY && event <= LEFTSHIFTKEY) || event == COMMANDKEY) +#define ISKEYMODIFIER(event) ((event >= LEFTCTRLKEY && event <= LEFTSHIFTKEY) || event == OSKEY) /* test whether the event is a mouse button */ #define ISMOUSE(event) (event >= LEFTMOUSE && event <= MOUSEROTATE) |