Update X11 header-files to the latest version

tcltk · May 4, 2024 · 74b174e · 74b174e
2 parents f5d62d9 + f24df88
commit 74b174e
Show file tree

Hide file tree

Showing 8 changed files with 1,525 additions and 597 deletions.
diff --git 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 },
@@ -79,13 +83,11 @@
 { "Help", 0xFF6A },
 { "Break", 0xFF6B },
 { "Mode_switch", 0xFF7E },
-#ifndef TK_NO_DEPRECATED
 { "script_switch", 0xFF7E },
 { "kana_switch", 0xFF7E },
 { "Arabic_switch", 0xFF7E },
 { "Greek_switch", 0xFF7E },
 { "Hebrew_switch", 0xFF7E },
-#endif
 { "Num_Lock", 0xFF7F },
 { "KP_Space", 0xFF80 },
 { "KP_Tab", 0xFF89 },
@@ -135,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 },
@@ -220,6 +272,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 },
@@ -311,10 +364,15 @@
 { "dead_u", 0xFE88 },
 { "dead_U", 0xFE89 },
 { "dead_schwa", 0xFE8A },
+#ifndef TK_NO_DEPRECATED
 { "dead_small_schwa", 0xFE8A },
+#endif
 { "dead_SCHWA", 0xFE8B },
+#ifndef TK_NO_DEPRECATED
 { "dead_capital_schwa", 0xFE8B },
+#endif
 { "dead_greek", 0xFE8C },
+{ "dead_hamza", 0xFE8D },
 { "dead_lowline", 0xFE90 },
 { "dead_aboveverticalline", 0xFE91 },
 { "dead_belowverticalline", 0xFE92 },
@@ -535,7 +593,9 @@
 { "Odiaeresis", 0xD6 },
 { "multiply", 0xD7 },
 { "Oslash", 0xD8 },
+#ifndef TK_NO_DEPRECATED
 { "Ooblique", 0xD8 },
+#endif
 { "Ugrave", 0xD9 },
 { "Uacute", 0xDA },
 { "Ucircumflex", 0xDB },
@@ -569,15 +629,17 @@
 { "odiaeresis", 0xF6 },
 { "division", 0xF7 },
 { "oslash", 0xF8 },
+#ifndef TK_NO_DEPRECATED
 { "ooblique", 0xF8 },
+#endif
 { "ugrave", 0xF9 },
 { "uacute", 0xFA },
 { "ucircumflex", 0xFB },
 { "udiaeresis", 0xFC },
 { "yacute", 0xFD },
 { "thorn", 0xFE },
 { "ydiaeresis", 0xFF },
-#endif /* TK_NO_DEPRECATED */
+#endif
 { "Aogonek", 0x1A1 },
 { "breve", 0x1A2 },
 { "Lstroke", 0x1A3 },

diff --git a/xlib/X11/DECkeysym.h b/xlib/X11/DECkeysym.h
@@ -52,14 +52,14 @@ SOFTWARE.
 
 /* two-key compose sequence initiators, chosen to map to Latin1 characters */
 
-#define DXK_ring_accent         0x1000FEB0
-#define DXK_circumflex_accent   0x1000FE5E
-#define DXK_cedilla_accent      0x1000FE2C
-#define DXK_acute_accent        0x1000FE27
-#define DXK_grave_accent        0x1000FE60
-#define DXK_tilde               0x1000FE7E
-#define DXK_diaeresis           0x1000FE22
+#define DXK_ring_accent              0x1000feb0
+#define DXK_circumflex_accent        0x1000fe5e
+#define DXK_cedilla_accent           0x1000fe2c
+#define DXK_acute_accent             0x1000fe27
+#define DXK_grave_accent             0x1000fe60
+#define DXK_tilde                    0x1000fe7e
+#define DXK_diaeresis                0x1000fe22
 
 /* special keysym for LK2** "Remove" key on editing keypad */
 
-#define DXK_Remove	0x1000FF00   /* Remove */
+#define DXK_Remove                   0x1000ff00  /* Remove */