Commit: d8fc404415ded274f75b754437597543705cf0ec
Author: Campbell Barton
Date: Mon Jan 12 18:49:27 2015 +1100
Branches: master
https://developer.blender.org/rBd8fc404415ded274f75b754437597543705cf0ec
Cleanup: style
===================================================================
M intern/ghost/intern/GHOST_SystemCocoa.mm
M source/blender/editors/animation/keyframes_general.c
===================================================================
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm
b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 61caf3f..3ce9a4b 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -205,6 +205,7 @@ static GHOST_TKey convertKey(int rawCode, unichar recvChar,
UInt16 keyAction)
return GHOST_kKeyUnknown;
default:
+ {
/* alphanumerical or punctuation key that is remappable
in int'l keyboards */
if ((recvChar >= 'A') && (recvChar <= 'Z')) {
return (GHOST_TKey) (recvChar - 'A' +
GHOST_kKeyA);
@@ -213,27 +214,25 @@ static GHOST_TKey convertKey(int rawCode, unichar
recvChar, UInt16 keyAction)
return (GHOST_TKey) (recvChar - 'a' +
GHOST_kKeyA);
}
else {
-
- /* Leopard and Snow Leopard 64bit compatible API*/
- CFDataRef uchrHandle; /*the keyboard layout*/
- TISInputSourceRef kbdTISHandle;
-
- kbdTISHandle =
TISCopyCurrentKeyboardLayoutInputSource();
- uchrHandle =
(CFDataRef)TISGetInputSourceProperty(kbdTISHandle,kTISPropertyUnicodeKeyLayoutData);
- CFRelease(kbdTISHandle);
-
- /*get actual character value of the "remappable" keys
in int'l keyboards,
- if keyboard layout is not correctly reported (e.g.
some non Apple keyboards in Tiger),
- then fallback on using the received
charactersIgnoringModifiers */
- if (uchrHandle)
- {
- UInt32 deadKeyState=0;
- UniCharCount actualStrLength=0;
+ /* Leopard and Snow Leopard 64bit compatible
API*/
+ CFDataRef uchrHandle; /*the keyboard layout*/
+ TISInputSourceRef kbdTISHandle;
-
UCKeyTranslate((UCKeyboardLayout*)CFDataGetBytePtr(uchrHandle), rawCode,
keyAction, 0,
- LMGetKbdType(),
kUCKeyTranslateNoDeadKeysBit, &deadKeyState, 1, &actualStrLength, &recvChar);
+ kbdTISHandle =
TISCopyCurrentKeyboardLayoutInputSource();
+ uchrHandle =
(CFDataRef)TISGetInputSourceProperty(kbdTISHandle,kTISPropertyUnicodeKeyLayoutData);
+ CFRelease(kbdTISHandle);
- }
+ /*get actual character value of the
"remappable" keys in int'l keyboards,
+ if keyboard layout is not correctly reported
(e.g. some non Apple keyboards in Tiger),
+ then fallback on using the received
charactersIgnoringModifiers */
+ if (uchrHandle) {
+ UInt32 deadKeyState=0;
+ UniCharCount actualStrLength=0;
+
+
UCKeyTranslate((UCKeyboardLayout*)CFDataGetBytePtr(uchrHandle), rawCode,
keyAction, 0,
+ LMGetKbdType(),
kUCKeyTranslateNoDeadKeysBit, &deadKeyState, 1, &actualStrLength, &recvChar);
+
+ }
switch (recvChar) {
case '-': return GHOST_kKeyMinus;
@@ -251,6 +250,7 @@ static GHOST_TKey convertKey(int rawCode, unichar recvChar,
UInt16 keyAction)
return GHOST_kKeyUnknown;
}
}
+ }
}
return GHOST_kKeyUnknown;
}
@@ -270,7 +270,7 @@ extern "C" int GHOST_HACK_getFirstFile(char
buf[FIRSTFILEBUFLG])
return 1;
}
else {
- return 0;
+ return 0;
}
}
diff --git a/source/blender/editors/animation/keyframes_general.c
b/source/blender/editors/animation/keyframes_general.c
index 6acff13..7ac11c1 100644
--- a/source/blender/editors/animation/keyframes_general.c
+++ b/source/blender/editors/animation/keyframes_general.c
@@ -545,7 +545,7 @@ short copy_animedit_keys(bAnimContext *ac, ListBase
*anim_data)
aci->array_index = fcu->array_index;
/* detect if this is a bone. We do that here rather than during
pasting because ID pointers will get invalidated if we undo.
- * storing the relavant information here helps avoiding crashes
if we undo-repaste */
+ * storing the relevant information here helps avoiding crashes
if we undo-repaste */
if ((aci->id_type == ID_OB) && (((Object *)aci->id)->type ==
OB_ARMATURE) && aci->rna_path) {
Object *ob = (Object *)aci->id;
char *str_start;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
