diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-05-03 15:31:14 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-05-03 15:31:14 (GMT) |
| commit | 8efca8f659b657de7428e8be25fe371c9c20fe0d (patch) | |
| tree | 799f882bfd96232aa1b7bce24c68f80b81c12ef4 | |
| parent | 280afa1e07cb7f084bfd041f2035deb5c5761420 (diff) | |
| download | tk-8efca8f659b657de7428e8be25fe371c9c20fe0d.zip tk-8efca8f659b657de7428e8be25fe371c9c20fe0d.tar.gz tk-8efca8f659b657de7428e8be25fe371c9c20fe0d.tar.bz2 | |
Add missing keysyms "ISO_Group_Shift" and "dead_hamza" on MacOS/Windows. Missing "static" keyword, wrong typecast, no longer use deprecated keysym defines
| -rw-r--r-- | generic/ks_names.h | 2 | ||||
| -rw-r--r-- | generic/tkError.c | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXKeysyms.h | 10 |
3 files changed, 8 insertions, 6 deletions
diff --git a/generic/ks_names.h b/generic/ks_names.h index 3fce645..2462e79 100644 --- a/generic/ks_names.h +++ b/generic/ks_names.h @@ -212,6 +212,7 @@ { "ISO_Level3_Shift", 0xFE03 }, { "ISO_Level3_Latch", 0xFE04 }, { "ISO_Level3_Lock", 0xFE05 }, +{ "ISO_Group_Shift", 0xFF7E }, { "ISO_Group_Latch", 0xFE06 }, { "ISO_Group_Lock", 0xFE07 }, { "ISO_Next_Group", 0xFE08 }, @@ -307,6 +308,7 @@ { "dead_SCHWA", 0xFE8B }, { "dead_capital_schwa", 0xFE8B }, { "dead_greek", 0xFE8C }, +{ "dead_hamza", 0xFE8D }, { "dead_lowline", 0xFE90 }, { "dead_aboveverticalline", 0xFE91 }, { "dead_belowverticalline", 0xFE92 }, diff --git a/generic/tkError.c b/generic/tkError.c index 6ff5475..eadeffe 100644 --- a/generic/tkError.c +++ b/generic/tkError.c @@ -110,7 +110,7 @@ Tk_CreateErrorHandler( errorPtr = (TkErrorHandler *)ckalloc(sizeof(TkErrorHandler)); errorPtr->dispPtr = dispPtr; errorPtr->firstRequest = NextRequest(display); - errorPtr->lastRequest = (unsigned) -1; + errorPtr->lastRequest = (unsigned long) -1; errorPtr->error = error; errorPtr->request = request; errorPtr->minorCode = minorCode; diff --git a/macosx/tkMacOSXKeysyms.h b/macosx/tkMacOSXKeysyms.h index 0b528f3..f97ad98 100644 --- a/macosx/tkMacOSXKeysyms.h +++ b/macosx/tkMacOSXKeysyms.h @@ -6,7 +6,7 @@ * * Copyright (c) 1990-1994 The Regents of the University of California. * Copyright (c) 1994-1997 Sun Microsystems, Inc. - * Copyright 2001-2009, Apple Inc. + * Copyright (c) 2001-2009 Apple Inc. * Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net> * Copyright (c) 2020 Marc Culler * @@ -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 */ |