{
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
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];
char *option_arg = NULL;
int option_len = strlen(option);
+ if (option_len >= MAX_OPTION_LEN)
+ Error(ERR_EXIT_HELP, "unrecognized option '%s'", option);
+
strcpy(option_str, option); /* copy argument into buffer */
option = option_str;
if (strcmp(option, "--") == 0) /* stop scanning arguments */
break;
- if (option_len >= MAX_OPTION_LEN)
- Error(ERR_EXIT_HELP, "unrecognized option '%s'", option);
-
if (strncmp(option, "--", 2) == 0) /* treat '--' like '-' */
option++;
options.display_name = option_arg;
if (option_arg == next_option)
options_left++;
-
- printf("--display == '%s'\n", options.display_name);
}
else if (strncmp(option, "-basepath", option_len) == 0)
{
if (option_arg == next_option)
options_left++;
- printf("--basepath == '%s'\n", options.base_directory);
-
/* adjust path for level directory accordingly */
options.level_directory =
getPath2(options.base_directory, LEVELS_DIRECTORY);
options.level_directory = option_arg;
if (option_arg == next_option)
options_left++;
-
- printf("--levels == '%s'\n", options.level_directory);
}
else if (strncmp(option, "-network", option_len) == 0)
{
- printf("--network\n");
-
options.network = TRUE;
}
else if (strncmp(option, "-serveronly", option_len) == 0)
{
- printf("--serveronly\n");
-
options.serveronly = TRUE;
}
else if (strncmp(option, "-verbose", option_len) == 0)
{
- printf("--verbose\n");
-
options.verbose = TRUE;
}
else if (*option == '-')
+ {
Error(ERR_EXIT_HELP, "unrecognized option '%s'", option_str);
+ }
else if (options.server_host == NULL)
{
options.server_host = *options_left;
-
- printf("server.name == '%s'\n", options.server_host);
}
else if (options.server_port == 0)
{
options.server_port = atoi(*options_left);
if (options.server_port < 1024)
Error(ERR_EXIT_HELP, "bad port number '%d'", options.server_port);
-
- printf("port == %d\n", options.server_port);
}
else
Error(ERR_EXIT_HELP, "too many arguments");
char *process_name = "";
FILE *error = stderr;
+ /* display warnings only when running in verbose mode */
+ if (mode & ERR_WARN && !options.verbose)
+ return;
+
#ifdef MSDOS
if ((error = openErrorFile()) == NULL)
{
{ XK_End, "XK_End", "end" },
{ XK_Page_Up, "XK_Page_Up", "page up" },
{ XK_Page_Down, "XK_Page_Down", "page down" },
- { XK_space, "XK_space", "space" },
- /* even more special keys */
- { XK_adiaeresis, "XK_adiaeresis", "ä" },
- { XK_odiaeresis, "XK_odiaeresis", "ö" },
- { XK_udiaeresis, "XK_udiaeresis", "ü" },
+
+ /* ASCII 0x20 to 0x40 keys (except numbers) */
+ { XK_space, "XK_space", "space" },
+ { XK_exclam, "XK_exclam", "!" },
+ { XK_quotedbl, "XK_quotedbl", "\"" },
+ { XK_numbersign, "XK_numbersign", "#" },
+ { XK_dollar, "XK_dollar", "$" },
+ { XK_percent, "XK_percent", "%" },
+ { XK_ampersand, "XK_ampersand", "&" },
{ XK_apostrophe, "XK_apostrophe", "'" },
+ { XK_parenleft, "XK_parenleft", "(" },
+ { XK_parenright, "XK_parenright", ")" },
+ { XK_asterisk, "XK_asterisk", "*" },
{ XK_plus, "XK_plus", "+" },
- { XK_minus, "XK_minus", "-" },
- { XK_equal, "XK_equal", "equal" },
{ XK_comma, "XK_comma", "," },
+ { XK_minus, "XK_minus", "-" },
{ XK_period, "XK_period", "." },
- { XK_colon, "XK_colon", ";" },
{ XK_slash, "XK_slash", "/" },
- { XK_numbersign, "XK_numbersign", "#" },
+ { XK_colon, "XK_colon", ":" },
+ { XK_semicolon, "XK_semicolon", ";" },
+ { XK_less, "XK_less", "<" },
+ { XK_equal, "XK_equal", "=" },
+ { XK_greater, "XK_greater", ">" },
+ { XK_question, "XK_question", "?" },
+ { XK_at, "XK_at", "@" },
+
+ /* more ASCII keys */
+ { XK_bracketleft, "XK_bracketleft", "[" },
{ XK_backslash, "XK_backslash", "backslash" },
+ { XK_bracketright, "XK_bracketright", "]" },
+ { XK_asciicircum, "XK_asciicircum", "circumflex" },
+ { XK_underscore, "XK_underscore", "_" },
+ { XK_grave, "XK_grave", "grave" },
+ { XK_quoteleft, "XK_quoteleft", "quote left" },
{ XK_braceleft, "XK_braceleft", "brace left" },
+ { XK_bar, "XK_bar", "bar" },
{ XK_braceright, "XK_braceright", "brace right" },
- { XK_less, "XK_less", "less" },
- { XK_greater, "XK_greater", "greater" },
- { XK_asciicircum, "XK_asciicircum", "circumflex" },
+ { XK_asciitilde, "XK_asciitilde", "ascii tilde" },
+
+ /* special (non-ASCII) keys */
+ { XK_Adiaeresis, "XK_Adiaeresis", "Ä" },
+ { XK_Odiaeresis, "XK_Odiaeresis", "Ö" },
+ { XK_Udiaeresis, "XK_Udiaeresis", "Ü" },
+ { XK_adiaeresis, "XK_adiaeresis", "ä" },
+ { XK_odiaeresis, "XK_odiaeresis", "ö" },
+ { XK_udiaeresis, "XK_udiaeresis", "ü" },
{ XK_ssharp, "XK_ssharp", "sharp s" },
/* end-of-array identifier */
return keysym;
}
+char getCharFromKeySym(KeySym keysym)
+{
+ char *keyname = getKeyNameFromKeySym(keysym);
+ char letter = 0;
+
+ if (strlen(keyname) == 1)
+ letter = keyname[0];
+ else if (strcmp(keyname, "space") == 0)
+ letter = ' ';
+ else if (strcmp(keyname, "circumflex") == 0)
+ letter = '^';
+
+ return letter;
+}
+
#define TRANSLATE_JOYSYMBOL_TO_JOYNAME 0
#define TRANSLATE_JOYNAME_TO_JOYSYMBOL 1
projects / rocksndiamonds.git / blobdiff