X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmisc.c;h=fd85aeddac9e433635bff3586077c11e6fa5ad2f;hb=41364660abbcb81a83f5018be3655352ecdf1ac9;hp=3b3f6a04212dcbde4775d8a54874d9bdf8a4c844;hpb=e6856beb007b3f09036a04290c6b162953ddfece;p=rocksndiamonds.git

diff --git a/src/misc.c b/src/misc.c
index 3b3f6a04..fd85aedd 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -235,12 +235,49 @@ char *getLoginName()
 {
   struct passwd *pwd;
 
-  if (!(pwd = getpwuid(getuid())))
-    return "ANONYMOUS";
+  if ((pwd = getpwuid(getuid())) == NULL)
+    return ANONYMOUS_NAME;
   else
     return pwd->pw_name;
 }
 
+char *getRealName()
+{
+#ifndef MSDOS
+  struct passwd *pwd;
+
+  if ((pwd = getpwuid(getuid())) == NULL || strlen(pwd->pw_gecos) == 0)
+    return ANONYMOUS_NAME;
+  else
+  {
+    static char real_name[1024];
+    char *from_ptr = pwd->pw_gecos, *to_ptr = real_name;
+
+    if (strchr(pwd->pw_gecos, 'ß') == NULL)
+      return pwd->pw_gecos;
+
+    /* the user's real name contains a 'ß' character (german sharp s),
+       which has no equivalent in upper case letters (which our fonts use) */
+    while (*from_ptr != '\0' && (long)(to_ptr - real_name) < 1024 - 2)
+    {
+      if (*from_ptr != 'ß')
+	*to_ptr++ = *from_ptr++;
+      else
+      {
+	from_ptr++;
+	*to_ptr++ = 's';
+	*to_ptr++ = 's';
+      }
+    }
+    *to_ptr = '\0';
+
+    return real_name;
+  }
+#else
+  return ANONYMOUS_NAME;
+#endif
+}
+
 char *getHomeDir()
 {
 #ifndef MSDOS
@@ -315,6 +352,25 @@ void MarkTileDirty(int x, int y)
   redraw_mask |= REDRAW_TILES;
 }
 
+void SetBorderElement()
+{
+  int x, y;
+
+  BorderElement = EL_LEERRAUM;
+
+  for(y=0; y<lev_fieldy && BorderElement == EL_LEERRAUM; y++)
+  {
+    for(x=0; x<lev_fieldx; x++)
+    {
+      if (!IS_MASSIVE(Feld[x][y]))
+	BorderElement = EL_BETON;
+
+      if (y != 0 && y != lev_fieldy - 1 && x != lev_fieldx - 1)
+	x = lev_fieldx - 2;
+    }
+  }
+}
+
 void GetOptions(char *argv[])
 {
   char **options_left = &argv[1];
@@ -602,9 +658,9 @@ void translate_keyname(KeySym *keysym, char **x11name, char **name, int mode)
     { XK_slash,		"XK_slash",		"/" },
     { XK_colon,		"XK_colon",		":" },
     { XK_semicolon,	"XK_semicolon",		";" },
-    { XK_less,		"XK_less",		"less" },
-    { XK_equal,		"XK_equal",		"equal" },
-    { XK_greater,	"XK_greater",		"greater" },
+    { XK_less,		"XK_less",		"<" },
+    { XK_equal,		"XK_equal",		"=" },
+    { XK_greater,	"XK_greater",		">" },
     { XK_question,	"XK_question",		"?" },
     { XK_at,		"XK_at",		"@" },
 
@@ -828,12 +884,8 @@ char getCharFromKeySym(KeySym keysym)
     letter = keyname[0];
   else if (strcmp(keyname, "space") == 0)
     letter = ' ';
-  else if (strcmp(keyname, "less") == 0)
-    letter = '<';
-  else if (strcmp(keyname, "equal") == 0)
-    letter = '=';
-  else if (strcmp(keyname, "greater") == 0)
-    letter = '>';
+  else if (strcmp(keyname, "circumflex") == 0)
+    letter = '^';
 
   return letter;
 }