diff options
| -rw-r--r-- | intern/ghost/GHOST_Types.h | 1 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 1 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 1 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 1 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 1 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_playanim.c | 1 | ||||
| -rw-r--r-- | source/blender/windowmanager/wm_event_types.h | 1 | ||||
| -rw-r--r-- | source/gameengine/GameLogic/SCA_IInputDevice.h | 1 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp | 1 |
9 files changed, 9 insertions, 0 deletions
diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index 29508a83733..b3e560ab4b4 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -249,6 +249,7 @@ typedef enum { GHOST_kKeyQuote = 0x27, GHOST_kKeyComma = ',', GHOST_kKeyMinus = '-', + GHOST_kKeyPlus = '+', GHOST_kKeyPeriod = '.', GHOST_kKeySlash = '/', diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 4db945d31f7..bf44d938a47 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -240,6 +240,7 @@ static GHOST_TKey convertKey(int rawCode, unichar recvChar, UInt16 keyAction) switch (recvChar) { case '-': return GHOST_kKeyMinus; + case '+': return GHOST_kKeyPlus; case '=': return GHOST_kKeyEqual; case ',': return GHOST_kKeyComma; case '.': return GHOST_kKeyPeriod; diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 0c87ee17cb0..dde63badb91 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -1500,6 +1500,7 @@ convertXKey(KeySym key) GXMAP(type, XK_quoteright, GHOST_kKeyQuote); GXMAP(type, XK_quoteleft, GHOST_kKeyAccentGrave); GXMAP(type, XK_minus, GHOST_kKeyMinus); + GXMAP(type, XK_plus, GHOST_kKeyPlus); GXMAP(type, XK_slash, GHOST_kKeySlash); GXMAP(type, XK_backslash, GHOST_kKeyBackslash); GXMAP(type, XK_equal, GHOST_kKeyEqual); diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 51c410e44e1..0d11414c878 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -263,6 +263,7 @@ EnumPropertyItem rna_enum_event_type_items[] = { {QUOTEKEY, "QUOTE", 0, "\"", ""}, {ACCENTGRAVEKEY, "ACCENT_GRAVE", 0, "`", ""}, {MINUSKEY, "MINUS", 0, "-", ""}, + {PLUSKEY, "PLUS", 0, "+", ""}, {SLASHKEY, "SLASH", 0, "/", ""}, {BACKSLASHKEY, "BACK_SLASH", 0, "\\", ""}, {EQUALKEY, "EQUAL", 0, "=", ""}, diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index ad8c31a32f3..40b6f90f6f3 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2897,6 +2897,7 @@ static int convert_key(GHOST_TKey key) case GHOST_kKeyQuote: return QUOTEKEY; case GHOST_kKeyComma: return COMMAKEY; case GHOST_kKeyMinus: return MINUSKEY; + case GHOST_kKeyPlus: return PLUSKEY; case GHOST_kKeyPeriod: return PERIODKEY; case GHOST_kKeySlash: return SLASHKEY; diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index 675958cf0a3..6bf7bcc2934 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -897,6 +897,7 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void) } break; case GHOST_kKeyEqual: + case GHOST_kKeyPlus: case GHOST_kKeyNumpadPlus: { if (val == 0) break; diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index c32ded28126..449612bc5fd 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -167,6 +167,7 @@ enum { QUOTEKEY = 0x00e4, /* 228 */ ACCENTGRAVEKEY = 0x00e5, /* 229 */ MINUSKEY = 0x00e6, /* 230 */ + PLUSKEY = 0x00e7, /* 231 */ SLASHKEY = 0x00e8, /* 232 */ BACKSLASHKEY = 0x00e9, /* 233 */ EQUALKEY = 0x00ea, /* 234 */ diff --git a/source/gameengine/GameLogic/SCA_IInputDevice.h b/source/gameengine/GameLogic/SCA_IInputDevice.h index d4cd66fb564..f306ae4f26b 100644 --- a/source/gameengine/GameLogic/SCA_IInputDevice.h +++ b/source/gameengine/GameLogic/SCA_IInputDevice.h @@ -129,6 +129,7 @@ public: KX_COMMAKEY = 44, KX_MINUSKEY = 45, KX_PERIODKEY = 46, + KX_PLUSKEY = 47, KX_ZEROKEY = 48, KX_ONEKEY, // =49 diff --git a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp index 53d03c6f479..eefaa3730cf 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp @@ -141,6 +141,7 @@ GPG_KeyboardDevice::GPG_KeyboardDevice(void) m_reverseKeyTranslateTable[GHOST_kKeyQuote ] = KX_QUOTEKEY ; m_reverseKeyTranslateTable[GHOST_kKeyAccentGrave ] = KX_ACCENTGRAVEKEY ; m_reverseKeyTranslateTable[GHOST_kKeyMinus ] = KX_MINUSKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyPlus ] = KX_PLUSKEY ; m_reverseKeyTranslateTable[GHOST_kKeySlash ] = KX_SLASHKEY ; m_reverseKeyTranslateTable[GHOST_kKeyBackslash ] = KX_BACKSLASHKEY ; m_reverseKeyTranslateTable[GHOST_kKeyEqual ] = KX_EQUALKEY ; |