X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=a87ecc837f15206351dd228e89bedcf25512a925;hb=88a1829af8ca41b6e581f209002022b2483b86df;hp=7d85f6171925be6137208f50461354d0dd751626;hpb=97d0f78c43d16fbf73ea0438148a4da781c75600;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index 7d85f617..a87ecc83 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -33,6 +33,7 @@ struct OptionInfo options; struct VideoSystemInfo video; struct AudioSystemInfo audio; struct GfxInfo gfx; +struct OverlayInfo overlay; struct ArtworkInfo artwork; struct JoystickInfo joystick; struct SetupInfo setup; @@ -67,7 +68,7 @@ int FrameCounter = 0; void InitProgramInfo(char *argv0, char *config_filename, char *userdata_subdir, char *program_title, char *icon_title, char *icon_filename, char *cookie_prefix, - int program_version) + char *program_version_string, int program_version) { program.command_basepath = getBasePath(argv0); program.command_basename = getBaseName(argv0); @@ -91,10 +92,39 @@ void InitProgramInfo(char *argv0, char *config_filename, char *userdata_subdir, program.version_build = VERSION_BUILD(program_version); program.version_ident = program_version; + program.version_string = program_version_string; + program.log_filename[LOG_OUT_ID] = getLogFilename(LOG_OUT_BASENAME); program.log_filename[LOG_ERR_ID] = getLogFilename(LOG_ERR_BASENAME); program.log_file[LOG_OUT_ID] = program.log_file_default[LOG_OUT_ID] = stdout; program.log_file[LOG_ERR_ID] = program.log_file_default[LOG_ERR_ID] = stderr; + + program.headless = FALSE; +} + +void InitScoresInfo() +{ + char *global_scores_dir = getPath2(getCommonDataDir(), SCORES_DIRECTORY); + + program.global_scores = directoryExists(global_scores_dir); + program.many_scores_per_name = !program.global_scores; + + if (options.debug) + { + if (program.global_scores) + { + Error(ERR_DEBUG, "Using global, multi-user scores directory '%s'.", + global_scores_dir); + Error(ERR_DEBUG, "Remove to enable single-user scores directory."); + Error(ERR_DEBUG, "(This enables multipe score entries per user.)"); + } + else + { + Error(ERR_DEBUG, "Using private, single-user scores directory."); + } + } + + free(global_scores_dir); } void SetWindowTitle() @@ -270,11 +300,42 @@ void InitGfxOtherSettings() gfx.cursor_mode = CURSOR_DEFAULT; } +void InitOverlayInfo() +{ + overlay.enabled = FALSE; + overlay.active = FALSE; + +#if defined(PLATFORM_ANDROID) + if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS)) + overlay.enabled = TRUE; +#endif +} + +void SetOverlayEnabled(boolean enabled) +{ + overlay.enabled = enabled; +} + +void SetOverlayActive(boolean active) +{ + overlay.active = active; +} + +boolean GetOverlayActive() +{ + return overlay.active; +} + void SetDrawDeactivationMask(int draw_deactivation_mask) { gfx.draw_deactivation_mask = draw_deactivation_mask; } +int GetDrawDeactivationMask() +{ + return gfx.draw_deactivation_mask; +} + void SetDrawBackgroundMask(int draw_background_mask) { gfx.draw_background_mask = draw_background_mask; @@ -362,7 +423,13 @@ void LimitScreenUpdates(boolean enable) void InitVideoDisplay(void) { + if (program.headless) + return; + SDLInitVideoDisplay(); +#if defined(TARGET_SDL2) + SDLSetDisplaySize(); +#endif } void CloseVideoDisplay(void) @@ -378,6 +445,11 @@ void InitVideoBuffer(int width, int height, int depth, boolean fullscreen) video.height = height; video.depth = GetRealDepth(depth); + video.screen_width = width; + video.screen_height = height; + video.screen_xoffset = 0; + video.screen_yoffset = 0; + video.fullscreen_available = FULLSCREEN_STATUS; video.fullscreen_enabled = FALSE; @@ -453,6 +525,18 @@ Bitmap *CreateBitmap(int width, int height, int depth) void ReCreateBitmap(Bitmap **bitmap, int width, int height) { + if (*bitmap != NULL) + { + /* if new bitmap size fits into old one, no need to re-create it */ + if (width <= (*bitmap)->width && + height <= (*bitmap)->height) + return; + + /* else adjust size so that old and new bitmap size fit into it */ + width = MAX(width, (*bitmap)->width); + height = MAX(height, (*bitmap)->height); + } + Bitmap *new_bitmap = CreateBitmap(width, height, DEFAULT_DEPTH); if (*bitmap == NULL) @@ -587,6 +671,9 @@ void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap, int dst_x_unclipped = dst_x; int dst_y_unclipped = dst_y; + if (program.headless) + return; + if (src_bitmap == NULL || dst_bitmap == NULL) return; @@ -1401,24 +1488,14 @@ void SetAudioMode(boolean enabled) /* event functions */ /* ========================================================================= */ -void InitEventFilter(EventFilter filter_function) -{ - /* set event filter to filter out certain events */ -#if defined(TARGET_SDL2) - SDL_SetEventFilter(filter_function, NULL); -#else - SDL_SetEventFilter(filter_function); -#endif -} - boolean PendingEvent(void) { return (SDL_PollEvent(NULL) ? TRUE : FALSE); } -void NextEvent(Event *event) +void WaitEvent(Event *event) { - SDLNextEvent(event); + SDLWaitEvent(event); } void PeekEvent(Event *event) @@ -1430,6 +1507,12 @@ void PeekEvent(Event *event) #endif } +void CheckQuitEvent(void) +{ + if (SDL_QuitRequested()) + program.exit_function(0); +} + Key GetEventKey(KeyEvent *event, boolean with_modifiers) { #if defined(TARGET_SDL2) @@ -1520,9 +1603,9 @@ KeyMod GetKeyModStateFromEvents() void StartTextInput(int x, int y, int width, int height) { #if defined(TARGET_SDL2) +#if defined(HAS_SCREEN_KEYBOARD) SDL_StartTextInput(); -#if defined(HAS_SCREEN_KEYBOARD) if (y + height > SCREEN_KEYBOARD_POS(video.height)) { video.shifted_up_pos = y + height - SCREEN_KEYBOARD_POS(video.height); @@ -1536,9 +1619,9 @@ void StartTextInput(int x, int y, int width, int height) void StopTextInput() { #if defined(TARGET_SDL2) +#if defined(HAS_SCREEN_KEYBOARD) SDL_StopTextInput(); -#if defined(HAS_SCREEN_KEYBOARD) if (video.shifted_up) { video.shifted_up_pos = 0; @@ -1573,7 +1656,7 @@ void InitJoysticks() /* always start with reliable default values */ joystick.status = JOYSTICK_NOT_AVAILABLE; for (i = 0; i < MAX_PLAYERS; i++) - joystick.fd[i] = -1; /* joystick device closed */ + joystick.nr[i] = -1; /* no joystick configured */ SDLInitJoysticks(); } @@ -1582,3 +1665,13 @@ boolean ReadJoystick(int nr, int *x, int *y, boolean *b1, boolean *b2) { return SDLReadJoystick(nr, x, y, b1, b2); } + +boolean CheckJoystickOpened(int nr) +{ + return SDLCheckJoystickOpened(nr); +} + +void ClearJoystickState() +{ + SDLClearJoystickState(); +}