X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=cd28493f1ece06a549ee4517e1f369d14bd00571;hb=24101bdeee0ac963cfd48b5220f6d9b0188a6f69;hp=c671d4b7f3c2f0eee9d01c0c93faa34455de81bf;hpb=3b0023fd3eacaecffa0ae6c9107c11d3abd4ac6c;p=rocksndiamonds.git diff --git a/src/libgame/misc.c b/src/libgame/misc.c index c671d4b7..cd28493f 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -50,53 +50,6 @@ static void vfprintf_newline(FILE *stream, char *format, va_list 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); -} - -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) @@ -109,26 +62,14 @@ static void fprintf_newline(FILE *stream, char *format, ...) } } -static char *get_line_string(char *line_chars, int line_length) +void fprintf_line(FILE *stream, 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++) - strcpy(&buffer[i * line_chars_length], line_chars); - - return buffer; -} + fprintf(stream, "%s", line_chars); -void fprintf_line(FILE *stream, char *line_chars, int line_length) -{ - fprintf_newline(stream, get_line_string(line_chars, line_length)); + fprintf_newline(stream, ""); } void printf_line(char *line_chars, int line_length) @@ -136,11 +77,6 @@ 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); @@ -514,38 +450,6 @@ char *getRealName() return real_name; } -char *getHomeDir() -{ - static char *dir = NULL; - -#if defined(PLATFORM_WIN32) - if (dir == NULL) - { - dir = checked_malloc(MAX_PATH + 1); - - if (!SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, 0, dir))) - strcpy(dir, "."); - } -#elif defined(PLATFORM_UNIX) - if (dir == NULL) - { - if ((dir = getenv("HOME")) == NULL) - { - struct passwd *pwd; - - if ((pwd = getpwuid(getuid())) != NULL) - dir = getStringCopy(pwd->pw_dir); - else - dir = "."; - } - } -#else - dir = "."; -#endif - - return dir; -} - /* ------------------------------------------------------------------------- */ /* path manipulation functions */ @@ -843,45 +747,6 @@ void GetOptions(char *argv[], void (*print_usage_function)(void)) /* when doing batch processing, always enable verbose mode (warnings) */ options.verbose = TRUE; } -#if 1 -#if DEBUG -#if defined(TARGET_SDL) - else if (strncmp(option, "-SDL_ListModes", option_len) == 0) - { - SDL_Rect **modes; - int i; - - SDL_Init(SDL_INIT_VIDEO); - - /* get available fullscreen/hardware modes */ - modes=SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE); - - /* check if there are any modes available */ - if (modes == (SDL_Rect **)0) - { - printf("No modes available!\n"); - - exit(-1); - } - - /* check if our resolution is restricted */ - if (modes == (SDL_Rect **)-1) - { - printf("All resolutions available.\n"); - } - else - { - /* print valid modes */ - printf("Available Modes:\n"); - for(i = 0; modes[i]; i++) - printf(" %d x %d\n", modes[i]->w, modes[i]->h); - } - - exit(0); - } -#endif -#endif -#endif else if (*option == '-') { Error(ERR_EXIT_HELP, "unrecognized option '%s'", option_str); @@ -939,7 +804,7 @@ void Error(int mode, char *format, ...) if (mode == ERR_RETURN_LINE) { if (!last_line_was_separator) - printf_line_error(format, 79); + fprintf_line(program.error_file, format, 79); last_line_was_separator = TRUE; @@ -959,23 +824,25 @@ void Error(int mode, char *format, ...) { va_list ap; - printf_error("%s%s: ", program.command_basename, process_name); + fprintf(program.error_file, "%s%s: ", program.command_basename, + process_name); if (mode & ERR_WARN) - printf_error("warning: "); + fprintf(program.error_file, "warning: "); va_start(ap, format); - vprintf_error_newline(format, ap); + vfprintf_newline(program.error_file, format, ap); va_end(ap); } if (mode & ERR_HELP) - printf_error_newline("%s: Try option '--help' for more information.", - program.command_basename); + fprintf_newline(program.error_file, + "%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); + fprintf_newline(program.error_file, "%s%s: aborting", + program.command_basename, process_name); if (mode & ERR_EXIT) { @@ -2033,6 +1900,48 @@ int get_auto_parameter_value(char *token, char *value_raw) return get_parameter_value(value_raw, suffix, TYPE_INTEGER); } +struct ScreenModeInfo *get_screen_mode_from_string(char *screen_mode_string) +{ + static struct ScreenModeInfo screen_mode; + char *screen_mode_string_x = strchr(screen_mode_string, 'x'); + char *screen_mode_string_copy; + char *screen_mode_string_pos_w; + char *screen_mode_string_pos_h; + + if (screen_mode_string_x == NULL) /* invalid screen mode format */ + return NULL; + + screen_mode_string_copy = getStringCopy(screen_mode_string); + + screen_mode_string_pos_w = screen_mode_string_copy; + screen_mode_string_pos_h = strchr(screen_mode_string_copy, 'x'); + *screen_mode_string_pos_h++ = '\0'; + + screen_mode.width = atoi(screen_mode_string_pos_w); + screen_mode.height = atoi(screen_mode_string_pos_h); + + return &screen_mode; +} + +void get_aspect_ratio_from_screen_mode(struct ScreenModeInfo *screen_mode, + int *x, int *y) +{ + float aspect_ratio = (float)screen_mode->width / (float)screen_mode->height; + float aspect_ratio_new; + int i = 1; + + do + { + *x = i * aspect_ratio + 0.000001; + *y = i; + + aspect_ratio_new = (float)*x / (float)*y; + + i++; + } + while (aspect_ratio_new != aspect_ratio && *y < screen_mode->height); +} + static void FreeCustomArtworkList(struct ArtworkListInfo *, struct ListNodeInfo ***, int *); @@ -2900,25 +2809,25 @@ void FreeCustomArtworkLists(struct ArtworkListInfo *artwork_info) char *getErrorFilename(char *basename) { - return getPath2(getUserDataDir(), basename); + return getPath2(getUserGameDataDir(), basename); } -void initErrorFile() +void openErrorFile() { - unlink(program.error_filename); -} - -FILE *openErrorFile() -{ - FILE *error_file = stderr; + /* always start with reliable default values */ + program.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!", + if ((program.error_file = fopen(program.error_filename, MODE_WRITE)) == NULL) + fprintf_newline(stderr, "ERROR: cannot open file '%s' for writing!", program.error_filename); #endif +} - return error_file; +void closeErrorFile() +{ + if (program.error_file != stderr) /* do not close stream 'stderr' */ + fclose(program.error_file); } void dumpErrorFile()