X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsdl.h;h=838be3ad467ca6e96cbd5293fbb8e3428b740fe8;hp=3a00cb1136a5ea745960b8d776dc97b68b85e77d;hb=0d214d4e314f6f42df24be140bb433e980319767;hpb=b003831ec2ccf7b14d2aa094466bdeb6c2f1d048 diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h index 3a00cb11..838be3ad 100644 --- a/src/libgame/sdl.h +++ b/src/libgame/sdl.h @@ -56,12 +56,6 @@ #define FULLSCREEN_STATUS FULLSCREEN_AVAILABLE #endif -#if defined(TARGET_SDL2) -#define USE_FINAL_SCREEN_BITMAP FALSE -#else -#define USE_FINAL_SCREEN_BITMAP TRUE -#endif - #define CURSOR_MAX_WIDTH 32 #define CURSOR_MAX_HEIGHT 32 @@ -86,6 +80,7 @@ typedef SDL_Event Event; typedef SDL_MouseButtonEvent ButtonEvent; typedef SDL_MouseMotionEvent MotionEvent; #if defined(TARGET_SDL2) +typedef SDL_MouseWheelEvent WheelEvent; typedef SDL_TouchFingerEvent FingerEvent; typedef SDL_TextInputEvent TextEvent; typedef SDL_Event PauseResumeEvent; @@ -133,6 +128,7 @@ struct MouseCursorInfo #define EVENT_BUTTONRELEASE SDL_MOUSEBUTTONUP #define EVENT_MOTIONNOTIFY SDL_MOUSEMOTION #if defined(TARGET_SDL2) +#define EVENT_WHEELMOTION SDL_MOUSEWHEEL #define EVENT_FINGERPRESS SDL_FINGERDOWN #define EVENT_FINGERRELEASE SDL_FINGERUP #define EVENT_FINGERMOTION SDL_FINGERMOTION @@ -205,6 +201,11 @@ struct MouseCursorInfo #if defined(TARGET_SDL2) #define KSYM_Menu SDLK_MENU #define KSYM_Back SDLK_AC_BACK +#define KSYM_PlayPause SDLK_AUDIOPLAY +#if defined(PLATFORM_ANDROID) +#define KSYM_Rewind SDLK_AUDIORWND +#define KSYM_FastForward SDLK_AUDIOFFWD +#endif #endif #define KSYM_space SDLK_SPACE @@ -444,21 +445,26 @@ SDL_Surface *SDL_DisplayFormat(SDL_Surface *); void SDLSetWindowScaling(int); void SDLSetWindowScalingQuality(char *); void SDLSetWindowFullscreen(boolean); -void SDLRedrawWindow(); +void SDLSetDisplaySize(void); +void SDLSetScreenSizeAndOffsets(int, int); +void SDLSetScreenSizeForRenderer(int, int); +void SDLSetScreenProperties(void); #endif +void SDLSetScreenRenderingMode(char *); +void SDLRedrawWindow(); void SDLSetWindowTitle(void); void SDLLimitScreenUpdates(boolean); void SDLInitVideoDisplay(void); -void SDLInitVideoBuffer(DrawBuffer **, DrawWindow **, boolean); -boolean SDLSetVideoMode(DrawBuffer **, boolean); +void SDLInitVideoBuffer(boolean); +boolean SDLSetVideoMode(boolean); void SDLCreateBitmapContent(Bitmap *, int, int, int); void SDLFreeBitmapPointers(Bitmap *); void SDLCopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int); void SDLBlitTexture(Bitmap *, int, int, int, int, int, int, int); void SDLFillRectangle(Bitmap *, int, int, int, int, Uint32); -void SDLFadeRectangle(Bitmap *, int, int, int, int, int, int, int, +void SDLFadeRectangle(int, int, int, int, int, int, int, void (*draw_border_function)(void)); void SDLDrawSimpleLine(Bitmap *, int, int, int, int, Uint32); void SDLDrawLine(Bitmap *, int, int, int, int, Uint32); @@ -483,5 +489,8 @@ void SDLHandleWindowManagerEvent(Event *); void HandleJoystickEvent(Event *); void SDLInitJoysticks(void); boolean SDLReadJoystick(int, int *, int *, boolean *, boolean *); +boolean SDLCheckJoystickOpened(int); + +void PrepareFadeBitmap(int); #endif /* SDL_H */