X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmisc.c;h=211108d0f5dbeb74f1e9a11ca56fd351499afc4b;hb=52189f4b3b797e08699f67880198b585320cf8bf;hp=0e113727536ae9468a7c83c479be9936cfbff9f4;hpb=240269d614d12d0612cc0764589e6798378e2b8c;p=rocksndiamonds.git diff --git a/src/misc.c b/src/misc.c index 0e113727..211108d0 100644 --- a/src/misc.c +++ b/src/misc.c @@ -12,7 +12,6 @@ ***********************************************************/ #include -#include #include #include #include @@ -167,9 +166,20 @@ void WaitUntilDelayReached(unsigned long *counter_var, unsigned long delay) *counter_var = actual_counter; } +/* int2str() returns a number converted to a string; + the used memory is static, but will be overwritten by later calls, + so if you want to save the result, copy it to a private string buffer; + there can be 10 local calls of int2str() without buffering the result -- + the 11th call will then destroy the result from the first call and so on. +*/ + char *int2str(int number, int size) { - static char s[40]; + static char shift_array[10][40]; + static int shift_counter = 0; + char *s = shift_array[shift_counter]; + + shift_counter = (shift_counter + 1) % 10; if (size > 20) size = 20; @@ -235,20 +245,47 @@ 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()))) - return "ANONYMOUS"; + if ((pwd = getpwuid(getuid())) == NULL || strlen(pwd->pw_gecos) == 0) + return ANONYMOUS_NAME; else - return pwd->pw_gecos; + { + 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() @@ -296,7 +333,12 @@ char *getPath3(char *path1, char *path2, char *path3) char *getStringCopy(char *s) { - char *s_copy = checked_malloc(strlen(s) + 1); + char *s_copy; + + if (s == NULL) + return NULL; + + s_copy = checked_malloc(strlen(s) + 1); strcpy(s_copy, s); return s_copy; @@ -309,6 +351,7 @@ char *getStringToLower(char *s) while (*s) *s_ptr++ = tolower(*s++); + *s_ptr = '\0'; return s_copy; } @@ -352,8 +395,9 @@ void GetOptions(char *argv[]) options.display_name = NULL; options.server_host = NULL; options.server_port = 0; - options.base_directory = BASE_PATH; - options.level_directory = BASE_PATH "/" LEVELS_DIRECTORY; + options.ro_base_directory = RO_BASE_PATH; + options.rw_base_directory = RW_BASE_PATH; + options.level_directory = RO_BASE_PATH "/" LEVELS_DIRECTORY; options.serveronly = FALSE; options.network = FALSE; options.verbose = FALSE; @@ -398,7 +442,7 @@ void GetOptions(char *argv[]) "Options:\n" " -d, --display machine:0 X server display\n" " -b, --basepath directory alternative base directory\n" - " -l, --levels directory alternative level directory\n" + " -l, --level directory alternative level directory\n" " -s, --serveronly only start network server\n" " -n, --network network multiplayer game\n" " -v, --verbose verbose mode\n", @@ -419,13 +463,15 @@ void GetOptions(char *argv[]) if (option_arg == NULL) Error(ERR_EXIT_HELP, "option '%s' requires an argument", option_str); - options.base_directory = option_arg; + /* this should be extended to separate options for ro and rw data */ + options.ro_base_directory = option_arg; + options.rw_base_directory = option_arg; if (option_arg == next_option) options_left++; /* adjust path for level directory accordingly */ options.level_directory = - getPath2(options.base_directory, LEVELS_DIRECTORY); + getPath2(options.ro_base_directory, LEVELS_DIRECTORY); } else if (strncmp(option, "-levels", option_len) == 0) { @@ -552,112 +598,190 @@ void *checked_calloc(unsigned long size) return ptr; } -#define TRANSLATE_KEYSYM_TO_KEYNAME 0 -#define TRANSLATE_KEYSYM_TO_X11KEYNAME 1 -#define TRANSLATE_X11KEYNAME_TO_KEYSYM 2 +short getFile16BitInteger(FILE *file, int byte_order) +{ + if (byte_order == BYTE_ORDER_BIG_ENDIAN) + return ((fgetc(file) << 8) | + (fgetc(file) << 0)); + else /* BYTE_ORDER_LITTLE_ENDIAN */ + return ((fgetc(file) << 0) | + (fgetc(file) << 8)); +} + +void putFile16BitInteger(FILE *file, short value, int byte_order) +{ + if (byte_order == BYTE_ORDER_BIG_ENDIAN) + { + fputc((value >> 8) & 0xff, file); + fputc((value >> 0) & 0xff, file); + } + else /* BYTE_ORDER_LITTLE_ENDIAN */ + { + fputc((value >> 0) & 0xff, file); + fputc((value >> 8) & 0xff, file); + } +} + +int getFile32BitInteger(FILE *file, int byte_order) +{ + if (byte_order == BYTE_ORDER_BIG_ENDIAN) + return ((fgetc(file) << 24) | + (fgetc(file) << 16) | + (fgetc(file) << 8) | + (fgetc(file) << 0)); + else /* BYTE_ORDER_LITTLE_ENDIAN */ + return ((fgetc(file) << 0) | + (fgetc(file) << 8) | + (fgetc(file) << 16) | + (fgetc(file) << 24)); +} + +void putFile32BitInteger(FILE *file, int value, int byte_order) +{ + if (byte_order == BYTE_ORDER_BIG_ENDIAN) + { + fputc((value >> 24) & 0xff, file); + fputc((value >> 16) & 0xff, file); + fputc((value >> 8) & 0xff, file); + fputc((value >> 0) & 0xff, file); + } + else /* BYTE_ORDER_LITTLE_ENDIAN */ + { + fputc((value >> 0) & 0xff, file); + fputc((value >> 8) & 0xff, file); + fputc((value >> 16) & 0xff, file); + fputc((value >> 24) & 0xff, file); + } +} + +void getFileChunk(FILE *file, char *chunk_buffer, int *chunk_length, + int byte_order) +{ + const int chunk_identifier_length = 4; + + /* read chunk identifier */ + fgets(chunk_buffer, chunk_identifier_length + 1, file); + + /* read chunk length */ + *chunk_length = getFile32BitInteger(file, byte_order); +} + +void putFileChunk(FILE *file, char *chunk_name, int chunk_length, + int byte_order) +{ + /* write chunk identifier */ + fputs(chunk_name, file); + + /* write chunk length */ + putFile32BitInteger(file, chunk_length, byte_order); +} + +#define TRANSLATE_KEY_TO_KEYNAME 0 +#define TRANSLATE_KEY_TO_X11KEYNAME 1 +#define TRANSLATE_X11KEYNAME_TO_KEY 2 -void translate_keyname(KeySym *keysym, char **x11name, char **name, int mode) +void translate_keyname(Key *keysym, char **x11name, char **name, int mode) { static struct { - KeySym keysym; + Key key; char *x11name; char *name; } translate_key[] = { /* normal cursor keys */ - { XK_Left, "XK_Left", "cursor left" }, - { XK_Right, "XK_Right", "cursor right" }, - { XK_Up, "XK_Up", "cursor up" }, - { XK_Down, "XK_Down", "cursor down" }, + { KEY_Left, "XK_Left", "cursor left" }, + { KEY_Right, "XK_Right", "cursor right" }, + { KEY_Up, "XK_Up", "cursor up" }, + { KEY_Down, "XK_Down", "cursor down" }, /* keypad cursor keys */ -#ifdef XK_KP_Left - { XK_KP_Left, "XK_KP_Left", "keypad left" }, - { XK_KP_Right, "XK_KP_Right", "keypad right" }, - { XK_KP_Up, "XK_KP_Up", "keypad up" }, - { XK_KP_Down, "XK_KP_Down", "keypad down" }, +#ifdef KEY_KP_Left + { KEY_KP_Left, "XK_KP_Left", "keypad left" }, + { KEY_KP_Right, "XK_KP_Right", "keypad right" }, + { KEY_KP_Up, "XK_KP_Up", "keypad up" }, + { KEY_KP_Down, "XK_KP_Down", "keypad down" }, #endif /* other keypad keys */ -#ifdef XK_KP_Enter - { XK_KP_Enter, "XK_KP_Enter", "keypad enter" }, - { XK_KP_Add, "XK_KP_Add", "keypad +" }, - { XK_KP_Subtract, "XK_KP_Subtract", "keypad -" }, - { XK_KP_Multiply, "XK_KP_Multiply", "keypad mltply" }, - { XK_KP_Divide, "XK_KP_Divide", "keypad /" }, - { XK_KP_Separator, "XK_KP_Separator", "keypad ," }, +#ifdef KEY_KP_Enter + { KEY_KP_Enter, "XK_KP_Enter", "keypad enter" }, + { KEY_KP_Add, "XK_KP_Add", "keypad +" }, + { KEY_KP_Subtract, "XK_KP_Subtract", "keypad -" }, + { KEY_KP_Multiply, "XK_KP_Multiply", "keypad mltply" }, + { KEY_KP_Divide, "XK_KP_Divide", "keypad /" }, + { KEY_KP_Separator, "XK_KP_Separator", "keypad ," }, #endif /* modifier keys */ - { XK_Shift_L, "XK_Shift_L", "left shift" }, - { XK_Shift_R, "XK_Shift_R", "right shift" }, - { XK_Control_L, "XK_Control_L", "left control" }, - { XK_Control_R, "XK_Control_R", "right control" }, - { XK_Meta_L, "XK_Meta_L", "left meta" }, - { XK_Meta_R, "XK_Meta_R", "right meta" }, - { XK_Alt_L, "XK_Alt_L", "left alt" }, - { XK_Alt_R, "XK_Alt_R", "right alt" }, - { XK_Mode_switch, "XK_Mode_switch", "mode switch" }, - { XK_Multi_key, "XK_Multi_key", "multi key" }, + { KEY_Shift_L, "XK_Shift_L", "left shift" }, + { KEY_Shift_R, "XK_Shift_R", "right shift" }, + { KEY_Control_L, "XK_Control_L", "left control" }, + { KEY_Control_R, "XK_Control_R", "right control" }, + { KEY_Meta_L, "XK_Meta_L", "left meta" }, + { KEY_Meta_R, "XK_Meta_R", "right meta" }, + { KEY_Alt_L, "XK_Alt_L", "left alt" }, + { KEY_Alt_R, "XK_Alt_R", "right alt" }, + { KEY_Mode_switch, "XK_Mode_switch", "mode switch" }, + { KEY_Multi_key, "XK_Multi_key", "multi key" }, /* some special keys */ - { XK_BackSpace, "XK_BackSpace", "backspace" }, - { XK_Delete, "XK_Delete", "delete" }, - { XK_Insert, "XK_Insert", "insert" }, - { XK_Tab, "XK_Tab", "tab" }, - { XK_Home, "XK_Home", "home" }, - { XK_End, "XK_End", "end" }, - { XK_Page_Up, "XK_Page_Up", "page up" }, - { XK_Page_Down, "XK_Page_Down", "page down" }, + { KEY_BackSpace, "XK_BackSpace", "backspace" }, + { KEY_Delete, "XK_Delete", "delete" }, + { KEY_Insert, "XK_Insert", "insert" }, + { KEY_Tab, "XK_Tab", "tab" }, + { KEY_Home, "XK_Home", "home" }, + { KEY_End, "XK_End", "end" }, + { KEY_Page_Up, "XK_Page_Up", "page up" }, + { KEY_Page_Down, "XK_Page_Down", "page down" }, /* 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_comma, "XK_comma", "," }, - { XK_minus, "XK_minus", "-" }, - { XK_period, "XK_period", "." }, - { XK_slash, "XK_slash", "/" }, - { 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", "@" }, + { KEY_space, "XK_space", "space" }, + { KEY_exclam, "XK_exclam", "!" }, + { KEY_quotedbl, "XK_quotedbl", "\"" }, + { KEY_numbersign, "XK_numbersign", "#" }, + { KEY_dollar, "XK_dollar", "$" }, + { KEY_percent, "XK_percent", "%" }, + { KEY_ampersand, "XK_ampersand", "&" }, + { KEY_apostrophe, "XK_apostrophe", "'" }, + { KEY_parenleft, "XK_parenleft", "(" }, + { KEY_parenright, "XK_parenright", ")" }, + { KEY_asterisk, "XK_asterisk", "*" }, + { KEY_plus, "XK_plus", "+" }, + { KEY_comma, "XK_comma", "," }, + { KEY_minus, "XK_minus", "-" }, + { KEY_period, "XK_period", "." }, + { KEY_slash, "XK_slash", "/" }, + { KEY_colon, "XK_colon", ":" }, + { KEY_semicolon, "XK_semicolon", ";" }, + { KEY_less, "XK_less", "<" }, + { KEY_equal, "XK_equal", "=" }, + { KEY_greater, "XK_greater", ">" }, + { KEY_question, "XK_question", "?" }, + { KEY_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_asciitilde, "XK_asciitilde", "ascii tilde" }, + { KEY_bracketleft, "XK_bracketleft", "[" }, + { KEY_backslash, "XK_backslash", "backslash" }, + { KEY_bracketright, "XK_bracketright", "]" }, + { KEY_asciicircum, "XK_asciicircum", "circumflex" }, + { KEY_underscore, "XK_underscore", "_" }, + { KEY_grave, "XK_grave", "grave" }, + { KEY_quoteleft, "XK_quoteleft", "quote left" }, + { KEY_braceleft, "XK_braceleft", "brace left" }, + { KEY_bar, "XK_bar", "bar" }, + { KEY_braceright, "XK_braceright", "brace right" }, + { KEY_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" }, + { KEY_Adiaeresis, "XK_Adiaeresis", "Ä" }, + { KEY_Odiaeresis, "XK_Odiaeresis", "Ö" }, + { KEY_Udiaeresis, "XK_Udiaeresis", "Ü" }, + { KEY_adiaeresis, "XK_adiaeresis", "ä" }, + { KEY_odiaeresis, "XK_odiaeresis", "ö" }, + { KEY_udiaeresis, "XK_udiaeresis", "ü" }, + { KEY_ssharp, "XK_ssharp", "sharp s" }, /* end-of-array identifier */ { 0, NULL, NULL } @@ -665,22 +789,22 @@ void translate_keyname(KeySym *keysym, char **x11name, char **name, int mode) int i; - if (mode == TRANSLATE_KEYSYM_TO_KEYNAME) + if (mode == TRANSLATE_KEY_TO_KEYNAME) { static char name_buffer[30]; - KeySym key = *keysym; - - if (key >= XK_A && key <= XK_Z) - sprintf(name_buffer, "%c", 'A' + (char)(key - XK_A)); - else if (key >= XK_a && key <= XK_z) - sprintf(name_buffer, "%c", 'a' + (char)(key - XK_a)); - else if (key >= XK_0 && key <= XK_9) - sprintf(name_buffer, "%c", '0' + (char)(key - XK_0)); - else if (key >= XK_KP_0 && key <= XK_KP_9) - sprintf(name_buffer, "keypad %c", '0' + (char)(key - XK_KP_0)); - else if (key >= XK_F1 && key <= XK_F24) - sprintf(name_buffer, "function F%d", (int)(key - XK_F1 + 1)); - else if (key == KEY_UNDEFINDED) + Key key = *keysym; + + if (key >= KEY_A && key <= KEY_Z) + sprintf(name_buffer, "%c", 'A' + (char)(key - KEY_A)); + else if (key >= KEY_a && key <= KEY_z) + sprintf(name_buffer, "%c", 'a' + (char)(key - KEY_a)); + else if (key >= KEY_0 && key <= KEY_9) + sprintf(name_buffer, "%c", '0' + (char)(key - KEY_0)); + else if (key >= KEY_KP_0 && key <= KEY_KP_9) + sprintf(name_buffer, "keypad %c", '0' + (char)(key - KEY_KP_0)); + else if (key >= KEY_F1 && key <= KEY_F24) + sprintf(name_buffer, "function F%d", (int)(key - KEY_F1 + 1)); + else if (key == KEY_UNDEFINED) strcpy(name_buffer, "(undefined)"); else { @@ -688,7 +812,7 @@ void translate_keyname(KeySym *keysym, char **x11name, char **name, int mode) do { - if (key == translate_key[i].keysym) + if (key == translate_key[i].key) { strcpy(name_buffer, translate_key[i].name); break; @@ -702,22 +826,22 @@ void translate_keyname(KeySym *keysym, char **x11name, char **name, int mode) *name = name_buffer; } - else if (mode == TRANSLATE_KEYSYM_TO_X11KEYNAME) + else if (mode == TRANSLATE_KEY_TO_X11KEYNAME) { static char name_buffer[30]; - KeySym key = *keysym; - - if (key >= XK_A && key <= XK_Z) - sprintf(name_buffer, "XK_%c", 'A' + (char)(key - XK_A)); - else if (key >= XK_a && key <= XK_z) - sprintf(name_buffer, "XK_%c", 'a' + (char)(key - XK_a)); - else if (key >= XK_0 && key <= XK_9) - sprintf(name_buffer, "XK_%c", '0' + (char)(key - XK_0)); - else if (key >= XK_KP_0 && key <= XK_KP_9) - sprintf(name_buffer, "XK_KP_%c", '0' + (char)(key - XK_KP_0)); - else if (key >= XK_F1 && key <= XK_F24) - sprintf(name_buffer, "XK_F%d", (int)(key - XK_F1 + 1)); - else if (key == KEY_UNDEFINDED) + Key key = *keysym; + + if (key >= KEY_A && key <= KEY_Z) + sprintf(name_buffer, "XK_%c", 'A' + (char)(key - KEY_A)); + else if (key >= KEY_a && key <= KEY_z) + sprintf(name_buffer, "XK_%c", 'a' + (char)(key - KEY_a)); + else if (key >= KEY_0 && key <= KEY_9) + sprintf(name_buffer, "XK_%c", '0' + (char)(key - KEY_0)); + else if (key >= KEY_KP_0 && key <= KEY_KP_9) + sprintf(name_buffer, "XK_KP_%c", '0' + (char)(key - KEY_KP_0)); + else if (key >= KEY_F1 && key <= KEY_F24) + sprintf(name_buffer, "XK_F%d", (int)(key - KEY_F1 + 1)); + else if (key == KEY_UNDEFINED) strcpy(name_buffer, "[undefined]"); else { @@ -725,7 +849,7 @@ void translate_keyname(KeySym *keysym, char **x11name, char **name, int mode) do { - if (key == translate_key[i].keysym) + if (key == translate_key[i].key) { strcpy(name_buffer, translate_key[i].x11name); break; @@ -739,9 +863,9 @@ void translate_keyname(KeySym *keysym, char **x11name, char **name, int mode) *x11name = name_buffer; } - else if (mode == TRANSLATE_X11KEYNAME_TO_KEYSYM) + else if (mode == TRANSLATE_X11KEYNAME_TO_KEY) { - KeySym key = XK_VoidSymbol; + Key key = KEY_UNDEFINED; char *name_ptr = *x11name; if (strncmp(name_ptr, "XK_", 3) == 0 && strlen(name_ptr) == 4) @@ -749,18 +873,18 @@ void translate_keyname(KeySym *keysym, char **x11name, char **name, int mode) char c = name_ptr[3]; if (c >= 'A' && c <= 'Z') - key = XK_A + (KeySym)(c - 'A'); + key = KEY_A + (Key)(c - 'A'); else if (c >= 'a' && c <= 'z') - key = XK_a + (KeySym)(c - 'a'); + key = KEY_a + (Key)(c - 'a'); else if (c >= '0' && c <= '9') - key = XK_0 + (KeySym)(c - '0'); + key = KEY_0 + (Key)(c - '0'); } else if (strncmp(name_ptr, "XK_KP_", 6) == 0 && strlen(name_ptr) == 7) { char c = name_ptr[6]; if (c >= '0' && c <= '9') - key = XK_0 + (KeySym)(c - '0'); + key = KEY_0 + (Key)(c - '0'); } else if (strncmp(name_ptr, "XK_F", 4) == 0 && strlen(name_ptr) <= 6) { @@ -773,7 +897,7 @@ void translate_keyname(KeySym *keysym, char **x11name, char **name, int mode) d = atoi(&name_ptr[4]); if (d >=1 && d <= 24) - key = XK_F1 + (KeySym)(d - 1); + key = KEY_F1 + (Key)(d - 1); } else if (strncmp(name_ptr, "XK_", 3) == 0) { @@ -783,7 +907,7 @@ void translate_keyname(KeySym *keysym, char **x11name, char **name, int mode) { if (strcmp(name_ptr, translate_key[i].x11name) == 0) { - key = translate_key[i].keysym; + key = translate_key[i].key; break; } } @@ -817,40 +941,40 @@ void translate_keyname(KeySym *keysym, char **x11name, char **name, int mode) } if (value != -1) - key = (KeySym)value; + key = (Key)value; } *keysym = key; } } -char *getKeyNameFromKeySym(KeySym keysym) +char *getKeyNameFromKey(Key key) { char *name; - translate_keyname(&keysym, NULL, &name, TRANSLATE_KEYSYM_TO_KEYNAME); + translate_keyname(&key, NULL, &name, TRANSLATE_KEY_TO_KEYNAME); return name; } -char *getX11KeyNameFromKeySym(KeySym keysym) +char *getX11KeyNameFromKey(Key key) { char *x11name; - translate_keyname(&keysym, &x11name, NULL, TRANSLATE_KEYSYM_TO_X11KEYNAME); + translate_keyname(&key, &x11name, NULL, TRANSLATE_KEY_TO_X11KEYNAME); return x11name; } -KeySym getKeySymFromX11KeyName(char *x11name) +Key getKeyFromX11KeyName(char *x11name) { - KeySym keysym; + Key key; - translate_keyname(&keysym, &x11name, NULL, TRANSLATE_X11KEYNAME_TO_KEYSYM); - return keysym; + translate_keyname(&key, &x11name, NULL, TRANSLATE_X11KEYNAME_TO_KEY); + return key; } -char getCharFromKeySym(KeySym keysym) +char getCharFromKey(Key key) { - char *keyname = getKeyNameFromKeySym(keysym); + char *keyname = getKeyNameFromKey(key); char letter = 0; if (strlen(keyname) == 1) @@ -947,9 +1071,231 @@ int getJoystickNrFromDeviceName(char *device_name) return joystick_nr; } -/* ----------------------------------------------------------------- */ -/* the following is only for debugging purpose and normally not used */ -/* ----------------------------------------------------------------- */ +/* ------------------------------------------------------------------------- */ +/* some functions to handle lists of level directories */ +/* ------------------------------------------------------------------------- */ + +struct LevelDirInfo *newLevelDirInfo() +{ + return checked_calloc(sizeof(struct LevelDirInfo)); +} + +void pushLevelDirInfo(struct LevelDirInfo **node_first, + struct LevelDirInfo *node_new) +{ + node_new->next = *node_first; + *node_first = node_new; +} + +int numLevelDirInfo(struct LevelDirInfo *node) +{ + int num = 0; + + while (node) + { + num++; + node = node->next; + } + + return num; +} + +boolean validLevelSeries(struct LevelDirInfo *node) +{ + return (node != NULL && !node->node_group && !node->parent_link); +} + +struct LevelDirInfo *getFirstValidLevelSeries(struct LevelDirInfo *node) +{ + if (node == NULL) /* start with first level directory entry */ + return getFirstValidLevelSeries(leveldir_first); + else if (node->node_group) /* enter level group (step down into tree) */ + return getFirstValidLevelSeries(node->node_group); + else if (node->parent_link) /* skip start entry of level group */ + { + if (node->next) /* get first real level series entry */ + return getFirstValidLevelSeries(node->next); + else /* leave empty level group and go on */ + return getFirstValidLevelSeries(node->node_parent->next); + } + else /* this seems to be a regular level series */ + return node; +} + +struct LevelDirInfo *getLevelDirInfoFirstGroupEntry(struct LevelDirInfo *node) +{ + if (node == NULL) + return NULL; + + if (node->node_parent == NULL) /* top level group */ + return leveldir_first; + else /* sub level group */ + return node->node_parent->node_group; +} + +int numLevelDirInfoInGroup(struct LevelDirInfo *node) +{ + return numLevelDirInfo(getLevelDirInfoFirstGroupEntry(node)); +} + +int posLevelDirInfo(struct LevelDirInfo *node) +{ + struct LevelDirInfo *node_cmp = getLevelDirInfoFirstGroupEntry(node); + int pos = 0; + + while (node_cmp) + { + if (node_cmp == node) + return pos; + + pos++; + node_cmp = node_cmp->next; + } + + return 0; +} + +struct LevelDirInfo *getLevelDirInfoFromPos(struct LevelDirInfo *node, int pos) +{ + struct LevelDirInfo *node_default = node; + int pos_cmp = 0; + + while (node) + { + if (pos_cmp == pos) + return node; + + pos_cmp++; + node = node->next; + } + + return node_default; +} + +struct LevelDirInfo *getLevelDirInfoFromFilenameExt(struct LevelDirInfo *node, + char *filename) +{ + if (filename == NULL) + return NULL; + + while (node) + { + if (node->node_group) + { + struct LevelDirInfo *node_group; + + node_group = getLevelDirInfoFromFilenameExt(node->node_group, filename); + + if (node_group) + return node_group; + } + else if (!node->parent_link) + { + if (strcmp(filename, node->filename) == 0) + return node; + } + + node = node->next; + } + + return NULL; +} + +struct LevelDirInfo *getLevelDirInfoFromFilename(char *filename) +{ + return getLevelDirInfoFromFilenameExt(leveldir_first, filename); +} + +void dumpLevelDirInfo(struct LevelDirInfo *node, int depth) +{ + int i; + + while (node) + { + for (i=0; ifilename); + + if (node->node_group != NULL) + dumpLevelDirInfo(node->node_group, depth + 1); + + node = node->next; + } +} + +void sortLevelDirInfo(struct LevelDirInfo **node_first, + int (*compare_function)(const void *, const void *)) +{ + int num_nodes = numLevelDirInfo(*node_first); + struct LevelDirInfo **sort_array; + struct LevelDirInfo *node = *node_first; + int i = 0; + + if (num_nodes == 0) + return; + + /* allocate array for sorting structure pointers */ + sort_array = checked_calloc(num_nodes * sizeof(struct LevelDirInfo *)); + + /* writing structure pointers to sorting array */ + while (i < num_nodes && node) /* double boundary check... */ + { + sort_array[i] = node; + + i++; + node = node->next; + } + + /* sorting the structure pointers in the sorting array */ + qsort(sort_array, num_nodes, sizeof(struct LevelDirInfo *), + compare_function); + + /* update the linkage of list elements with the sorted node array */ + for (i=0; inext = sort_array[i + 1]; + sort_array[num_nodes - 1]->next = NULL; + + /* update the linkage of the main list anchor pointer */ + *node_first = sort_array[0]; + + free(sort_array); + + /* now recursively sort the level group structures */ + node = *node_first; + while (node) + { + if (node->node_group != NULL) + sortLevelDirInfo(&node->node_group, compare_function); + + node = node->next; + } +} + +inline void swap_numbers(int *i1, int *i2) +{ + int help = *i1; + + *i1 = *i2; + *i2 = help; +} + +inline void swap_number_pairs(int *x1, int *y1, int *x2, int *y2) +{ + int help_x = *x1; + int help_y = *y1; + + *x1 = *x2; + *x2 = help_x; + + *y1 = *y2; + *y2 = help_y; +} + + +/* ------------------------------------------------------------------------- */ +/* the following is only for debugging purpose and normally not used */ +/* ------------------------------------------------------------------------- */ #define DEBUG_NUM_TIMESTAMPS 3