TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: fix crash when typing with RIME as input method

Browse Source 
Fixes #620
This commit is contained in:
rdb 2019-04-14 22:10:32 +02:00
parent 5d3499dc64
commit 5530074945
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/cocoadisplay/cocoaGraphicsWindow.mm
View File

@ -1618,7 +1618,7 @@ handle_key_event(NSEvent *event) {
if ([event type] == NSKeyDown) { if ([event type] == NSKeyDown) {
// Translate it to a unicode character for keystrokes. I would use // Translate it to a unicode character for keystrokes. I would use
// interpretKeyEvents and insertText, but that doesn't handle dead keys. // interpretKeyEvents and insertText, but that doesn't handle dead keys.
TISInputSourceRef input_source = TISCopyCurrentKeyboardInputSource(); TISInputSourceRef input_source = TISCopyCurrentKeyboardLayoutInputSource();
CFDataRef layout_data = (CFDataRef)TISGetInputSourceProperty(input_source, kTISPropertyUnicodeKeyLayoutData); CFDataRef layout_data = (CFDataRef)TISGetInputSourceProperty(input_source, kTISPropertyUnicodeKeyLayoutData);
const UCKeyboardLayout *layout = (const UCKeyboardLayout *)CFDataGetBytePtr(layout_data); const UCKeyboardLayout *layout = (const UCKeyboardLayout *)CFDataGetBytePtr(layout_data);
@ -1827,7 +1827,7 @@ get_keyboard_map() const {
const UCKeyboardLayout *layout; const UCKeyboardLayout *layout;
// Get the current keyboard layout data. // Get the current keyboard layout data.
input_source = TISCopyCurrentKeyboardInputSource(); input_source = TISCopyCurrentKeyboardLayoutInputSource();
layout_data = (CFDataRef) TISGetInputSourceProperty(input_source, kTISPropertyUnicodeKeyLayoutData); layout_data = (CFDataRef) TISGetInputSourceProperty(input_source, kTISPropertyUnicodeKeyLayoutData);
layout = (const UCKeyboardLayout *)CFDataGetBytePtr(layout_data); layout = (const UCKeyboardLayout *)CFDataGetBytePtr(layout_data);