rnd-19981022-1

[rocksndiamonds.git] / src / misc.c

diff --git a/src/misc.c b/src/misc.c
index e2c8d7e0bafbf52a8c11ebd91d38c67678fb5b72..be6894998d546e15e91b53c35eec06854848bf33 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -401,11 +401,13 @@ char *getKeySymName(KeySym key)
     char *name;
   } translate[] =
   {
+    /* normal cursor keys */
     { XK_Left,         "cursor left" },
     { XK_Right,                "cursor right" },
     { XK_Up,           "cursor up" },
     { XK_Down,         "cursor down" },
 
+    /* keypad cursor keys */
 #ifdef XK_KP_Left
     { XK_KP_Left,      "keypad left" },
     { XK_KP_Right,     "keypad right" },
@@ -413,20 +415,21 @@ char *getKeySymName(KeySym key)
     { XK_KP_Down,      "keypad down" },
 #endif
 
-    { XK_BackSpace,    "backspace" },
-    { XK_Delete,       "delete" },
-    { XK_Insert,       "insert" },
-    { XK_Tab,          "tab" },
-    { XK_Home,         "home" },
-    { XK_End,          "end" },
-    { XK_Page_Up,      "page up" },
-    { XK_Page_Down,    "page down" },
-    { XK_space,                "space" },
+    /* other keypad keys */
+#ifdef XK_KP_Enter
+    { XK_KP_Enter,     "keypad enter" },
+    { XK_KP_Add,       "keypad +" },
+    { XK_KP_Subtract,  "keypad -" },
+    { XK_KP_Multiply,  "keypad mltply" },
+    { XK_KP_Divide,    "keypad /" },
+    { XK_KP_Separator, "keypad ," },
+#endif
 
+    /* modifier keys */
     { XK_Shift_L,      "left shift" },
     { XK_Shift_R,      "right shift" },
-    { XK_Control_L,    "left ctrl" },
-    { XK_Control_R,    "right ctrl" },
+    { XK_Control_L,    "left control" },
+    { XK_Control_R,    "right control" },
     { XK_Meta_L,       "left meta" },
     { XK_Meta_R,       "right meta" },
     { XK_Alt_L,                "left alt" },
@@ -434,6 +437,33 @@ char *getKeySymName(KeySym key)
     { XK_Mode_switch,  "mode switch" },
     { XK_Multi_key,    "multi key" },
 
+    /* some special keys */
+    { XK_BackSpace,    "backspace" },
+    { XK_Delete,       "delete" },
+    { XK_Insert,       "insert" },
+    { XK_Tab,          "tab" },
+    { XK_Home,         "home" },
+    { XK_End,          "end" },
+    { XK_Page_Up,      "page up" },
+    { XK_Page_Down,    "page down" },
+    { XK_space,                "space" },
+
+    /* even more special keys */
+    { XK_adiaeresis,   "ä" },
+    { XK_odiaeresis,   "ö" },
+    { XK_udiaeresis,   "ü" },
+    { XK_apostrophe,   "'" },
+    { XK_plus,         "+" },
+    { XK_minus,                "-" },
+    { XK_comma,                "," },
+    { XK_period,       "." },
+    { XK_numbersign,   "#" },
+    { XK_less,         "less" },
+    { XK_greater,      "greater" },
+    { XK_asciicircum,  "circumflex" },
+    { XK_ssharp,       "sharp s" },
+
+    /* end-of-array identifier */
     { 0,                NULL }
   };
 
@@ -457,6 +487,11 @@ char *getKeySymName(KeySym key)
     sprintf(key_name, "keypad %c", '0' + (char)(key - XK_KP_0));
     return key_name;
   }
+  else if (key >= XK_F1 && key <= XK_F24)
+  {
+    sprintf(key_name, "function F%d", (int)(key - XK_F1 + 1));
+    return key_name;
+  }
   else
   {
     int i = 0;