diff options
| -rw-r--r-- | generic/ks_names.h | 54 | ||||
| -rw-r--r-- | macosx/tkMacOSXKeysyms.h | 8 |
2 files changed, 58 insertions, 4 deletions
diff --git a/generic/ks_names.h b/generic/ks_names.h index c06e7b1..6978f03 100644 --- a/generic/ks_names.h +++ b/generic/ks_names.h @@ -59,9 +59,13 @@ { "Right", 0xFF53 }, { "Down", 0xFF54 }, { "Prior", 0xFF55 }, +#ifndef TK_NO_DEPRECATED { "Page_Up", 0xFF55 }, +#endif { "Next", 0xFF56 }, +#ifndef TK_NO_DEPRECATED { "Page_Down", 0xFF56 }, +#endif { "End", 0xFF57 }, { "Begin", 0xFF58 }, { "Select", 0xFF60 }, @@ -133,55 +137,105 @@ { "F9", 0xFFC6 }, { "F10", 0xFFC7 }, { "F11", 0xFFC8 }, +#ifndef TK_NO_DEPRECATED { "L1", 0xFFC8 }, +#endif { "F12", 0xFFC9 }, +#ifndef TK_NO_DEPRECATED { "L2", 0xFFC9 }, +#endif { "F13", 0xFFCA }, +#ifndef TK_NO_DEPRECATED { "L3", 0xFFCA }, +#endif { "F14", 0xFFCB }, +#ifndef TK_NO_DEPRECATED { "L4", 0xFFCB }, +#endif { "F15", 0xFFCC }, +#ifndef TK_NO_DEPRECATED { "L5", 0xFFCC }, +#endif { "F16", 0xFFCD }, +#ifndef TK_NO_DEPRECATED { "L6", 0xFFCD }, +#endif { "F17", 0xFFCE }, +#ifndef TK_NO_DEPRECATED { "L7", 0xFFCE }, +#endif { "F18", 0xFFCF }, +#ifndef TK_NO_DEPRECATED { "L8", 0xFFCF }, +#endif { "F19", 0xFFD0 }, +#ifndef TK_NO_DEPRECATED { "L9", 0xFFD0 }, +#endif { "F20", 0xFFD1 }, +#ifndef TK_NO_DEPRECATED { "L10", 0xFFD1 }, +#endif { "F21", 0xFFD2 }, +#ifndef TK_NO_DEPRECATED { "R1", 0xFFD2 }, +#endif { "F22", 0xFFD3 }, +#ifndef TK_NO_DEPRECATED { "R2", 0xFFD3 }, +#endif { "F23", 0xFFD4 }, +#ifndef TK_NO_DEPRECATED { "R3", 0xFFD4 }, +#endif { "F24", 0xFFD5 }, +#ifndef TK_NO_DEPRECATED { "R4", 0xFFD5 }, +#endif { "F25", 0xFFD6 }, +#ifndef TK_NO_DEPRECATED { "R5", 0xFFD6 }, +#endif { "F26", 0xFFD7 }, +#ifndef TK_NO_DEPRECATED { "R6", 0xFFD7 }, +#endif { "F27", 0xFFD8 }, +#ifndef TK_NO_DEPRECATED { "R7", 0xFFD8 }, +#endif { "F28", 0xFFD9 }, +#ifndef TK_NO_DEPRECATED { "R8", 0xFFD9 }, +#endif { "F29", 0xFFDA }, +#ifndef TK_NO_DEPRECATED { "R9", 0xFFDA }, +#endif { "F30", 0xFFDB }, +#ifndef TK_NO_DEPRECATED { "R10", 0xFFDB }, +#endif { "F31", 0xFFDC }, +#ifndef TK_NO_DEPRECATED { "R11", 0xFFDC }, +#endif { "F32", 0xFFDD }, +#ifndef TK_NO_DEPRECATED { "R12", 0xFFDD }, +#endif { "F33", 0xFFDE }, +#ifndef TK_NO_DEPRECATED { "R13", 0xFFDE }, +#endif { "F34", 0xFFDF }, +#ifndef TK_NO_DEPRECATED { "R14", 0xFFDF }, +#endif { "F35", 0xFFE0 }, +#ifndef TK_NO_DEPRECATED { "R15", 0xFFE0 }, +#endif { "Shift_L", 0xFFE1 }, { "Shift_R", 0xFFE2 }, { "Control_L", 0xFFE3 }, diff --git a/macosx/tkMacOSXKeysyms.h b/macosx/tkMacOSXKeysyms.h index 1f6f260..51b2fc8 100644 --- a/macosx/tkMacOSXKeysyms.h +++ b/macosx/tkMacOSXKeysyms.h @@ -85,17 +85,17 @@ static const KeyInfo keyArray[] = { {106, XK_F16, NSF16FunctionKey}, {107, XK_F14, NSF14FunctionKey}, {109, XK_F10, NSF10FunctionKey}, - {110, XK_Menu, UNKNOWN_KEYCHAR}, + {110, XK_Menu, UNKNOWN_KEYCHAR}, {111, XK_F12, NSF12FunctionKey}, {113, XK_F15, NSF15FunctionKey}, {114, XK_Help, NSHelpFunctionKey}, {115, XK_Home, NSHomeFunctionKey}, /* Fn Left */ - {116, XK_Page_Up, NSPageUpFunctionKey}, /* Fn Up */ + {116, XK_Prior, NSPageUpFunctionKey}, /* Fn Up */ {117, XK_Delete, NSDeleteFunctionKey}, /* Fn Delete */ {118, XK_F4, NSF4FunctionKey}, {119, XK_End, NSEndFunctionKey}, /* Fn Right */ {120, XK_F2, NSF2FunctionKey}, - {121, XK_Page_Down, NSPageDownFunctionKey}, /* Fn Down */ + {121, XK_Next, NSPageDownFunctionKey}, /* Fn Down */ {122, XK_F1, NSF1FunctionKey}, {123, XK_Left, NSLeftArrowFunctionKey}, {124, XK_Right, NSRightArrowFunctionKey}, @@ -141,7 +141,7 @@ typedef struct KeysymInfo { KeyCode keycode; } KeysymInfo; -const KeysymInfo keysymTable[] = { +static const KeysymInfo keysymTable[] = { {0x0020, 0x0020}, /* space */ {0x0021, 0x0021}, /* exclam */ {0x0022, 0x0022}, /* quotedbl */ |