#include "image.h"
-/* ------------------------------------------------------------------------- */
+/* ========================================================================= */
/* some generic helper functions */
+/* ========================================================================= */
+
/* ------------------------------------------------------------------------- */
+/* platform independent wrappers for printf() et al. (newline aware) */
+/* ------------------------------------------------------------------------- */
+
+static void vfprintf_newline(FILE *stream, char *format, va_list ap)
+{
+ char *newline = STRING_NEWLINE;
+
+ vfprintf(stream, format, ap);
+
+ fprintf(stream, "%s", newline);
+}
+
+static void vprintf_error_ext(char *format, va_list ap, boolean print_newline)
+{
+ FILE *error_file = openErrorFile(); /* this returns at least 'stderr' */
+
+ if (print_newline)
+ vfprintf_newline(error_file, format, ap);
+ else
+ vfprintf(error_file, format, ap);
+
+ if (error_file != stderr) /* do not close stream 'stderr' */
+ fclose(error_file);
+}
-void fprintf_line(FILE *stream, char *line_string, int line_length)
+static void vprintf_error(char *format, va_list ap)
{
+ vprintf_error_ext(format, ap, FALSE);
+}
+
+static void vprintf_error_newline(char *format, va_list ap)
+{
+ vprintf_error_ext(format, ap, TRUE);
+}
+
+static void printf_error(char *format, ...)
+{
+ if (format)
+ {
+ va_list ap;
+
+ va_start(ap, format);
+ vprintf_error(format, ap);
+ va_end(ap);
+ }
+}
+
+static void printf_error_newline(char *format, ...)
+{
+ if (format)
+ {
+ va_list ap;
+
+ va_start(ap, format);
+ vprintf_error_newline(format, ap);
+ va_end(ap);
+ }
+}
+
+static void fprintf_newline(FILE *stream, char *format, ...)
+{
+ if (format)
+ {
+ va_list ap;
+
+ va_start(ap, format);
+ vfprintf_newline(stream, format, ap);
+ va_end(ap);
+ }
+}
+
+static char *get_line_string(char *line_chars, int line_length)
+{
+ static char *buffer = NULL;
+ int line_chars_length = strlen(line_chars);
int i;
+ if (buffer != NULL)
+ checked_free(buffer);
+
+ buffer = checked_malloc(line_chars_length * line_length + 1);
+
for (i = 0; i < line_length; i++)
- fprintf(stream, "%s", line_string);
+ strcpy(&buffer[i * line_chars_length], line_chars);
- fprintf(stream, "\n");
+ return buffer;
}
-void printf_line(char *line_string, int line_length)
+void fprintf_line(FILE *stream, char *line_chars, int line_length)
{
- fprintf_line(stdout, line_string, line_length);
+ fprintf_newline(stream, get_line_string(line_chars, line_length));
}
+void printf_line(char *line_chars, int line_length)
+{
+ fprintf_line(stdout, line_chars, line_length);
+}
+
+void printf_line_error(char *line_chars, int line_length)
+{
+ printf_error_newline(get_line_string(line_chars, line_length));
+}
+
+void printf_line_with_prefix(char *prefix, char *line_chars, int line_length)
+{
+ fprintf(stdout, "%s", prefix);
+ fprintf_line(stdout, line_chars, line_length);
+}
+
+
+/* ------------------------------------------------------------------------- */
+/* string functions */
+/* ------------------------------------------------------------------------- */
/* int2str() returns a number converted to a string;
the used memory is static, but will be overwritten by later calls,
{
boolean do_busy_waiting = (milliseconds_delay < 5 ? TRUE : FALSE);
-#if 0
-#if defined(PLATFORM_MSDOS)
- /* don't use select() to perform waiting operations under DOS
- environment; always use a busy loop for waiting instead */
- do_busy_waiting = TRUE;
-#endif
-#endif
-
if (do_busy_waiting)
{
/* we want to wait only a few ms -- if we assume that we have a
static char *getLastPathSeparatorPtr(char *filename)
{
- char *last_separator = strrchr(filename, '/');
+ char *last_separator = strrchr(filename, CHAR_PATH_SEPARATOR_UNIX);
-#if !defined(PLATFORM_UNIX)
if (last_separator == NULL) /* also try DOS/Windows variant */
- last_separator = strrchr(filename, '\\');
-#endif
+ last_separator = strrchr(filename, CHAR_PATH_SEPARATOR_DOS);
return last_separator;
}
-static char *getBaseNamePtr(char *filename)
+char *getBaseNamePtr(char *filename)
{
char *last_separator = getLastPathSeparatorPtr(filename);
char *getPath2(char *path1, char *path2)
{
+ char *sep = STRING_PATH_SEPARATOR;
char *complete_path = checked_malloc(strlen(path1) + 1 +
strlen(path2) + 1);
- sprintf(complete_path, "%s/%s", path1, path2);
+ sprintf(complete_path, "%s%s%s", path1, sep, path2);
return complete_path;
}
char *getPath3(char *path1, char *path2, char *path3)
{
+ char *sep = STRING_PATH_SEPARATOR;
char *complete_path = checked_malloc(strlen(path1) + 1 +
strlen(path2) + 1 +
strlen(path3) + 1);
- sprintf(complete_path, "%s/%s/%s", path1, path2, path3);
+ sprintf(complete_path, "%s%s%s%s%s", path1, sep, path2, sep, path3);
return complete_path;
}
*old_value = getStringCopy(new_value);
}
+boolean strEqual(char *s1, char *s2)
+{
+ return (s1 == NULL && s2 == NULL ? TRUE :
+ s1 == NULL && s2 != NULL ? FALSE :
+ s1 != NULL && s2 == NULL ? FALSE :
+ strcmp(s1, s2) == 0);
+}
+
/* ------------------------------------------------------------------------- */
/* command line option handling functions */
char *rw_base_path = RW_BASE_PATH;
char **options_left = &argv[1];
- if (strcmp(ro_base_path, ".") == 0)
+#if !defined(PLATFORM_MACOSX)
+ /* if the program is configured to start from current directory (default),
+ determine program package directory (KDE/Konqueror does not do this by
+ itself and fails otherwise); on Mac OS X, the program binary is stored
+ in an application package directory -- do not try to use this directory
+ as the program data directory (Mac OS X handles this correctly anyway) */
+
+ if (strEqual(ro_base_path, "."))
ro_base_path = program.command_basepath;
- if (strcmp(rw_base_path, ".") == 0)
+ if (strEqual(rw_base_path, "."))
rw_base_path = program.command_basepath;
+#endif
/* initialize global program options */
options.display_name = NULL;
strcpy(option_str, option); /* copy argument into buffer */
option = option_str;
- if (strcmp(option, "--") == 0) /* stop scanning arguments */
+ if (strEqual(option, "--")) /* stop scanning arguments */
break;
if (strncmp(option, "--", 2) == 0) /* treat '--' like '-' */
option_len = strlen(option);
- if (strcmp(option, "-") == 0)
+ if (strEqual(option, "-"))
Error(ERR_EXIT_HELP, "unrecognized option '%s'", option);
else if (strncmp(option, "-help", option_len) == 0)
{
if (option_arg == next_option)
options_left++;
-#if 1
/* when doing batch processing, always enable verbose mode (warnings) */
options.verbose = TRUE;
-#endif
}
else if (*option == '-')
{
return internal_error;
}
+#if 1
+
+void Error(int mode, char *format, ...)
+{
+ static boolean last_line_was_separator = FALSE;
+ char *process_name = "";
+
+ /* display warnings only when running in verbose mode */
+ if (mode & ERR_WARN && !options.verbose)
+ return;
+
+ if (mode == ERR_RETURN_LINE)
+ {
+ if (!last_line_was_separator)
+ printf_line_error(format, 79);
+
+ last_line_was_separator = TRUE;
+
+ return;
+ }
+
+ last_line_was_separator = FALSE;
+
+ if (mode & ERR_SOUND_SERVER)
+ process_name = " sound server";
+ else if (mode & ERR_NETWORK_SERVER)
+ process_name = " network server";
+ else if (mode & ERR_NETWORK_CLIENT)
+ process_name = " network client **";
+
+ if (format)
+ {
+ va_list ap;
+
+ printf_error("%s%s: ", program.command_basename, process_name);
+
+ if (mode & ERR_WARN)
+ printf_error("warning: ");
+
+ va_start(ap, format);
+ vprintf_error_newline(format, ap);
+ va_end(ap);
+ }
+
+ if (mode & ERR_HELP)
+ printf_error_newline("%s: Try option '--help' for more information.",
+ program.command_basename);
+
+ if (mode & ERR_EXIT)
+ printf_error_newline("%s%s: aborting",
+ program.command_basename, process_name);
+
+ if (mode & ERR_EXIT)
+ {
+ if (mode & ERR_FROM_SERVER)
+ exit(1); /* child process: normal exit */
+ else
+ program.exit_function(1); /* main process: clean up stuff */
+ }
+}
+
+#else
+
void Error(int mode, char *format, ...)
{
static boolean last_line_was_separator = FALSE;
last_line_was_separator = FALSE;
-#if defined(PLATFORM_MSDOS)
+#if defined(PLATFORM_WIN32) || defined(PLATFORM_MSDOS)
newline = "\r\n";
if ((error = openErrorFile()) == NULL)
{
printf("Cannot write to error output file!%s", newline);
+
program.exit_function(1);
}
#endif
}
}
+#endif
+
/* ------------------------------------------------------------------------- */
/* checked memory allocation and freeing functions */
*y2 = help_y;
}
+/* the "put" variants of the following file access functions check for the file
+ pointer being != NULL and return the number of bytes they have or would have
+ written; this allows for chunk writing functions to first determine the size
+ of the (not yet written) chunk, write the correct chunk size and finally
+ write the chunk itself */
+
+int getFile8BitInteger(FILE *file)
+{
+ return fgetc(file);
+}
+
+int putFile8BitInteger(FILE *file, int value)
+{
+ if (file != NULL)
+ fputc(value, file);
+
+ return 1;
+}
+
int getFile16BitInteger(FILE *file, int byte_order)
{
if (byte_order == BYTE_ORDER_BIG_ENDIAN)
(fgetc(file) << 8));
}
-void putFile16BitInteger(FILE *file, int value, int byte_order)
+int putFile16BitInteger(FILE *file, int 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 */
+ if (file != NULL)
{
- fputc((value >> 0) & 0xff, file);
- fputc((value >> 8) & 0xff, file);
+ 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);
+ }
}
+
+ return 2;
}
int getFile32BitInteger(FILE *file, int byte_order)
(fgetc(file) << 24));
}
-void putFile32BitInteger(FILE *file, int value, int byte_order)
+int putFile32BitInteger(FILE *file, int value, int byte_order)
{
- if (byte_order == BYTE_ORDER_BIG_ENDIAN)
+ if (file != NULL)
{
- 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);
+ 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);
+ }
}
+
+ return 4;
}
boolean getFileChunk(FILE *file, char *chunk_name, int *chunk_size,
return (feof(file) || ferror(file) ? FALSE : TRUE);
}
-void putFileChunk(FILE *file, char *chunk_name, int chunk_size,
- int byte_order)
+int putFileChunk(FILE *file, char *chunk_name, int chunk_size,
+ int byte_order)
{
+ int num_bytes = 0;
+
/* write chunk name */
- fputs(chunk_name, file);
+ if (file != NULL)
+ fputs(chunk_name, file);
+
+ num_bytes += strlen(chunk_name);
if (chunk_size >= 0)
{
/* write chunk size */
- putFile32BitInteger(file, chunk_size, byte_order);
+ if (file != NULL)
+ putFile32BitInteger(file, chunk_size, byte_order);
+
+ num_bytes += 4;
}
+
+ return num_bytes;
}
int getFileVersion(FILE *file)
version_build);
}
-void putFileVersion(FILE *file, int version)
+int putFileVersion(FILE *file, int version)
{
- int version_major = VERSION_MAJOR(version);
- int version_minor = VERSION_MINOR(version);
- int version_patch = VERSION_PATCH(version);
- int version_build = VERSION_BUILD(version);
+ if (file != NULL)
+ {
+ int version_major = VERSION_MAJOR(version);
+ int version_minor = VERSION_MINOR(version);
+ int version_patch = VERSION_PATCH(version);
+ int version_build = VERSION_BUILD(version);
- fputc(version_major, file);
- fputc(version_minor, file);
- fputc(version_patch, file);
- fputc(version_build, file);
+ fputc(version_major, file);
+ fputc(version_minor, file);
+ fputc(version_patch, file);
+ fputc(version_build, file);
+ }
+
+ return 4;
+}
+
+void ReadBytesFromFile(FILE *file, byte *buffer, unsigned long bytes)
+{
+ int i;
+
+ for(i = 0; i < bytes && !feof(file); i++)
+ buffer[i] = fgetc(file);
+}
+
+void WriteBytesToFile(FILE *file, byte *buffer, unsigned long bytes)
+{
+ int i;
+
+ for(i = 0; i < bytes; i++)
+ fputc(buffer[i], file);
}
void ReadUnusedBytesFromFile(FILE *file, unsigned long bytes)
/* 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", "Ä" },
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
i = 0;
do
{
- if (strcmp(translate_key[i].name, *name) == 0)
+ if (strEqual(translate_key[i].name, *name))
{
key = translate_key[i].key;
break;
do
{
- if (strcmp(name_ptr, translate_key[i].x11name) == 0)
+ if (strEqual(name_ptr, translate_key[i].x11name))
{
key = translate_key[i].key;
break;
if (strlen(keyname) == 1)
letter = keyname[0];
- else if (strcmp(keyname, "space") == 0)
+ else if (strEqual(keyname, "space"))
letter = ' ';
- else if (strcmp(keyname, "circumflex") == 0)
+ else if (strEqual(keyname, "circumflex"))
letter = '^';
return letter;
for (i = 0; number_text[i][0] != NULL; i++)
for (j = 0; j < 3; j++)
- if (strcmp(s_lower, number_text[i][j]) == 0)
+ if (strEqual(s_lower, number_text[i][j]))
result = i;
if (result == -1)
{
- if (strcmp(s_lower, "false") == 0)
+ if (strEqual(s_lower, "false"))
result = 0;
- else if (strcmp(s_lower, "true") == 0)
+ else if (strEqual(s_lower, "true"))
result = 1;
else
result = atoi(s);
char *s_lower = getStringToLower(s);
boolean result = FALSE;
- if (strcmp(s_lower, "true") == 0 ||
- strcmp(s_lower, "yes") == 0 ||
- strcmp(s_lower, "on") == 0 ||
+ if (strEqual(s_lower, "true") ||
+ strEqual(s_lower, "yes") ||
+ strEqual(s_lower, "on") ||
get_integer_from_string(s) == 1)
result = TRUE;
{
ListNode *node_new = newListNode();
-#if 0
- printf("LIST: adding node with key '%s'\n", key);
-#endif
-
node_new->key = getStringCopy(key);
node_new->content = content;
node_new->next = *node_first;
if (node_first == NULL || *node_first == NULL)
return;
-#if 0
- printf("[CHECKING LIST KEY '%s' == '%s']\n",
- (*node_first)->key, key);
-#endif
-
- if (strcmp((*node_first)->key, key) == 0)
+ if (strEqual((*node_first)->key, key))
{
-#if 0
- printf("[DELETING LIST ENTRY]\n");
-#endif
-
free((*node_first)->key);
if (destructor_function)
destructor_function((*node_first)->content);
if (node_first == NULL)
return NULL;
- if (strcmp(node_first->key, key) == 0)
+ if (strEqual(node_first->key, key))
return node_first;
else
return getNodeFromKey(node_first->next, key);
if (filename == NULL)
return FALSE;
-#if 0
- printf("checking file '%s'\n", filename);
-#endif
-
return (access(filename, F_OK) == 0);
}
if (basename_length > suffix_length + 1 &&
basename_lower[basename_length - suffix_length - 1] == '.' &&
- strcmp(&basename_lower[basename_length - suffix_length], suffix) == 0)
+ strEqual(&basename_lower[basename_length - suffix_length], suffix))
return TRUE;
return FALSE;
return string_has_parameter(substring, s_contained);
}
-int get_parameter_value(char *suffix, char *value_raw, int type)
+int get_parameter_value(char *value_raw, char *suffix, int type)
{
char *value = getStringToLower(value_raw);
int result = 0; /* probably a save default value */
- if (strcmp(suffix, ".direction") == 0)
- {
- result = (strcmp(value, "left") == 0 ? MV_LEFT :
- strcmp(value, "right") == 0 ? MV_RIGHT :
- strcmp(value, "up") == 0 ? MV_UP :
- strcmp(value, "down") == 0 ? MV_DOWN : MV_NO_MOVING);
- }
- else if (strcmp(suffix, ".anim_mode") == 0)
- {
- result = (string_has_parameter(value, "none") ? ANIM_NONE :
- string_has_parameter(value, "loop") ? ANIM_LOOP :
- string_has_parameter(value, "linear") ? ANIM_LINEAR :
- string_has_parameter(value, "pingpong") ? ANIM_PINGPONG :
- string_has_parameter(value, "pingpong2") ? ANIM_PINGPONG2 :
- string_has_parameter(value, "random") ? ANIM_RANDOM :
- string_has_parameter(value, "horizontal") ? ANIM_HORIZONTAL :
- string_has_parameter(value, "vertical") ? ANIM_VERTICAL :
+ if (strEqual(suffix, ".direction"))
+ {
+ result = (strEqual(value, "left") ? MV_LEFT :
+ strEqual(value, "right") ? MV_RIGHT :
+ strEqual(value, "up") ? MV_UP :
+ strEqual(value, "down") ? MV_DOWN : MV_NONE);
+ }
+ else if (strEqual(suffix, ".anim_mode"))
+ {
+ result = (string_has_parameter(value, "none") ? ANIM_NONE :
+ string_has_parameter(value, "loop") ? ANIM_LOOP :
+ string_has_parameter(value, "linear") ? ANIM_LINEAR :
+ string_has_parameter(value, "pingpong") ? ANIM_PINGPONG :
+ string_has_parameter(value, "pingpong2") ? ANIM_PINGPONG2 :
+ string_has_parameter(value, "random") ? ANIM_RANDOM :
+ string_has_parameter(value, "ce_value") ? ANIM_CE_VALUE :
+ string_has_parameter(value, "ce_score") ? ANIM_CE_SCORE :
+ string_has_parameter(value, "ce_delay") ? ANIM_CE_DELAY :
+ string_has_parameter(value, "horizontal") ? ANIM_HORIZONTAL :
+ string_has_parameter(value, "vertical") ? ANIM_VERTICAL :
ANIM_DEFAULT);
if (string_has_parameter(value, "reverse"))
result |= ANIM_REVERSE;
+
+ if (string_has_parameter(value, "opaque_player"))
+ result |= ANIM_OPAQUE_PLAYER;
+
+ if (string_has_parameter(value, "static_panel"))
+ result |= ANIM_STATIC_PANEL;
}
else /* generic parameter of type integer or boolean */
{
- result = (strcmp(value, ARG_UNDEFINED) == 0 ? ARG_UNDEFINED_VALUE :
+ result = (strEqual(value, ARG_UNDEFINED) ? ARG_UNDEFINED_VALUE :
type == TYPE_INTEGER ? get_integer_from_string(value) :
type == TYPE_BOOLEAN ? get_boolean_from_string(value) :
ARG_UNDEFINED_VALUE);
if (suffix == NULL)
suffix = token;
- return get_parameter_value(suffix, value_raw, TYPE_INTEGER);
+ return get_parameter_value(value_raw, suffix, TYPE_INTEGER);
}
static void FreeCustomArtworkList(struct ArtworkListInfo *,
int len_suffix = strlen(suffix_list[j].token);
if (len_suffix < len_config_token &&
- strcmp(&config_list[i].token[len_config_token - len_suffix],
- suffix_list[j].token) == 0)
+ strEqual(&config_list[i].token[len_config_token - len_suffix],
+ suffix_list[j].token))
{
setString(&file_list[list_pos].default_parameter[j],
config_list[i].value);
/* the following tokens are no file definitions, but other config tokens */
for (j = 0; ignore_tokens[j] != NULL; j++)
- if (strcmp(config_list[i].token, ignore_tokens[j]) == 0)
+ if (strEqual(config_list[i].token, ignore_tokens[j]))
is_file_entry = FALSE;
if (is_file_entry)
break;
/* simple sanity check if this is really a file definition */
- if (strcmp(&config_list[i].value[len_config_value - 4], ".pcx") != 0 &&
- strcmp(&config_list[i].value[len_config_value - 4], ".wav") != 0 &&
- strcmp(config_list[i].value, UNDEFINED_FILENAME) != 0)
+ if (!strEqual(&config_list[i].value[len_config_value - 4], ".pcx") &&
+ !strEqual(&config_list[i].value[len_config_value - 4], ".wav") &&
+ !strEqual(config_list[i].value, UNDEFINED_FILENAME))
{
Error(ERR_RETURN, "Configuration directive '%s' -> '%s':",
config_list[i].token, config_list[i].value);
int len_token = strlen(token);
int len_suffix = strlen(suffix);
-#if 0
- if (IS_PARENT_PROCESS())
- printf(":::::::::: check '%s' for '%s' ::::::::::\n", token, suffix);
-#endif
-
if (start_pos < 0) /* compare suffix from end of string */
start_pos += len_token;
/* mark config file token as well known from default config */
setHashEntry(setup_file_hash, file_list_entry->token, known_token_value);
}
-#if 0
- else
- {
- if (strcmp(file_list_entry->filename,
- file_list_entry->default_filename) != 0)
- printf("___ resetting '%s' to default\n", file_list_entry->token);
-
- setString(&file_list_entry->filename, file_list_entry->default_filename);
- }
-#endif
/* check for config tokens that can be build by base token and suffixes */
for (i = 0; suffix_list[i].token != NULL; i++)
struct FileInfo *new_list_entry;
int parameter_array_size = num_suffix_list_entries * sizeof(char *);
-#if 0
- if (IS_PARENT_PROCESS())
- printf("===> found dynamic definition '%s'\n", token);
-#endif
-
(*num_list_entries)++;
*list = checked_realloc(*list, *num_list_entries * sizeof(struct FileInfo));
new_list_entry = &(*list)[*num_list_entries - 1];
return;
#if 0
- printf("::: LoadArtworkConfigFromFilename: '%s'\n", filename);
+ printf("LoadArtworkConfigFromFilename '%s' ...\n", filename);
#endif
if ((setup_file_hash = loadSetupFileHash(filename)) == NULL)
/* at this point, we do not need the setup file hash anymore -- free it */
freeSetupFileHash(setup_file_hash);
-#if 1
/* map deprecated to current tokens (using prefix match and replace) */
BEGIN_HASH_ITERATION(valid_file_hash, itr)
{
}
}
END_HASH_ITERATION(valid_file_hash, itr)
-#endif
/* read parameters for all known config file tokens */
for (i = 0; i < num_file_list_entries; i++)
{
char *value = HASH_ITERATION_VALUE(itr);
- if (strcmp(value, known_token_value) != 0)
+ if (!strEqual(value, known_token_value))
setHashEntry(extra_file_hash, HASH_ITERATION_TOKEN(itr), value);
}
END_HASH_ITERATION(valid_file_hash, itr)
parameter_suffix_found = TRUE;
}
-#if 0
- if (IS_PARENT_PROCESS())
- {
- if (parameter_suffix_found)
- printf("---> skipping token '%s' (parameter token)\n", token);
- else
- printf("---> examining token '%s': search prefix ...\n", token);
- }
-#endif
-
if (parameter_suffix_found)
continue;
BEGIN_HASH_ITERATION(extra_file_hash, itr)
{
- if (strcmp(HASH_ITERATION_VALUE(itr), known_token_value) == 0)
+ if (strEqual(HASH_ITERATION_VALUE(itr), known_token_value))
dynamic_tokens_found = TRUE;
else
unknown_tokens_found = TRUE;
{
char *value = getHashEntry(extra_file_hash, list->token);
- if (value != NULL && strcmp(value, known_token_value) == 0)
+ if (value != NULL && strEqual(value, known_token_value))
Error(ERR_RETURN, "- dynamic token: '%s'", list->token);
}
{
char *value = getHashEntry(extra_file_hash, list->token);
- if (value != NULL && strcmp(value, known_token_value) != 0)
+ if (value != NULL && !strEqual(value, known_token_value))
Error(ERR_RETURN, "- dynamic token: '%s'", list->token);
}
char *filename_base = UNDEFINED_FILENAME, *filename_local;
int i, j;
-#if 0
- printf("GOT CUSTOM ARTWORK CONFIG FILE '%s'\n", filename);
-#endif
-
DrawInitText("Loading artwork config:", 120, FC_GREEN);
DrawInitText(ARTWORKINFO_FILENAME(artwork_info->type), 150, FC_YELLOW);
filename_local = getCustomArtworkConfigFilename(artwork_info->type);
- if (filename_local != NULL && strcmp(filename_base, filename_local) != 0)
+ if (filename_local != NULL && !strEqual(filename_base, filename_local))
LoadArtworkConfigFromFilename(artwork_info, filename_local);
}
{
char *filename = (*listnode)->source_filename;
-#if 0
- printf("[decrementing reference counter of artwork '%s']\n", filename);
-#endif
-
if (--(*listnode)->num_references <= 0)
- {
-#if 0
- printf("[deleting artwork '%s']\n", filename);
-#endif
-
deleteNodeFromList(&artwork_info->content_list, filename,
artwork_info->free_artwork);
- }
*listnode = NULL;
}
}
-#if 1
static void replaceArtworkListEntry(struct ArtworkListInfo *artwork_info,
struct ListNodeInfo **listnode,
struct FileInfo *file_list_entry)
char *basename = file_list_entry->filename;
char *filename = getCustomArtworkFilename(basename, artwork_info->type);
-#if 0
- if (strcmp(file_list_entry->token, "background.DOOR") == 0)
- printf("::: replaceArtworkListEntry: '%s' => '%s'\n",
- basename, filename);
-#endif
-
if (filename == NULL)
{
Error(ERR_WARN, "cannot find artwork file '%s'", basename);
basename = file_list_entry->default_filename;
/* dynamic artwork has no default filename / skip empty default artwork */
- if (basename == NULL || strcmp(basename, UNDEFINED_FILENAME) == 0)
+ if (basename == NULL || strEqual(basename, UNDEFINED_FILENAME))
return;
file_list_entry->fallback_to_default = TRUE;
}
/* check if the old and the new artwork file are the same */
- if (*listnode && strcmp((*listnode)->source_filename, filename) == 0)
+ if (*listnode && strEqual((*listnode)->source_filename, filename))
{
/* The old and new artwork are the same (have the same filename and path).
This usually means that this artwork does not exist in this artwork set
return;
}
-#if 0
- if (strcmp(file_list_entry->token, "background.DOOR") == 0)
- printf("::: replaceArtworkListEntry: LOAD IT'\n");
-#endif
-
-#if 0
- printf("::: %s: '%s'\n", init_text[artwork_info->type], basename);
-#endif
-
DrawInitText(init_text[artwork_info->type], 120, FC_GREEN);
DrawInitText(basename, 150, FC_YELLOW);
{
int error_mode = ERR_WARN;
-#if 1
/* we can get away without sounds and music, but not without graphics */
if (artwork_info->type == ARTWORK_TYPE_GRAPHICS)
error_mode = ERR_EXIT;
-#endif
Error(error_mode, "cannot load artwork file '%s'", basename);
return;
}
}
-#else
-
-static void replaceArtworkListEntry(struct ArtworkListInfo *artwork_info,
- struct ListNodeInfo **listnode,
- char *basename)
-{
- char *init_text[] =
- {
- "Loading graphics:",
- "Loading sounds:",
- "Loading music:"
- };
-
- ListNode *node;
- char *filename = getCustomArtworkFilename(basename, artwork_info->type);
-
- if (filename == NULL)
- {
- int error_mode = ERR_WARN;
-
-#if 1
- /* !!! NEW ARTWORK FALLBACK CODE !!! NEARLY UNTESTED !!! */
- /* before failing, try fallback to default artwork */
-#else
- /* we can get away without sounds and music, but not without graphics */
- if (*listnode == NULL && artwork_info->type == ARTWORK_TYPE_GRAPHICS)
- error_mode = ERR_EXIT;
-#endif
-
- Error(error_mode, "cannot find artwork file '%s'", basename);
- return;
- }
-
- /* check if the old and the new artwork file are the same */
- if (*listnode && strcmp((*listnode)->source_filename, filename) == 0)
- {
- /* The old and new artwork are the same (have the same filename and path).
- This usually means that this artwork does not exist in this artwork set
- and a fallback to the existing artwork is done. */
-
-#if 0
- printf("[artwork '%s' already exists (same list entry)]\n", filename);
-#endif
-
- return;
- }
-
- /* delete existing artwork file entry */
- deleteArtworkListEntry(artwork_info, listnode);
-
- /* check if the new artwork file already exists in the list of artworks */
- if ((node = getNodeFromKey(artwork_info->content_list, filename)) != NULL)
- {
-#if 0
- printf("[artwork '%s' already exists (other list entry)]\n", filename);
-#endif
-
- *listnode = (struct ListNodeInfo *)node->content;
- (*listnode)->num_references++;
-
- return;
- }
-
-#if 0
- printf("::: %s: '%s'\n", init_text[artwork_info->type], basename);
-#endif
-
- DrawInitText(init_text[artwork_info->type], 120, FC_GREEN);
- DrawInitText(basename, 150, FC_YELLOW);
-
- if ((*listnode = artwork_info->load_artwork(filename)) != NULL)
- {
-#if 0
- printf("[adding new artwork '%s']\n", filename);
-#endif
-
- (*listnode)->num_references = 1;
- addNodeToList(&artwork_info->content_list, (*listnode)->source_filename,
- *listnode);
- }
- else
- {
- int error_mode = ERR_WARN;
-
-#if 1
- /* we can get away without sounds and music, but not without graphics */
- if (artwork_info->type == ARTWORK_TYPE_GRAPHICS)
- error_mode = ERR_EXIT;
-#endif
-
- Error(error_mode, "cannot load artwork file '%s'", basename);
- return;
- }
-}
-#endif
-
-#if 1
static void LoadCustomArtwork(struct ArtworkListInfo *artwork_info,
struct ListNodeInfo **listnode,
struct FileInfo *file_list_entry)
printf("GOT CUSTOM ARTWORK FILE '%s'\n", filename);
#endif
-#if 0
- if (strcmp(file_list_entry->token, "background.DOOR") == 0)
- printf("::: -> '%s' -> '%s'\n",
- file_list_entry->token, file_list_entry->filename);
-#endif
-
- if (strcmp(file_list_entry->filename, UNDEFINED_FILENAME) == 0)
+ if (strEqual(file_list_entry->filename, UNDEFINED_FILENAME))
{
deleteArtworkListEntry(artwork_info, listnode);
return;
replaceArtworkListEntry(artwork_info, listnode, file_list_entry);
}
-#else
-
-static void LoadCustomArtwork(struct ArtworkListInfo *artwork_info,
- struct ListNodeInfo **listnode,
- char *basename)
-{
-#if 0
- printf("GOT CUSTOM ARTWORK FILE '%s'\n", filename);
-#endif
-
- if (strcmp(basename, UNDEFINED_FILENAME) == 0)
- {
- deleteArtworkListEntry(artwork_info, listnode);
- return;
- }
-
- replaceArtworkListEntry(artwork_info, listnode, basename);
-}
-#endif
-
-#if 1
-static void LoadArtworkToList(struct ArtworkListInfo *artwork_info,
- struct ListNodeInfo **listnode,
- struct FileInfo *file_list_entry)
-{
-#if 0
- if (artwork_info->artwork_list == NULL ||
- list_pos >= artwork_info->num_file_list_entries)
- return;
-#endif
-
-#if 0
- printf("loading artwork '%s' ... [%d]\n",
- file_list_entry->filename, getNumNodes(artwork_info->content_list));
-#endif
-
-#if 1
- LoadCustomArtwork(artwork_info, listnode, file_list_entry);
-#else
- LoadCustomArtwork(artwork_info, &artwork_info->artwork_list[list_pos],
- basename);
-#endif
-
-#if 0
- printf("loading artwork '%s' done [%d]\n",
- basename, getNumNodes(artwork_info->content_list));
-#endif
-}
-
-#else
-
-static void LoadArtworkToList(struct ArtworkListInfo *artwork_info,
- struct ListNodeInfo **listnode,
- char *basename, int list_pos)
-{
-#if 0
- if (artwork_info->artwork_list == NULL ||
- list_pos >= artwork_info->num_file_list_entries)
- return;
-#endif
-
-#if 0
- printf("loading artwork '%s' ... [%d]\n",
- basename, getNumNodes(artwork_info->content_list));
-#endif
-
-#if 1
- LoadCustomArtwork(artwork_info, listnode, basename);
-#else
- LoadCustomArtwork(artwork_info, &artwork_info->artwork_list[list_pos],
- basename);
-#endif
-
-#if 0
- printf("loading artwork '%s' done [%d]\n",
- basename, getNumNodes(artwork_info->content_list));
-#endif
-}
-#endif
-
void ReloadCustomArtworkList(struct ArtworkListInfo *artwork_info)
{
struct FileInfo *file_list = artwork_info->file_list;
artwork_info->num_dynamic_file_list_entries;
int i;
-#if 0
- printf("DEBUG: reloading %d static artwork files ...\n",
- num_file_list_entries);
-#endif
-
for (i = 0; i < num_file_list_entries; i++)
- {
-#if 0
- if (strcmp(file_list[i].token, "background.DOOR") == 0)
- printf("::: '%s' -> '%s'\n", file_list[i].token, file_list[i].filename);
-#endif
-
-#if 1
- LoadArtworkToList(artwork_info, &artwork_info->artwork_list[i],
+ LoadCustomArtwork(artwork_info, &artwork_info->artwork_list[i],
&file_list[i]);
-#else
- LoadArtworkToList(artwork_info, &artwork_info->artwork_list[i],
- file_list[i].filename, i);
-#endif
-
-#if 0
- if (strcmp(file_list[i].token, "background.DOOR") == 0)
- {
- Bitmap *bitmap = getBitmapFromImageID(i);
-
- printf("::: BITMAP: %08lx\n", bitmap);
-
-#if 0
- BlitBitmap(bitmap, window, 0, 0, 100, 280, 0, 0);
-#endif
- }
-#endif
-
-#if 0
- /* !!! NEW ARTWORK FALLBACK CODE !!! NEARLY UNTESTED !!! */
- if (artwork_info->artwork_list[i] == NULL &&
- strcmp(file_list[i].filename, UNDEFINED_FILENAME) != 0 &&
- strcmp(file_list[i].default_filename, file_list[i].filename) != 0 &&
- strcmp(file_list[i].default_filename, UNDEFINED_FILENAME) != 0)
- {
- Error(ERR_WARN, "trying default artwork file '%s'",
- file_list[i].default_filename);
-
- LoadArtworkToList(artwork_info, &artwork_info->artwork_list[i],
- file_list[i].default_filename, i);
-
- /* even the fallback to default artwork was not successful -- fail now */
- if (artwork_info->artwork_list[i] == NULL &&
- artwork_info->type == ARTWORK_TYPE_GRAPHICS)
- Error(ERR_EXIT, "cannot find artwork file '%s' or default file '%s'",
- file_list[i].filename, file_list[i].default_filename);
-
- file_list[i].fallback_to_default = TRUE;
- }
-#endif
- }
-
-#if 0
- printf("DEBUG: reloading %d dynamic artwork files ...\n",
- num_dynamic_file_list_entries);
-#endif
for (i = 0; i < num_dynamic_file_list_entries; i++)
- {
-#if 1
- LoadArtworkToList(artwork_info, &artwork_info->dynamic_artwork_list[i],
+ LoadCustomArtwork(artwork_info, &artwork_info->dynamic_artwork_list[i],
&dynamic_file_list[i]);
-#else
- LoadArtworkToList(artwork_info, &artwork_info->dynamic_artwork_list[i],
- dynamic_file_list[i].filename, i);
-#endif
-
-#if 0
- printf("::: '%s', '0x%08x'\n",
- dynamic_file_list[i].filename,
- dynamic_file_list[i].default_filename);
-#endif
-
- /* dynamic artwork does not have default filename! */
- }
#if 0
dumpList(artwork_info->content_list);
if (artwork_info == NULL)
return;
-#if 0
- printf("%s: FREEING ARTWORK ...\n",
- IS_CHILD_PROCESS() ? "CHILD" : "PARENT");
-#endif
-
FreeCustomArtworkList(artwork_info, &artwork_info->artwork_list,
&artwork_info->num_file_list_entries);
FreeCustomArtworkList(artwork_info, &artwork_info->dynamic_artwork_list,
&artwork_info->num_dynamic_file_list_entries);
-
-#if 0
- printf("%s: FREEING ARTWORK -- DONE\n",
- IS_CHILD_PROCESS() ? "CHILD" : "PARENT");
-#endif
}
/* ------------------------------------------------------------------------- */
/* functions only needed for non-Unix (non-command-line) systems */
/* (MS-DOS only; SDL/Windows creates files "stdout.txt" and "stderr.txt") */
+/* (now also added for Windows, to create files in user data directory) */
/* ------------------------------------------------------------------------- */
-#if defined(PLATFORM_MSDOS)
-
-#define ERROR_FILENAME "stderr.txt"
+char *getErrorFilename(char *basename)
+{
+ return getPath2(getUserDataDir(), basename);
+}
void initErrorFile()
{
- unlink(ERROR_FILENAME);
+ unlink(program.error_filename);
}
FILE *openErrorFile()
{
- return fopen(ERROR_FILENAME, MODE_APPEND);
+ FILE *error_file = stderr;
+
+#if defined(PLATFORM_WIN32) || defined(PLATFORM_MSDOS)
+ if ((error_file = fopen(program.error_filename, MODE_APPEND)) == NULL)
+ fprintf_newline(stderr, "ERROR: cannot open file '%s' for appending!",
+ program.error_filename);
+#endif
+
+ return error_file;
}
void dumpErrorFile()
{
- FILE *error_file = fopen(ERROR_FILENAME, MODE_READ);
+ FILE *error_file = fopen(program.error_filename, MODE_READ);
if (error_file != NULL)
{
fclose(error_file);
}
}
+
+void NotifyUserAboutErrorFile()
+{
+#if defined(PLATFORM_WIN32)
+ char *title_text = getStringCat2(program.program_title, " Error Message");
+ char *error_text = getStringCat2("The program was aborted due to an error; "
+ "for details, see the following error file:"
+ STRING_NEWLINE, program.error_filename);
+
+ MessageBox(NULL, error_text, title_text, MB_OK);
#endif
+}
/* ------------------------------------------------------------------------- */
projects / rocksndiamonds.git / blobdiff