X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmisc.c;h=0e113727536ae9468a7c83c479be9936cfbff9f4;hb=240269d614d12d0612cc0764589e6798378e2b8c;hp=2d7e7f1f6c106e8ce6971fb2eb9ddacb409d6c8e;hpb=34efaa3925a28cb95ecb05bf2c693c16f6edfe2f;p=rocksndiamonds.git diff --git a/src/misc.c b/src/misc.c index 2d7e7f1f..0e113727 100644 --- a/src/misc.c +++ b/src/misc.c @@ -241,6 +241,16 @@ char *getLoginName() return pwd->pw_name; } +char *getRealName() +{ + struct passwd *pwd; + + if (!(pwd = getpwuid(getuid()))) + return "ANONYMOUS"; + else + return pwd->pw_gecos; +} + char *getHomeDir() { #ifndef MSDOS @@ -315,6 +325,25 @@ void MarkTileDirty(int x, int y) redraw_mask |= REDRAW_TILES; } +void SetBorderElement() +{ + int x, y; + + BorderElement = EL_LEERRAUM; + + for(y=0; y= 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++; @@ -384,8 +413,6 @@ void GetOptions(char *argv[]) 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) { @@ -396,8 +423,6 @@ void GetOptions(char *argv[]) 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); @@ -410,42 +435,32 @@ void GetOptions(char *argv[]) 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"); @@ -459,6 +474,10 @@ void Error(int mode, char *format, ...) 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) { @@ -591,27 +610,53 @@ void translate_keyname(KeySym *keysym, char **x11name, char **name, int mode) { 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 */ @@ -803,6 +848,21 @@ KeySym getKeySymFromX11KeyName(char *x11name) 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