[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32332] trunk/blender: rename Command key to OSKey, Window manager already called it the OSKey but internally it was mixed.
Campbell Barton
ideasman42 at gmail.com
Tue Oct 5 21:10:15 CEST 2010
Revision: 32332
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32332
Author: campbellbarton
Date: 2010-10-05 21:10:15 +0200 (Tue, 05 Oct 2010)
Log Message:
-----------
rename Command key to OSKey, Window manager already called it the OSKey but internally it was mixed.
Modified Paths:
--------------
trunk/blender/intern/ghost/GHOST_Types.h
trunk/blender/intern/ghost/intern/GHOST_EventPrinter.cpp
trunk/blender/intern/ghost/intern/GHOST_ModifierKeys.cpp
trunk/blender/intern/ghost/intern/GHOST_ModifierKeys.h
trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
trunk/blender/intern/ghost/test/multitest/EventToBuf.c
trunk/blender/source/blender/editors/space_outliner/outliner.c
trunk/blender/source/blender/editors/space_text/text_python.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
trunk/blender/source/blender/windowmanager/wm_event_types.h
Modified: trunk/blender/intern/ghost/GHOST_Types.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_Types.h 2010-10-05 19:05:09 UTC (rev 32331)
+++ trunk/blender/intern/ghost/GHOST_Types.h 2010-10-05 19:10:15 UTC (rev 32332)
@@ -96,7 +96,7 @@
GHOST_kModifierKeyRightAlt,
GHOST_kModifierKeyLeftControl,
GHOST_kModifierKeyRightControl,
- GHOST_kModifierKeyCommand, // APPLE only
+ GHOST_kModifierKeyOS,
GHOST_kModifierKeyNumMasks
} GHOST_TModifierKeyMask;
@@ -283,7 +283,7 @@
GHOST_kKeyRightControl,
GHOST_kKeyLeftAlt,
GHOST_kKeyRightAlt,
- GHOST_kKeyCommand, // Command key on Apple, Windows key(s) on Windows
+ GHOST_kKeyOS, // Command key on Apple, Windows key(s) on Windows
GHOST_kKeyGrLess , // German PC only!
GHOST_kKeyCapsLock,
Modified: trunk/blender/intern/ghost/intern/GHOST_EventPrinter.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_EventPrinter.cpp 2010-10-05 19:05:09 UTC (rev 32331)
+++ trunk/blender/intern/ghost/intern/GHOST_EventPrinter.cpp 2010-10-05 19:10:15 UTC (rev 32332)
@@ -255,9 +255,8 @@
case GHOST_kKeyRightAlt:
str = "RightAlt";
break;
- case GHOST_kKeyCommand:
- // APPLE only!
- str = "Command";
+ case GHOST_kKeyOS:
+ str = "OS";
break;
case GHOST_kKeyGrLess:
// PC german!
Modified: trunk/blender/intern/ghost/intern/GHOST_ModifierKeys.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_ModifierKeys.cpp 2010-10-05 19:05:09 UTC (rev 32331)
+++ trunk/blender/intern/ghost/intern/GHOST_ModifierKeys.cpp 2010-10-05 19:10:15 UTC (rev 32332)
@@ -55,7 +55,7 @@
case GHOST_kModifierKeyRightAlt: key = GHOST_kKeyRightAlt; break;
case GHOST_kModifierKeyLeftControl: key = GHOST_kKeyLeftControl; break;
case GHOST_kModifierKeyRightControl: key = GHOST_kKeyRightControl; break;
- case GHOST_kModifierKeyCommand: key = GHOST_kKeyCommand; break;
+ case GHOST_kModifierKeyOS: key = GHOST_kKeyOS; break;
default:
// Should not happen
key = GHOST_kKeyUnknown;
@@ -80,8 +80,8 @@
return m_LeftControl;
case GHOST_kModifierKeyRightControl:
return m_RightControl;
- case GHOST_kModifierKeyCommand:
- return m_Command;
+ case GHOST_kModifierKeyOS:
+ return m_OS;
default:
return false;
}
@@ -103,8 +103,8 @@
m_LeftControl = down; break;
case GHOST_kModifierKeyRightControl:
m_RightControl = down; break;
- case GHOST_kModifierKeyCommand:
- m_Command = down; break;
+ case GHOST_kModifierKeyOS:
+ m_OS = down; break;
default:
break;
}
@@ -119,7 +119,7 @@
m_RightAlt = false;
m_LeftControl = false;
m_RightControl = false;
- m_Command = false;
+ m_OS = false;
}
@@ -131,5 +131,5 @@
(m_RightAlt == keys.m_RightAlt) &&
(m_LeftControl == keys.m_LeftControl) &&
(m_RightControl == keys.m_RightControl) &&
- (m_Command == keys.m_Command);
+ (m_OS == keys.m_OS);
}
Modified: trunk/blender/intern/ghost/intern/GHOST_ModifierKeys.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_ModifierKeys.h 2010-10-05 19:05:09 UTC (rev 32331)
+++ trunk/blender/intern/ghost/intern/GHOST_ModifierKeys.h 2010-10-05 19:10:15 UTC (rev 32332)
@@ -96,8 +96,8 @@
GHOST_TUns8 m_LeftControl : 1;
/** Bitfield that stores the appropriate key state. */
GHOST_TUns8 m_RightControl : 1;
- /** Bitfield that stores the appropriate key state. APPLE only! */
- GHOST_TUns8 m_Command : 1;
+ /** Bitfield that stores the appropriate key state. */
+ GHOST_TUns8 m_OS : 1;
};
#endif // _GHOST_MODIFIER_KEYS_H_
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp 2010-10-05 19:05:09 UTC (rev 32331)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp 2010-10-05 19:10:15 UTC (rev 32332)
@@ -553,7 +553,7 @@
{
UInt32 modifiers = ::GetCurrentKeyModifiers();
- keys.set(GHOST_kModifierKeyCommand, (modifiers & cmdKey) ? true : false);
+ keys.set(GHOST_kModifierKeyOS, (modifiers & cmdKey) ? true : false);
keys.set(GHOST_kModifierKeyLeftAlt, (modifiers & optionKey) ? true : false);
keys.set(GHOST_kModifierKeyLeftShift, (modifiers & shiftKey) ? true : false);
keys.set(GHOST_kModifierKeyLeftControl, (modifiers & controlKey) ? true : false);
@@ -941,7 +941,7 @@
pushEvent( new GHOST_EventKey(getMilliSeconds(), (modifiers & optionKey)?GHOST_kEventKeyDown:GHOST_kEventKeyUp, window, GHOST_kKeyLeftAlt) );
}
if ((modifiers & cmdKey) != (m_modifierMask & cmdKey)) {
- pushEvent( new GHOST_EventKey(getMilliSeconds(), (modifiers & cmdKey)?GHOST_kEventKeyDown:GHOST_kEventKeyUp, window, GHOST_kKeyCommand) );
+ pushEvent( new GHOST_EventKey(getMilliSeconds(), (modifiers & cmdKey)?GHOST_kEventKeyDown:GHOST_kEventKeyUp, window, GHOST_kKeyOS) );
}
m_modifierMask = modifiers;
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2010-10-05 19:05:09 UTC (rev 32331)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2010-10-05 19:10:15 UTC (rev 32332)
@@ -303,9 +303,9 @@
bool lwindown = HIBYTE(::GetKeyState(VK_LWIN)) != 0;
bool rwindown = HIBYTE(::GetKeyState(VK_RWIN)) != 0;
if(lwindown || rwindown)
- keys.set(GHOST_kModifierKeyCommand, true);
+ keys.set(GHOST_kModifierKeyOS, true);
else
- keys.set(GHOST_kModifierKeyCommand, false);
+ keys.set(GHOST_kModifierKeyOS, false);
}
else {
bool down = HIBYTE(::GetKeyState(VK_SHIFT)) != 0;
@@ -320,9 +320,9 @@
bool lwindown = HIBYTE(::GetKeyState(VK_LWIN)) != 0;
bool rwindown = HIBYTE(::GetKeyState(VK_RWIN)) != 0;
if(lwindown || rwindown)
- keys.set(GHOST_kModifierKeyCommand, true);
+ keys.set(GHOST_kModifierKeyOS, true);
else
- keys.set(GHOST_kModifierKeyCommand, false);
+ keys.set(GHOST_kModifierKeyOS, false);
}
return GHOST_kSuccess;
}
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2010-10-05 19:05:09 UTC (rev 32331)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2010-10-05 19:10:15 UTC (rev 32332)
@@ -891,13 +891,13 @@
keys.set(GHOST_kModifierKeyRightAlt,false);
}
- // Super (Windows) - only one GHOST-kModifierKeyCommand, so mapping
+ // Super (Windows) - only one GHOST-kModifierKeyOS, so mapping
// to either
if ( ((m_keyboard_vector[super_l >> 3] >> (super_l & 7)) & 1) ||
((m_keyboard_vector[super_r >> 3] >> (super_r & 7)) & 1) ) {
- keys.set(GHOST_kModifierKeyCommand,true);
+ keys.set(GHOST_kModifierKeyOS,true);
} else {
- keys.set(GHOST_kModifierKeyCommand,false);
+ keys.set(GHOST_kModifierKeyOS,false);
}
return GHOST_kSuccess;
}
@@ -1106,8 +1106,8 @@
GXMAP(type,XK_Control_R, GHOST_kKeyRightControl);
GXMAP(type,XK_Alt_L, GHOST_kKeyLeftAlt);
GXMAP(type,XK_Alt_R, GHOST_kKeyRightAlt);
- GXMAP(type,XK_Super_L, GHOST_kKeyCommand);
- GXMAP(type,XK_Super_R, GHOST_kKeyCommand);
+ GXMAP(type,XK_Super_L, GHOST_kKeyOS);
+ GXMAP(type,XK_Super_R, GHOST_kKeyOS);
GXMAP(type,XK_Insert, GHOST_kKeyInsert);
GXMAP(type,XK_Delete, GHOST_kKeyDelete);
Modified: trunk/blender/intern/ghost/test/multitest/EventToBuf.c
===================================================================
--- trunk/blender/intern/ghost/test/multitest/EventToBuf.c 2010-10-05 19:05:09 UTC (rev 32331)
+++ trunk/blender/intern/ghost/test/multitest/EventToBuf.c 2010-10-05 19:10:15 UTC (rev 32332)
@@ -125,7 +125,7 @@
K(KeyRightControl);
K(KeyLeftAlt);
K(KeyRightAlt);
- K(KeyCommand);
+ K(KeyOS);
K(KeyCapsLock);
K(KeyNumLock);
Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c 2010-10-05 19:05:09 UTC (rev 32331)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c 2010-10-05 19:10:15 UTC (rev 32332)
@@ -5545,7 +5545,7 @@
uiDefButS(block, OPTION, 0, "Shift", xstart, (int)te->ys+1, butw3+5, OL_H-1, &kmi->shift, 0, 0, 0, 0, "Modifier"); xstart+= butw3+5;
uiDefButS(block, OPTION, 0, "Ctrl", xstart, (int)te->ys+1, butw3, OL_H-1, &kmi->ctrl, 0, 0, 0, 0, "Modifier"); xstart+= butw3;
uiDefButS(block, OPTION, 0, "Alt", xstart, (int)te->ys+1, butw3, OL_H-1, &kmi->alt, 0, 0, 0, 0, "Modifier"); xstart+= butw3;
- uiDefButS(block, OPTION, 0, "Cmd", xstart, (int)te->ys+1, butw3, OL_H-1, &kmi->oskey, 0, 0, 0, 0, "Modifier"); xstart+= butw3;
+ uiDefButS(block, OPTION, 0, "OS", xstart, (int)te->ys+1, butw3, OL_H-1, &kmi->oskey, 0, 0, 0, 0, "Modifier"); xstart+= butw3;
xstart+= 5;
uiDefKeyevtButS(block, 0, "", xstart, (int)te->ys+1, butw3, OL_H-1, &kmi->keymodifier, "Key Modifier code");
xstart+= butw3+5;
Modified: trunk/blender/source/blender/editors/space_text/text_python.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_python.c 2010-10-05 19:05:09 UTC (rev 32331)
+++ trunk/blender/source/blender/editors/space_text/text_python.c 2010-10-05 19:10:15 UTC (rev 32332)
@@ -182,7 +182,7 @@
#define LR_SHIFTKEY 0
#define LR_ALTKEY 0
#define LR_CTRLKEY 0
-#define LR_COMMANDKEY 0
+#define LR_OSKEY 0
// XXX
static int doc_scroll= 0;
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2010-10-05 19:05:09 UTC (rev 32331)
+++ trunk/blender/source/blender/editors/transform/transform.c 2010-10-05 19:10:15 UTC (rev 32332)
@@ -1534,7 +1534,7 @@
if ((ELEM(kmi->type, LEFTCTRLKEY, RIGHTCTRLKEY) && event->ctrl) ||
(ELEM(kmi->type, LEFTSHIFTKEY, RIGHTSHIFTKEY) && event->shift) ||
(ELEM(kmi->type, LEFTALTKEY, RIGHTALTKEY) && event->alt) ||
- (kmi->type == COMMANDKEY && event->oskey)) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list