From 7b5cfcf0b5bc34dde2e1301061bf53305b1aa8ec Mon Sep 17 00:00:00 2001 From: Lubos Dolezel Date: Thu, 13 Feb 2020 19:01:29 +0100 Subject: [PATCH] Changes and improvements with relation to keyboard input --- AppKit/CMakeLists.txt | 6 + AppKit/X11.backend/CarbonKeys.h | 238 ++++++++++++++++++++ AppKit/X11.backend/X11Display.m | 124 ++++++++++- AppKit/X11.backend/imKStoUCS.h | 32 +++ AppKit/X11.backend/imKStoUCS.m | 346 ++++++++++++++++++++++++++++++ AppKit/include/AppKit/NSDisplay.h | 4 + 6 files changed, 745 insertions(+), 5 deletions(-) create mode 100644 AppKit/X11.backend/CarbonKeys.h create mode 100644 AppKit/X11.backend/imKStoUCS.h create mode 100644 AppKit/X11.backend/imKStoUCS.m diff --git a/AppKit/CMakeLists.txt b/AppKit/CMakeLists.txt index 68c54fd5..ec494f81 100644 --- a/AppKit/CMakeLists.txt +++ b/AppKit/CMakeLists.txt @@ -18,6 +18,9 @@ find_package(X11 REQUIRED) if (NOT X11_Xrandr_FOUND) message(FATAL "XRandR not found") endif (NOT X11_Xrandr_FOUND) +if (NOT X11_Xkb_FOUND) + message(FATAL "Xkb not found") +endif (NOT X11_Xkb_FOUND) find_package(Freetype REQUIRED) @@ -42,6 +45,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/libmalloc/include ${CMAKE_SOURCE_DIR}/src/copyfile ${CMAKE_SOURCE_DIR}/src/libc/gen + ${CMAKE_SOURCE_DIR}/src/frameworks ${CMAKE_SOURCE_DIR}/src/external/icu/icuSources/i18n ${CMAKE_SOURCE_DIR}/src/external/icu/icuSources/common ${CMAKE_SOURCE_DIR}/src/external/libxml2/include @@ -65,6 +69,7 @@ include_directories( ${X11_INCLUDE_DIR} ${X11_Xrandr_INCLUDE_PATH} + ${X11_Xkb_INCLUDE_PATH} ${FREETYPE_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIRS} ${PC_CAIRO_INCLUDE_DIRS} @@ -537,6 +542,7 @@ add_backend(X11 X11.backend/X11SubWindow.m X11.backend/X11Event.m X11.backend/X11Pasteboard.m + X11.backend/imKStoUCS.m INFO_PLIST X11.backend/Info.plist DEPENDENCIES diff --git a/AppKit/X11.backend/CarbonKeys.h b/AppKit/X11.backend/CarbonKeys.h new file mode 100644 index 00000000..0f4b758c --- /dev/null +++ b/AppKit/X11.backend/CarbonKeys.h @@ -0,0 +1,238 @@ +#ifndef _CARBONKEYS_H +#define _CARBONKEYS_H + +#include +#include + +// The contents of this file are hardware specific to a certain degree, +// but this is probably as good as we can do. +// The only hardware-independ codes we can get from X11 are keysyms, +// but those are _after_ the keyboard layout is applied, so definitely +// not something we could easily map to Carbon constants. + +// Missing: +// kVK_ANSI_KeypadEquals +// kVK_Function +// kVK_F16 +// kVK_F17 +// kVK_F18 +// kVK_F19 +// kVK_F20 +// kVK_Help + +static const uint8_t x11ToCarbon[256] = { + [38] = kVK_ANSI_A, + [39] = kVK_ANSI_S, + [40] = kVK_ANSI_D, + [41] = kVK_ANSI_F, + [43] = kVK_ANSI_H, + [42] = kVK_ANSI_G, + [52] = kVK_ANSI_Z, + [53] = kVK_ANSI_X, + [54] = kVK_ANSI_C, + [55] = kVK_ANSI_V, + [56] = kVK_ANSI_B, + [24] = kVK_ANSI_Q, + [25] = kVK_ANSI_W, + [26] = kVK_ANSI_E, + [27] = kVK_ANSI_R, + [29] = kVK_ANSI_Y, + [28] = kVK_ANSI_T, + [10] = kVK_ANSI_1, + [11] = kVK_ANSI_2, + [12] = kVK_ANSI_3, + [13] = kVK_ANSI_4, + [15] = kVK_ANSI_6, + [14] = kVK_ANSI_5, + [21] = kVK_ANSI_Equal, + [18] = kVK_ANSI_9, + [16] = kVK_ANSI_7, + [20] = kVK_ANSI_Minus, + [17] = kVK_ANSI_8, + [19] = kVK_ANSI_0, + [35] = kVK_ANSI_RightBracket, + [32] = kVK_ANSI_O, + [30] = kVK_ANSI_U, + [34] = kVK_ANSI_LeftBracket, + [31] = kVK_ANSI_I, + [33] = kVK_ANSI_P, + [46] = kVK_ANSI_L, + [44] = kVK_ANSI_J, + [48] = kVK_ANSI_Quote, + [45] = kVK_ANSI_K, + [47] = kVK_ANSI_Semicolon, + [51] = kVK_ANSI_Backslash, + [59] = kVK_ANSI_Comma, + [61] = kVK_ANSI_Slash, + [57] = kVK_ANSI_N, + [58] = kVK_ANSI_M, + [60] = kVK_ANSI_Period, + [49] = kVK_ANSI_Grave, + [91] = kVK_ANSI_KeypadDecimal, + [63] = kVK_ANSI_KeypadMultiply, + [86] = kVK_ANSI_KeypadPlus, + [77] = kVK_ANSI_KeypadClear, + [106] = kVK_ANSI_KeypadDivide, + [104] = kVK_ANSI_KeypadEnter, + [82] = kVK_ANSI_KeypadMinus, + [90] = kVK_ANSI_Keypad0, + [87] = kVK_ANSI_Keypad1, + [88] = kVK_ANSI_Keypad2, + [89] = kVK_ANSI_Keypad3, + [83] = kVK_ANSI_Keypad4, + [84] = kVK_ANSI_Keypad5, + [85] = kVK_ANSI_Keypad6, + [79] = kVK_ANSI_Keypad7, + [80] = kVK_ANSI_Keypad8, + [81] = kVK_ANSI_Keypad9, + [36] = kVK_Return, + [23] = kVK_Tab, + [65] = kVK_Space, + [119] = kVK_Delete, + [9] = kVK_Escape, + [64] = kVK_Command, + [50] = kVK_Shift, + [66] = kVK_CapsLock, + [133] = kVK_Option, + [37] = kVK_Control, + [62] = kVK_RightShift, + [134] = kVK_RightOption, + [105] = kVK_RightControl, + [123] = kVK_VolumeUp, + [122] = kVK_VolumeDown, + [121] = kVK_Mute, + [71] = kVK_F5, + [72] = kVK_F6, + [73] = kVK_F7, + [69] = kVK_F3, + [74] = kVK_F8, + [75] = kVK_F9, + [95] = kVK_F11, + [107] = kVK_F13, + [78] = kVK_F14, + [76] = kVK_F10, + [96] = kVK_F12, + [127] = kVK_F15, + [110] = kVK_Home, + [112] = kVK_PageUp, + [119] = kVK_ForwardDelete, + [70] = kVK_F4, + [115] = kVK_End, + [68] = kVK_F2, + [117] = kVK_PageDown, + [67] = kVK_F1, + [113] = kVK_LeftArrow, + [114] = kVK_RightArrow, + [116] = kVK_DownArrow, + [111] = kVK_UpArrow, +}; + +static const uint8_t carbonToX11[256] = { + [kVK_ANSI_A] = 38, + [kVK_ANSI_S] = 39, + [kVK_ANSI_D] = 40, + [kVK_ANSI_F] = 41, + [kVK_ANSI_H] = 43, + [kVK_ANSI_G] = 42, + [kVK_ANSI_Z] = 52, + [kVK_ANSI_X] = 53, + [kVK_ANSI_C] = 54, + [kVK_ANSI_V] = 55, + [kVK_ANSI_B] = 56, + [kVK_ANSI_Q] = 24, + [kVK_ANSI_W] = 25, + [kVK_ANSI_E] = 26, + [kVK_ANSI_R] = 27, + [kVK_ANSI_Y] = 29, + [kVK_ANSI_T] = 28, + [kVK_ANSI_1] = 10, + [kVK_ANSI_2] = 11, + [kVK_ANSI_3] = 12, + [kVK_ANSI_4] = 13, + [kVK_ANSI_6] = 15, + [kVK_ANSI_5] = 14, + [kVK_ANSI_Equal] = 21, + [kVK_ANSI_9] = 18, + [kVK_ANSI_7] = 16, + [kVK_ANSI_Minus] = 20, + [kVK_ANSI_8] = 17, + [kVK_ANSI_0] = 19, + [kVK_ANSI_RightBracket] = 35, + [kVK_ANSI_O] = 32, + [kVK_ANSI_U] = 30, + [kVK_ANSI_LeftBracket] = 34, + [kVK_ANSI_I] = 31, + [kVK_ANSI_P] = 33, + [kVK_ANSI_L] = 46, + [kVK_ANSI_J] = 44, + [kVK_ANSI_Quote] = 48, + [kVK_ANSI_K] = 45, + [kVK_ANSI_Semicolon] = 47, + [kVK_ANSI_Backslash] = 51, + [kVK_ANSI_Comma] = 59, + [kVK_ANSI_Slash] = 61, + [kVK_ANSI_N] = 57, + [kVK_ANSI_M] = 58, + [kVK_ANSI_Period] = 60, + [kVK_ANSI_Grave] = 49, + [kVK_ANSI_KeypadDecimal] = 91, + [kVK_ANSI_KeypadMultiply] = 63, + [kVK_ANSI_KeypadPlus] = 86, + [kVK_ANSI_KeypadClear] = 77, + [kVK_ANSI_KeypadDivide] = 106, + [kVK_ANSI_KeypadEnter] = 104, + [kVK_ANSI_KeypadMinus] = 82, + [kVK_ANSI_Keypad0] = 90, + [kVK_ANSI_Keypad1] = 87, + [kVK_ANSI_Keypad2] = 88, + [kVK_ANSI_Keypad3] = 89, + [kVK_ANSI_Keypad4] = 83, + [kVK_ANSI_Keypad5] = 84, + [kVK_ANSI_Keypad6] = 85, + [kVK_ANSI_Keypad7] = 79, + [kVK_ANSI_Keypad8] = 80, + [kVK_ANSI_Keypad9] = 81, + [kVK_Return] = 36, + [kVK_Tab] = 23, + [kVK_Space] = 65, + [kVK_Delete] = 119, + [kVK_Escape] = 9, + [kVK_Command] = 64, + [kVK_Shift] = 50, + [kVK_CapsLock] = 66, + [kVK_Option] = 133, + [kVK_Control] = 37, + [kVK_RightShift] = 62, + [kVK_RightOption] = 134, + [kVK_RightControl] = 105, + [kVK_VolumeUp] = 123, + [kVK_VolumeDown] = 122, + [kVK_Mute] = 121, + [kVK_F5] = 71, + [kVK_F6] = 72, + [kVK_F7] = 73, + [kVK_F3] = 69, + [kVK_F8] = 74, + [kVK_F9] = 75, + [kVK_F11] = 95, + [kVK_F13] = 107, + [kVK_F14] = 78, + [kVK_F10] = 76, + [kVK_F12] = 96, + [kVK_F15] = 127, + [kVK_Home] = 110, + [kVK_PageUp] = 112, + [kVK_ForwardDelete] = 119, + [kVK_F4] = 70, + [kVK_End] = 115, + [kVK_F2] = 68, + [kVK_PageDown] = 117, + [kVK_F1] = 67, + [kVK_LeftArrow] = 113, + [kVK_RightArrow] = 114, + [kVK_DownArrow] = 116, + [kVK_UpArrow] = 111, +}; + + +#endif diff --git a/AppKit/X11.backend/X11Display.m b/AppKit/X11.backend/X11Display.m index 53a2d32c..b532ca65 100644 --- a/AppKit/X11.backend/X11Display.m +++ b/AppKit/X11.backend/X11Display.m @@ -34,6 +34,10 @@ #import #import #import +#import +#import "imKStoUCS.h" +#import "CarbonKeys.h" +#import @implementation X11Display @@ -287,7 +291,7 @@ static NSDictionary* modeInfoToDictionary(const XRRModeInfo* mi, int depth) { } XRROutputInfo* oinfo = XRRGetOutputInfo(_display, screen, screen->outputs[screenIndex]); - + if (oinfo->crtc) { XRRCrtcInfo *crtc = XRRGetCrtcInfo(_display, screen, oinfo->crtc); @@ -312,6 +316,104 @@ static NSDictionary* modeInfoToDictionary(const XRRModeInfo* mi, int depth) { return dict; } +- (UCKeyboardLayout*) keyboardLayout:(uint32_t*)byteLength +{ + int major = XkbMajorVersion, minor = XkbMinorVersion; + XkbDescPtr pKBDesc; + unsigned char group = 0; + XkbStateRec state; + + struct MyLayout + { + UCKeyboardLayout layout; + UCKeyModifiersToTableNum modifierVariants; + UInt8 secondTableNum, thirdTableNum; + UCKeyToCharTableIndex tableIndex; + UInt32 secontTableOffset; + UCKeyOutput table1[128]; + UCKeyOutput table2[128]; + }; + + if (byteLength) + *byteLength = 0; + + if (!XkbLibraryVersion(&major, &minor)) + return NULL; + if (!XkbQueryExtension(_display, NULL, NULL, &major, &minor, NULL)) + return NULL; + + pKBDesc = XkbGetMap(_display, XkbAllClientInfoMask, XkbUseCoreKbd); + if (!pKBDesc) + return NULL; + + if (XkbGetState(_display, XkbUseCoreKbd, &state) == Success) + group = state.group; + + struct MyLayout* layout = (struct MyLayout*) malloc(sizeof(struct MyLayout)); + + layout->layout.keyLayoutHeaderFormat = kUCKeyLayoutHeaderFormat; + layout->layout.keyLayoutDataVersion = 0; + layout->layout.keyLayoutFeatureInfoOffset = 0; + layout->layout.keyboardTypeCount = 1; + + memset(layout->layout.keyboardTypeList, 0, sizeof(UCKeyboardTypeHeader)); + + layout->layout.keyboardTypeList[0].keyModifiersToTableNumOffset = offsetof(struct MyLayout, modifierVariants); + layout->layout.keyboardTypeList[0].keyToCharTableIndexOffset = offsetof(struct MyLayout, tableIndex); + + layout->modifierVariants.keyModifiersToTableNumFormat = kUCKeyModifiersToTableNumFormat; + layout->modifierVariants.defaultTableNum = 0; + layout->modifierVariants.modifiersCount = 3; + layout->modifierVariants.tableNum[0] = 0; + layout->modifierVariants.tableNum[1] = 0; // cmd key bit + layout->modifierVariants.tableNum[2] = 1; // shift key bit + + layout->tableIndex.keyToCharTableIndexFormat = kUCKeyToCharTableIndexFormat; + layout->tableIndex.keyToCharTableSize = 128; + layout->tableIndex.keyToCharTableCount = 2; + layout->tableIndex.keyToCharTableOffsets[0] = offsetof(struct MyLayout, table1); + layout->tableIndex.keyToCharTableOffsets[1] = offsetof(struct MyLayout, table2); + + for (int shift = 0; shift <= 1; shift++) + { + UCKeyOutput* outTable = (shift == 0) ? layout->table1 : layout->table2; + for (int i = 0; i < 128; i++) + { + // Reverse the operation we do in -postXEvent: + const int x11KeyCode = carbonToX11[i]; + + if (!x11KeyCode) + { + outTable[i] = 0; + continue; + } + + // NOTE: Not using the group here. It just works with 0 instead... + KeySym sym = XkbKeycodeToKeysym(_display, i, 0, shift); + + if (sym != NoSymbol) + outTable[i] = X11_KeySymToUcs4(sym); + else + outTable[i] = 0; + } + } + + XkbFreeClientMap(pKBDesc, XkbAllClientInfoMask, true); + + if (byteLength) + *byteLength = sizeof(struct MyLayout); + + return &layout->layout; +} + +-(NSUInteger)currentModifierFlags { + XkbStateRec r; + if (XkbGetState(_display, XkbUseCoreKbd, &r) != Success) + return 0; + + return [self modifierFlagsForState: r.mods]; +} + - (NSPasteboard *) pasteboardWithName: (NSString *) name { return [X11Pasteboard pasteboardWithName: name]; } @@ -586,9 +688,17 @@ static NSDictionary* modeInfoToDictionary(const XRRModeInfo* mi, int depth) { ret|=NSShiftKeyMask; if(state & ControlMask) ret|=NSControlKeyMask; - if(state & Mod2Mask) - ret|=NSCommandKeyMask; - // TODO: alt doesn't work; might want to track key presses/releases instead + // if(state & Mod2Mask) // Mod2Mask is numlock + // ret|=NSCommandKeyMask; + if (state & LockMask) + ret |= NSAlphaShiftKeyMask; + if (state & Mod4Mask) + ret |= NSCommandKeyMask; + if (state & Mod1Mask) + ret |= NSAlternateKeyMask; + if (state & Mod5Mask) // AltGr + ret |= NSFunctionKeyMask; + return ret; } @@ -625,6 +735,10 @@ static NSDictionary* modeInfoToDictionary(const XRRModeInfo* mi, int depth) { strIg = [[NSString alloc] initWithCString: buf encoding: NSISOLatin1StringEncoding]; } + // If there's an app that uses constants from HIToolbox/Events.h (e.g. kVK_ANSI_A), + // this gives it a chance to work. + const int carbonKeyCode = x11ToCarbon[ev->xkey.keycode]; + id event = [NSEvent keyEventWithType: ev->type == KeyPress ? NSKeyDown : NSKeyUp location: pos modifierFlags: modifierFlags @@ -634,7 +748,7 @@ static NSDictionary* modeInfoToDictionary(const XRRModeInfo* mi, int depth) { characters: str charactersIgnoringModifiers: strIg isARepeat: NO - keyCode: ev->xkey.keycode]; + keyCode: carbonKeyCode]; [self postEvent: event atStart: NO]; diff --git a/AppKit/X11.backend/imKStoUCS.h b/AppKit/X11.backend/imKStoUCS.h new file mode 100644 index 00000000..fe4381d9 --- /dev/null +++ b/AppKit/X11.backend/imKStoUCS.h @@ -0,0 +1,32 @@ +#ifndef _imKStoUCS_h +#define _imKStoUCS_h + +/* +Copyright (C) 2003-2006,2008 Jamey Sharp, Josh Triplett +Copyright © 2009 Red Hat, Inc. +Copyright 1990-1992,1999,2000,2004,2009,2010 Oracle and/or its affiliates. +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. +*/ + +extern unsigned int X11_KeySymToUcs4(KeySym keysym); + +#endif /* _imKStoUCS_h */ diff --git a/AppKit/X11.backend/imKStoUCS.m b/AppKit/X11.backend/imKStoUCS.m new file mode 100644 index 00000000..eab48f53 --- /dev/null +++ b/AppKit/X11.backend/imKStoUCS.m @@ -0,0 +1,346 @@ +/* +Copyright (C) 2003-2006,2008 Jamey Sharp, Josh Triplett +Copyright © 2009 Red Hat, Inc. +Copyright 1990-1992,1999,2000,2004,2009,2010 Oracle and/or its affiliates. +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. +*/ + +#include +#include "imKStoUCS.h" + +static unsigned short const keysym_to_unicode_1a1_1ff[] = { + 0x0104, 0x02d8, 0x0141, 0x0000, 0x013d, 0x015a, 0x0000, /* 0x01a0-0x01a7 */ + 0x0000, 0x0160, 0x015e, 0x0164, 0x0179, 0x0000, 0x017d, 0x017b, /* 0x01a8-0x01af */ + 0x0000, 0x0105, 0x02db, 0x0142, 0x0000, 0x013e, 0x015b, 0x02c7, /* 0x01b0-0x01b7 */ + 0x0000, 0x0161, 0x015f, 0x0165, 0x017a, 0x02dd, 0x017e, 0x017c, /* 0x01b8-0x01bf */ + 0x0154, 0x0000, 0x0000, 0x0102, 0x0000, 0x0139, 0x0106, 0x0000, /* 0x01c0-0x01c7 */ + 0x010c, 0x0000, 0x0118, 0x0000, 0x011a, 0x0000, 0x0000, 0x010e, /* 0x01c8-0x01cf */ + 0x0110, 0x0143, 0x0147, 0x0000, 0x0000, 0x0150, 0x0000, 0x0000, /* 0x01d0-0x01d7 */ + 0x0158, 0x016e, 0x0000, 0x0170, 0x0000, 0x0000, 0x0162, 0x0000, /* 0x01d8-0x01df */ + 0x0155, 0x0000, 0x0000, 0x0103, 0x0000, 0x013a, 0x0107, 0x0000, /* 0x01e0-0x01e7 */ + 0x010d, 0x0000, 0x0119, 0x0000, 0x011b, 0x0000, 0x0000, 0x010f, /* 0x01e8-0x01ef */ + 0x0111, 0x0144, 0x0148, 0x0000, 0x0000, 0x0151, 0x0000, 0x0000, /* 0x01f0-0x01f7 */ + 0x0159, 0x016f, 0x0000, 0x0171, 0x0000, 0x0000, 0x0163, 0x02d9 /* 0x01f8-0x01ff */ +}; + +static unsigned short const keysym_to_unicode_2a1_2fe[] = { + 0x0126, 0x0000, 0x0000, 0x0000, 0x0000, 0x0124, 0x0000, /* 0x02a0-0x02a7 */ + 0x0000, 0x0130, 0x0000, 0x011e, 0x0134, 0x0000, 0x0000, 0x0000, /* 0x02a8-0x02af */ + 0x0000, 0x0127, 0x0000, 0x0000, 0x0000, 0x0000, 0x0125, 0x0000, /* 0x02b0-0x02b7 */ + 0x0000, 0x0131, 0x0000, 0x011f, 0x0135, 0x0000, 0x0000, 0x0000, /* 0x02b8-0x02bf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x010a, 0x0108, 0x0000, /* 0x02c0-0x02c7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x02c8-0x02cf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0120, 0x0000, 0x0000, /* 0x02d0-0x02d7 */ + 0x011c, 0x0000, 0x0000, 0x0000, 0x0000, 0x016c, 0x015c, 0x0000, /* 0x02d8-0x02df */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x010b, 0x0109, 0x0000, /* 0x02e0-0x02e7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x02e8-0x02ef */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0121, 0x0000, 0x0000, /* 0x02f0-0x02f7 */ + 0x011d, 0x0000, 0x0000, 0x0000, 0x0000, 0x016d, 0x015d /* 0x02f8-0x02ff */ +}; + +static unsigned short const keysym_to_unicode_3a2_3fe[] = { + 0x0138, 0x0156, 0x0000, 0x0128, 0x013b, 0x0000, /* 0x03a0-0x03a7 */ + 0x0000, 0x0000, 0x0112, 0x0122, 0x0166, 0x0000, 0x0000, 0x0000, /* 0x03a8-0x03af */ + 0x0000, 0x0000, 0x0000, 0x0157, 0x0000, 0x0129, 0x013c, 0x0000, /* 0x03b0-0x03b7 */ + 0x0000, 0x0000, 0x0113, 0x0123, 0x0167, 0x014a, 0x0000, 0x014b, /* 0x03b8-0x03bf */ + 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x012e, /* 0x03c0-0x03c7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0116, 0x0000, 0x0000, 0x012a, /* 0x03c8-0x03cf */ + 0x0000, 0x0145, 0x014c, 0x0136, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x03d0-0x03d7 */ + 0x0000, 0x0172, 0x0000, 0x0000, 0x0000, 0x0168, 0x016a, 0x0000, /* 0x03d8-0x03df */ + 0x0101, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x012f, /* 0x03e0-0x03e7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0117, 0x0000, 0x0000, 0x012b, /* 0x03e8-0x03ef */ + 0x0000, 0x0146, 0x014d, 0x0137, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x03f0-0x03f7 */ + 0x0000, 0x0173, 0x0000, 0x0000, 0x0000, 0x0169, 0x016b /* 0x03f8-0x03ff */ +}; + +static unsigned short const keysym_to_unicode_4a1_4df[] = { + 0x3002, 0x3008, 0x3009, 0x3001, 0x30fb, 0x30f2, 0x30a1, /* 0x04a0-0x04a7 */ + 0x30a3, 0x30a5, 0x30a7, 0x30a9, 0x30e3, 0x30e5, 0x30e7, 0x30c3, /* 0x04a8-0x04af */ + 0x30fc, 0x30a2, 0x30a4, 0x30a6, 0x30a8, 0x30aa, 0x30ab, 0x30ad, /* 0x04b0-0x04b7 */ + 0x30af, 0x30b1, 0x30b3, 0x30b5, 0x30b7, 0x30b9, 0x30bb, 0x30bd, /* 0x04b8-0x04bf */ + 0x30bf, 0x30c1, 0x30c4, 0x30c6, 0x30c8, 0x30ca, 0x30cb, 0x30cc, /* 0x04c0-0x04c7 */ + 0x30cd, 0x30ce, 0x30cf, 0x30d2, 0x30d5, 0x30d8, 0x30db, 0x30de, /* 0x04c8-0x04cf */ + 0x30df, 0x30e0, 0x30e1, 0x30e2, 0x30e4, 0x30e6, 0x30e8, 0x30e9, /* 0x04d0-0x04d7 */ + 0x30ea, 0x30eb, 0x30ec, 0x30ed, 0x30ef, 0x30f3, 0x309b, 0x309c /* 0x04d8-0x04df */ +}; + +static unsigned short const keysym_to_unicode_590_5fe[] = { + 0x06f0, 0x06f1, 0x06f2, 0x06f3, 0x06f4, 0x06f5, 0x06f6, 0x06f7, /* 0x0590-0x0597 */ + 0x06f8, 0x06f9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x0598-0x059f */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x066a, 0x0670, 0x0679, /* 0x05a0-0x05a7 */ + + 0x067e, 0x0686, 0x0688, 0x0691, 0x060c, 0x0000, 0x06d4, 0x0000, /* 0x05ac-0x05af */ + 0x0660, 0x0661, 0x0662, 0x0663, 0x0664, 0x0665, 0x0666, 0x0667, /* 0x05b0-0x05b7 */ + 0x0668, 0x0669, 0x0000, 0x061b, 0x0000, 0x0000, 0x0000, 0x061f, /* 0x05b8-0x05bf */ + 0x0000, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, /* 0x05c0-0x05c7 */ + 0x0628, 0x0629, 0x062a, 0x062b, 0x062c, 0x062d, 0x062e, 0x062f, /* 0x05c8-0x05cf */ + 0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, /* 0x05d0-0x05d7 */ + 0x0638, 0x0639, 0x063a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x05d8-0x05df */ + 0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, /* 0x05e0-0x05e7 */ + 0x0648, 0x0649, 0x064a, 0x064b, 0x064c, 0x064d, 0x064e, 0x064f, /* 0x05e8-0x05ef */ + 0x0650, 0x0651, 0x0652, 0x0653, 0x0654, 0x0655, 0x0698, 0x06a4, /* 0x05f0-0x05f7 */ + 0x06a9, 0x06af, 0x06ba, 0x06be, 0x06cc, 0x06d2, 0x06c1 /* 0x05f8-0x05fe */ +}; + +static unsigned short keysym_to_unicode_680_6ff[] = { + 0x0492, 0x0496, 0x049a, 0x049c, 0x04a2, 0x04ae, 0x04b0, 0x04b2, /* 0x0680-0x0687 */ + 0x04b6, 0x04b8, 0x04ba, 0x0000, 0x04d8, 0x04e2, 0x04e8, 0x04ee, /* 0x0688-0x068f */ + 0x0493, 0x0497, 0x049b, 0x049d, 0x04a3, 0x04af, 0x04b1, 0x04b3, /* 0x0690-0x0697 */ + 0x04b7, 0x04b9, 0x04bb, 0x0000, 0x04d9, 0x04e3, 0x04e9, 0x04ef, /* 0x0698-0x069f */ + 0x0000, 0x0452, 0x0453, 0x0451, 0x0454, 0x0455, 0x0456, 0x0457, /* 0x06a0-0x06a7 */ + 0x0458, 0x0459, 0x045a, 0x045b, 0x045c, 0x0491, 0x045e, 0x045f, /* 0x06a8-0x06af */ + 0x2116, 0x0402, 0x0403, 0x0401, 0x0404, 0x0405, 0x0406, 0x0407, /* 0x06b0-0x06b7 */ + 0x0408, 0x0409, 0x040a, 0x040b, 0x040c, 0x0490, 0x040e, 0x040f, /* 0x06b8-0x06bf */ + 0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, /* 0x06c0-0x06c7 */ + 0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, /* 0x06c8-0x06cf */ + 0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, /* 0x06d0-0x06d7 */ + 0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a, /* 0x06d8-0x06df */ + 0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, /* 0x06e0-0x06e7 */ + 0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, /* 0x06e8-0x06ef */ + 0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, /* 0x06f0-0x06f7 */ + 0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a /* 0x06f8-0x06ff */ +}; + +static unsigned short const keysym_to_unicode_7a1_7f9[] = { + 0x0386, 0x0388, 0x0389, 0x038a, 0x03aa, 0x0000, 0x038c, /* 0x07a0-0x07a7 */ + 0x038e, 0x03ab, 0x0000, 0x038f, 0x0000, 0x0000, 0x0385, 0x2015, /* 0x07a8-0x07af */ + 0x0000, 0x03ac, 0x03ad, 0x03ae, 0x03af, 0x03ca, 0x0390, 0x03cc, /* 0x07b0-0x07b7 */ + 0x03cd, 0x03cb, 0x03b0, 0x03ce, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x07b8-0x07bf */ + 0x0000, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, /* 0x07c0-0x07c7 */ + 0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f, /* 0x07c8-0x07cf */ + 0x03a0, 0x03a1, 0x03a3, 0x0000, 0x03a4, 0x03a5, 0x03a6, 0x03a7, /* 0x07d0-0x07d7 */ + 0x03a8, 0x03a9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x07d8-0x07df */ + 0x0000, 0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7, /* 0x07e0-0x07e7 */ + 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf, /* 0x07e8-0x07ef */ + 0x03c0, 0x03c1, 0x03c3, 0x03c2, 0x03c4, 0x03c5, 0x03c6, 0x03c7, /* 0x07f0-0x07f7 */ + 0x03c8, 0x03c9 /* 0x07f8-0x07ff */ +}; + +static unsigned short const keysym_to_unicode_8a4_8fe[] = { + 0x2320, 0x2321, 0x0000, 0x231c, /* 0x08a0-0x08a7 */ + 0x231d, 0x231e, 0x231f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08a8-0x08af */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08b0-0x08b7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x2264, 0x2260, 0x2265, 0x222b, /* 0x08b8-0x08bf */ + 0x2234, 0x0000, 0x221e, 0x0000, 0x0000, 0x2207, 0x0000, 0x0000, /* 0x08c0-0x08c7 */ + 0x2245, 0x2246, 0x0000, 0x0000, 0x0000, 0x0000, 0x21d2, 0x0000, /* 0x08c8-0x08cf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x221a, 0x0000, /* 0x08d0-0x08d7 */ + 0x0000, 0x0000, 0x2282, 0x2283, 0x2229, 0x222a, 0x2227, 0x2228, /* 0x08d8-0x08df */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08e0-0x08e7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2202, /* 0x08e8-0x08ef */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0192, 0x0000, /* 0x08f0-0x08f7 */ + 0x0000, 0x0000, 0x0000, 0x2190, 0x2191, 0x2192, 0x2193 /* 0x08f8-0x08ff */ +}; + +static unsigned short const keysym_to_unicode_9df_9f8[] = { + 0x2422, /* 0x09d8-0x09df */ + 0x2666, 0x25a6, 0x2409, 0x240c, 0x240d, 0x240a, 0x0000, 0x0000, /* 0x09e0-0x09e7 */ + 0x240a, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x2500, /* 0x09e8-0x09ef */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x251c, 0x2524, 0x2534, 0x252c, /* 0x09f0-0x09f7 */ + 0x2502 /* 0x09f8-0x09ff */ +}; + +static unsigned short const keysym_to_unicode_aa1_afe[] = { + 0x2003, 0x2002, 0x2004, 0x2005, 0x2007, 0x2008, 0x2009, /* 0x0aa0-0x0aa7 */ + 0x200a, 0x2014, 0x2013, 0x0000, 0x0000, 0x0000, 0x2026, 0x2025, /* 0x0aa8-0x0aaf */ + 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159, 0x215a, /* 0x0ab0-0x0ab7 */ + 0x2105, 0x0000, 0x0000, 0x2012, 0x2039, 0x2024, 0x203a, 0x0000, /* 0x0ab8-0x0abf */ + 0x0000, 0x0000, 0x0000, 0x215b, 0x215c, 0x215d, 0x215e, 0x0000, /* 0x0ac0-0x0ac7 */ + 0x0000, 0x2122, 0x2120, 0x0000, 0x25c1, 0x25b7, 0x25cb, 0x25ad, /* 0x0ac8-0x0acf */ + 0x2018, 0x2019, 0x201c, 0x201d, 0x211e, 0x2030, 0x2032, 0x2033, /* 0x0ad0-0x0ad7 */ + 0x0000, 0x271d, 0x0000, 0x220e, 0x25c2, 0x2023, 0x25cf, 0x25ac, /* 0x0ad8-0x0adf */ + 0x25e6, 0x25ab, 0x25ae, 0x25b5, 0x25bf, 0x2606, 0x2022, 0x25aa, /* 0x0ae0-0x0ae7 */ + 0x25b4, 0x25be, 0x261a, 0x261b, 0x2663, 0x2666, 0x2665, 0x0000, /* 0x0ae8-0x0aef */ + 0x2720, 0x2020, 0x2021, 0x2713, 0x2612, 0x266f, 0x266d, 0x2642, /* 0x0af0-0x0af7 */ + 0x2640, 0x2121, 0x2315, 0x2117, 0x2038, 0x201a, 0x201e /* 0x0af8-0x0aff */ +}; + +/* none of the APL keysyms match the Unicode characters */ + +static unsigned short const keysym_to_unicode_cdf_cfa[] = { + 0x2017, /* 0x0cd8-0x0cdf */ + 0x05d0, 0x05d1, 0x05d2, 0x05d3, 0x05d4, 0x05d5, 0x05d6, 0x05d7, /* 0x0ce0-0x0ce7 */ + 0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, 0x05de, 0x05df, /* 0x0ce8-0x0cef */ + 0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, 0x05e6, 0x05e7, /* 0x0cf0-0x0cf7 */ + 0x05e8, 0x05e9, 0x05ea /* 0x0cf8-0x0cff */ +}; + +static unsigned short const keysym_to_unicode_da1_df9[] = { + 0x0e01, 0x0e02, 0x0e03, 0x0e04, 0x0e05, 0x0e06, 0x0e07, /* 0x0da0-0x0da7 */ + 0x0e08, 0x0e09, 0x0e0a, 0x0e0b, 0x0e0c, 0x0e0d, 0x0e0e, 0x0e0f, /* 0x0da8-0x0daf */ + 0x0e10, 0x0e11, 0x0e12, 0x0e13, 0x0e14, 0x0e15, 0x0e16, 0x0e17, /* 0x0db0-0x0db7 */ + 0x0e18, 0x0e19, 0x0e1a, 0x0e1b, 0x0e1c, 0x0e1d, 0x0e1e, 0x0e1f, /* 0x0db8-0x0dbf */ + 0x0e20, 0x0e21, 0x0e22, 0x0e23, 0x0e24, 0x0e25, 0x0e26, 0x0e27, /* 0x0dc0-0x0dc7 */ + 0x0e28, 0x0e29, 0x0e2a, 0x0e2b, 0x0e2c, 0x0e2d, 0x0e2e, 0x0e2f, /* 0x0dc8-0x0dcf */ + 0x0e30, 0x0e31, 0x0e32, 0x0e33, 0x0e34, 0x0e35, 0x0e36, 0x0e37, /* 0x0dd0-0x0dd7 */ + 0x0e38, 0x0e39, 0x0e3a, 0x0000, 0x0000, 0x0000, 0x0e3e, 0x0e3f, /* 0x0dd8-0x0ddf */ + 0x0e40, 0x0e41, 0x0e42, 0x0e43, 0x0e44, 0x0e45, 0x0e46, 0x0e47, /* 0x0de0-0x0de7 */ + 0x0e48, 0x0e49, 0x0e4a, 0x0e4b, 0x0e4c, 0x0e4d, 0x0000, 0x0000, /* 0x0de8-0x0def */ + 0x0e50, 0x0e51, 0x0e52, 0x0e53, 0x0e54, 0x0e55, 0x0e56, 0x0e57, /* 0x0df0-0x0df7 */ + 0x0e58, 0x0e59 /* 0x0df8-0x0dff */ +}; + +static unsigned short const keysym_to_unicode_ea0_eff[] = { + 0x0000, 0x1101, 0x1101, 0x11aa, 0x1102, 0x11ac, 0x11ad, 0x1103, /* 0x0ea0-0x0ea7 */ + 0x1104, 0x1105, 0x11b0, 0x11b1, 0x11b2, 0x11b3, 0x11b4, 0x11b5, /* 0x0ea8-0x0eaf */ + 0x11b6, 0x1106, 0x1107, 0x1108, 0x11b9, 0x1109, 0x110a, 0x110b, /* 0x0eb0-0x0eb7 */ + 0x110c, 0x110d, 0x110e, 0x110f, 0x1110, 0x1111, 0x1112, 0x1161, /* 0x0eb8-0x0ebf */ + 0x1162, 0x1163, 0x1164, 0x1165, 0x1166, 0x1167, 0x1168, 0x1169, /* 0x0ec0-0x0ec7 */ + 0x116a, 0x116b, 0x116c, 0x116d, 0x116e, 0x116f, 0x1170, 0x1171, /* 0x0ec8-0x0ecf */ + 0x1172, 0x1173, 0x1174, 0x1175, 0x11a8, 0x11a9, 0x11aa, 0x11ab, /* 0x0ed0-0x0ed7 */ + 0x11ac, 0x11ad, 0x11ae, 0x11af, 0x11b0, 0x11b1, 0x11b2, 0x11b3, /* 0x0ed8-0x0edf */ + 0x11b4, 0x11b5, 0x11b6, 0x11b7, 0x11b8, 0x11b9, 0x11ba, 0x11bb, /* 0x0ee0-0x0ee7 */ + 0x11bc, 0x11bd, 0x11be, 0x11bf, 0x11c0, 0x11c1, 0x11c2, 0x0000, /* 0x0ee8-0x0eef */ + 0x0000, 0x0000, 0x1140, 0x0000, 0x0000, 0x1159, 0x119e, 0x0000, /* 0x0ef0-0x0ef7 */ + 0x11eb, 0x0000, 0x11f9, 0x0000, 0x0000, 0x0000, 0x0000, 0x20a9, /* 0x0ef8-0x0eff */ +}; + +static unsigned short keysym_to_unicode_12a1_12fe[] = { + 0x1e02, 0x1e03, 0x0000, 0x0000, 0x0000, 0x1e0a, 0x0000, /* 0x12a0-0x12a7 */ + 0x1e80, 0x0000, 0x1e82, 0x1e0b, 0x1ef2, 0x0000, 0x0000, 0x0000, /* 0x12a8-0x12af */ + 0x1e1e, 0x1e1f, 0x0000, 0x0000, 0x1e40, 0x1e41, 0x0000, 0x1e56, /* 0x12b0-0x12b7 */ + 0x1e81, 0x1e57, 0x1e83, 0x1e60, 0x1ef3, 0x1e84, 0x1e85, 0x1e61, /* 0x12b8-0x12bf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x12c0-0x12c7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x12c8-0x12cf */ + 0x0174, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1e6a, /* 0x12d0-0x12d7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0176, 0x0000, /* 0x12d8-0x12df */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x12e0-0x12e7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x12e8-0x12ef */ + 0x0175, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1e6b, /* 0x12f0-0x12f7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0177 /* 0x12f0-0x12ff */ +}; + +static unsigned short const keysym_to_unicode_13bc_13be[] = { + 0x0152, 0x0153, 0x0178 /* 0x13b8-0x13bf */ +}; + +static unsigned short keysym_to_unicode_14a1_14ff[] = { + 0x2741, 0x00a7, 0x0589, 0x0029, 0x0028, 0x00bb, 0x00ab, /* 0x14a0-0x14a7 */ + 0x2014, 0x002e, 0x055d, 0x002c, 0x2013, 0x058a, 0x2026, 0x055c, /* 0x14a8-0x14af */ + 0x055b, 0x055e, 0x0531, 0x0561, 0x0532, 0x0562, 0x0533, 0x0563, /* 0x14b0-0x14b7 */ + 0x0534, 0x0564, 0x0535, 0x0565, 0x0536, 0x0566, 0x0537, 0x0567, /* 0x14b8-0x14bf */ + 0x0538, 0x0568, 0x0539, 0x0569, 0x053a, 0x056a, 0x053b, 0x056b, /* 0x14c0-0x14c7 */ + 0x053c, 0x056c, 0x053d, 0x056d, 0x053e, 0x056e, 0x053f, 0x056f, /* 0x14c8-0x14cf */ + 0x0540, 0x0570, 0x0541, 0x0571, 0x0542, 0x0572, 0x0543, 0x0573, /* 0x14d0-0x14d7 */ + 0x0544, 0x0574, 0x0545, 0x0575, 0x0546, 0x0576, 0x0547, 0x0577, /* 0x14d8-0x14df */ + 0x0548, 0x0578, 0x0549, 0x0579, 0x054a, 0x057a, 0x054b, 0x057b, /* 0x14e0-0x14e7 */ + 0x054c, 0x057c, 0x054d, 0x057d, 0x054e, 0x057e, 0x054f, 0x057f, /* 0x14e8-0x14ef */ + 0x0550, 0x0580, 0x0551, 0x0581, 0x0552, 0x0582, 0x0553, 0x0583, /* 0x14f0-0x14f7 */ + 0x0554, 0x0584, 0x0555, 0x0585, 0x0556, 0x0586, 0x2019, 0x0027, /* 0x14f8-0x14ff */ +}; + +static unsigned short keysym_to_unicode_15d0_15f6[] = { + 0x10d0, 0x10d1, 0x10d2, 0x10d3, 0x10d4, 0x10d5, 0x10d6, 0x10d7, /* 0x15d0-0x15d7 */ + 0x10d8, 0x10d9, 0x10da, 0x10db, 0x10dc, 0x10dd, 0x10de, 0x10df, /* 0x15d8-0x15df */ + 0x10e0, 0x10e1, 0x10e2, 0x10e3, 0x10e4, 0x10e5, 0x10e6, 0x10e7, /* 0x15e0-0x15e7 */ + 0x10e8, 0x10e9, 0x10ea, 0x10eb, 0x10ec, 0x10ed, 0x10ee, 0x10ef, /* 0x15e8-0x15ef */ + 0x10f0, 0x10f1, 0x10f2, 0x10f3, 0x10f4, 0x10f5, 0x10f6 /* 0x15f0-0x15f7 */ +}; + +static unsigned short keysym_to_unicode_16a0_16f6[] = { + 0x0000, 0x0000, 0xf0a2, 0x1e8a, 0x0000, 0xf0a5, 0x012c, 0xf0a7, /* 0x16a0-0x16a7 */ + 0xf0a8, 0x01b5, 0x01e6, 0x0000, 0x0000, 0x0000, 0x0000, 0x019f, /* 0x16a8-0x16af */ + 0x0000, 0x0000, 0xf0b2, 0x1e8b, 0x01d1, 0xf0b5, 0x012d, 0xf0b7, /* 0x16b0-0x16b7 */ + 0xf0b8, 0x01b6, 0x01e7, 0x0000, 0x0000, 0x01d2, 0x0000, 0x0275, /* 0x16b8-0x16bf */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x018f, 0x0000, /* 0x16c0-0x16c7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16c8-0x16cf */ + 0x0000, 0x1e36, 0xf0d2, 0xf0d3, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16d0-0x16d7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16d8-0x16df */ + 0x0000, 0x1e37, 0xf0e2, 0xf0e3, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16e0-0x16e7 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x16e8-0x16ef */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0259 /* 0x16f0-0x16f6 */ +}; + +static unsigned short const keysym_to_unicode_1e9f_1eff[] = { + 0x0303, + 0x1ea0, 0x1ea1, 0x1ea2, 0x1ea3, 0x1ea4, 0x1ea5, 0x1ea6, 0x1ea7, /* 0x1ea0-0x1ea7 */ + 0x1ea8, 0x1ea9, 0x1eaa, 0x1eab, 0x1eac, 0x1ead, 0x1eae, 0x1eaf, /* 0x1ea8-0x1eaf */ + 0x1eb0, 0x1eb1, 0x1eb2, 0x1eb3, 0x1eb4, 0x1eb5, 0x1eb6, 0x1eb7, /* 0x1eb0-0x1eb7 */ + 0x1eb8, 0x1eb9, 0x1eba, 0x1ebb, 0x1ebc, 0x1ebd, 0x1ebe, 0x1ebf, /* 0x1eb8-0x1ebf */ + 0x1ec0, 0x1ec1, 0x1ec2, 0x1ec3, 0x1ec4, 0x1ec5, 0x1ec6, 0x1ec7, /* 0x1ec0-0x1ec7 */ + 0x1ec8, 0x1ec9, 0x1eca, 0x1ecb, 0x1ecc, 0x1ecd, 0x1ece, 0x1ecf, /* 0x1ec8-0x1ecf */ + 0x1ed0, 0x1ed1, 0x1ed2, 0x1ed3, 0x1ed4, 0x1ed5, 0x1ed6, 0x1ed7, /* 0x1ed0-0x1ed7 */ + 0x1ed8, 0x1ed9, 0x1eda, 0x1edb, 0x1edc, 0x1edd, 0x1ede, 0x1edf, /* 0x1ed8-0x1edf */ + 0x1ee0, 0x1ee1, 0x1ee2, 0x1ee3, 0x1ee4, 0x1ee5, 0x1ee6, 0x1ee7, /* 0x1ee0-0x1ee7 */ + 0x1ee8, 0x1ee9, 0x1eea, 0x1eeb, 0x1eec, 0x1eed, 0x1eee, 0x1eef, /* 0x1ee8-0x1eef */ + 0x1ef0, 0x1ef1, 0x0300, 0x0301, 0x1ef4, 0x1ef5, 0x1ef6, 0x1ef7, /* 0x1ef0-0x1ef7 */ + 0x1ef8, 0x1ef9, 0x01a0, 0x01a1, 0x01af, 0x01b0, 0x0309, 0x0323 /* 0x1ef8-0x1eff */ +}; + +static unsigned short const keysym_to_unicode_20a0_20ac[] = { + 0x20a0, 0x20a1, 0x20a2, 0x20a3, 0x20a4, 0x20a5, 0x20a6, 0x20a7, /* 0x20a0-0x20a7 */ + 0x20a8, 0x20a9, 0x20aa, 0x20ab, 0x20ac /* 0x20a8-0x20af */ +}; + +unsigned int +X11_KeySymToUcs4(KeySym keysym) +{ + /* 'Unicode keysym' */ + if ((keysym & 0xff000000) == 0x01000000) + return (keysym & 0x00ffffff); + + if (keysym > 0 && keysym < 0x100) + return keysym; + else if (keysym > 0x1a0 && keysym < 0x200) + return keysym_to_unicode_1a1_1ff[keysym - 0x1a1]; + else if (keysym > 0x2a0 && keysym < 0x2ff) + return keysym_to_unicode_2a1_2fe[keysym - 0x2a1]; + else if (keysym > 0x3a1 && keysym < 0x3ff) + return keysym_to_unicode_3a2_3fe[keysym - 0x3a2]; + else if (keysym > 0x4a0 && keysym < 0x4e0) + return keysym_to_unicode_4a1_4df[keysym - 0x4a1]; + else if (keysym > 0x589 && keysym < 0x5ff) + return keysym_to_unicode_590_5fe[keysym - 0x590]; + else if (keysym > 0x67f && keysym < 0x700) + return keysym_to_unicode_680_6ff[keysym - 0x680]; + else if (keysym > 0x7a0 && keysym < 0x7fa) + return keysym_to_unicode_7a1_7f9[keysym - 0x7a1]; + else if (keysym > 0x8a3 && keysym < 0x8ff) + return keysym_to_unicode_8a4_8fe[keysym - 0x8a4]; + else if (keysym > 0x9de && keysym < 0x9f9) + return keysym_to_unicode_9df_9f8[keysym - 0x9df]; + else if (keysym > 0xaa0 && keysym < 0xaff) + return keysym_to_unicode_aa1_afe[keysym - 0xaa1]; + else if (keysym > 0xcde && keysym < 0xcfb) + return keysym_to_unicode_cdf_cfa[keysym - 0xcdf]; + else if (keysym > 0xda0 && keysym < 0xdfa) + return keysym_to_unicode_da1_df9[keysym - 0xda1]; + else if (keysym > 0xe9f && keysym < 0xf00) + return keysym_to_unicode_ea0_eff[keysym - 0xea0]; + else if (keysym > 0x12a0 && keysym < 0x12ff) + return keysym_to_unicode_12a1_12fe[keysym - 0x12a1]; + else if (keysym > 0x13bb && keysym < 0x13bf) + return keysym_to_unicode_13bc_13be[keysym - 0x13bc]; + else if (keysym > 0x14a0 && keysym < 0x1500) + return keysym_to_unicode_14a1_14ff[keysym - 0x14a1]; + else if (keysym > 0x15cf && keysym < 0x15f7) + return keysym_to_unicode_15d0_15f6[keysym - 0x15d0]; + else if (keysym > 0x169f && keysym < 0x16f7) + return keysym_to_unicode_16a0_16f6[keysym - 0x16a0]; + else if (keysym > 0x1e9e && keysym < 0x1f00) + return keysym_to_unicode_1e9f_1eff[keysym - 0x1e9f]; + else if (keysym > 0x209f && keysym < 0x20ad) + return keysym_to_unicode_20a0_20ac[keysym - 0x20a0]; + else + return 0; +} + + diff --git a/AppKit/include/AppKit/NSDisplay.h b/AppKit/include/AppKit/NSDisplay.h index 32718aa0..a7fd8633 100644 --- a/AppKit/include/AppKit/NSDisplay.h +++ b/AppKit/include/AppKit/NSDisplay.h @@ -8,6 +8,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI #import #import +#import @class NSEvent, NSColor, NSPasteboard, NSDraggingManager, NSPrintInfo, NSView, NSSavePanel, NSOpenPanel, CGWindow; @@ -76,4 +77,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI - (NSDictionary*) currentModeForScreen:(int)screenIndex; - (BOOL) setMode:(NSDictionary *)mode forScreen:(int)screenIndex; +// Returned memory must be free()ed by the caller +- (UCKeyboardLayout*) keyboardLayout:(uint32_t*)byteLength; + @end