From: Holger Schemel <info@artsoft.org>
Date: Sun, 26 Feb 2006 15:21:30 +0000 (+0100)
Subject: rnd-20060226-4-src
X-Git-Tag: 3.2.0^2~60
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=0a340d881161f4009a79dc326f3579a70dc35b5b;p=rocksndiamonds.git

rnd-20060226-4-src
---

diff --git a/src/conftime.h b/src/conftime.h
index ffcafced..cc830fbb 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2006-02-26 15:45]"
+#define COMPILE_DATE_STRING "[2006-02-26 16:17]"
diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index 42992157..94f683d1 100644
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -1193,16 +1193,16 @@ void translate_keyname(Key *keysym, char **x11name, char **name, int mode)
 
     /* more ASCII keys */
     { KSYM_bracketleft,	"XK_bracketleft",	"[" },
-    { KSYM_backslash,	"XK_backslash",		"backslash" },
+    { KSYM_backslash,	"XK_backslash",		"\\" },
     { KSYM_bracketright,"XK_bracketright",	"]" },
-    { KSYM_asciicircum,	"XK_asciicircum",	"circumflex" },
+    { KSYM_asciicircum,	"XK_asciicircum",	"^" },
     { KSYM_underscore,	"XK_underscore",	"_" },
     { KSYM_grave,	"XK_grave",		"grave" },
     { KSYM_quoteleft,	"XK_quoteleft",		"quote left" },
     { KSYM_braceleft,	"XK_braceleft",		"brace left" },
     { KSYM_bar,		"XK_bar",		"bar" },
     { KSYM_braceright,	"XK_braceright",	"brace right" },
-    { KSYM_asciitilde,	"XK_asciitilde",	"ascii tilde" },
+    { KSYM_asciitilde,	"XK_asciitilde",	"~" },
 
     /* special (non-ASCII) keys */
     { KSYM_Adiaeresis,	"XK_Adiaeresis",	"Ä" },
@@ -1232,8 +1232,13 @@ void translate_keyname(Key *keysym, char **x11name, char **name, int mode)
       sprintf(name_buffer, "%c", '0' + (char)(key - KSYM_0));
     else if (key >= KSYM_KP_0 && key <= KSYM_KP_9)
       sprintf(name_buffer, "keypad %c", '0' + (char)(key - KSYM_KP_0));
+#if 1
+    else if (key >= KSYM_FKEY_FIRST && key <= KSYM_FKEY_LAST)
+      sprintf(name_buffer, "F%d", (int)(key - KSYM_FKEY_FIRST + 1));
+#else
     else if (key >= KSYM_FKEY_FIRST && key <= KSYM_FKEY_LAST)
       sprintf(name_buffer, "function F%d", (int)(key - KSYM_FKEY_FIRST + 1));
+#endif
     else if (key == KSYM_UNDEFINED)
       strcpy(name_buffer, "(undefined)");
     else
diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index c96316f6..396939e7 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -2645,6 +2645,9 @@ char *getSetupValue(int type, void *value)
       break;
   }
 
+  if (type & TYPE_GHOSTED)
+    strcpy(value_string, "n/a");
+
   return value_string;
 }
 
diff --git a/src/screens.c b/src/screens.c
index 5b207805..ed937406 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -61,6 +61,7 @@
 #define MAX_MENU_ENTRIES_ON_SCREEN	(SCR_FIELDY - 2)
 #define MENU_SCREEN_START_YPOS		2
 #define MENU_SCREEN_VALUE_XPOS		14
+#define MENU_SCREEN_MAX_XPOS		(SCR_FIELDX - 1)
 #define MENU_TITLE1_YPOS		8
 #define MENU_TITLE2_YPOS		46
 
@@ -2232,8 +2233,8 @@ static void drawSetupValue(int pos)
   int font_nr = FONT_VALUE_1;
   int type = setup_info[pos].type;
   void *value = setup_info[pos].value;
-  char *value_string = (!(type & TYPE_GHOSTED) ? getSetupValue(type, value) :
-			"n/a");
+  char *value_string = getSetupValue(type, value);
+  int i;
 
   if (value_string == NULL)
     return;
@@ -2267,8 +2268,14 @@ static void drawSetupValue(int pos)
     font_nr = (*(boolean *)value ? FONT_OPTION_ON : FONT_OPTION_OFF);
   }
 
+#if 1
+  for (i = xpos; i <= MENU_SCREEN_MAX_XPOS; i++)
+    DrawText(mSX + i * 32, mSY + ypos * 32, " ", font_nr);
+#else
   DrawText(mSX + xpos * 32, mSY + ypos * 32,
 	   (xpos == 3 ? "              " : "   "), font_nr);
+#endif
+
   DrawText(mSX + xpos * 32, mSY + ypos * 32, value_string, font_nr);
 }