X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsdl.h;h=79827b4501dc6247076dc4dd1385378d813ca1be;hp=c99539b6c3bdcc6615f0195f3c6d0f4137967c3d;hb=14d7691c65ca4a466ce9b9448153e8fbe8351a81;hpb=3ae70b9d27b4b2c038f35b0aa5985c368542a486 diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h index c99539b6..79827b45 100644 --- a/src/libgame/sdl.h +++ b/src/libgame/sdl.h @@ -1,15 +1,13 @@ -/*********************************************************** -* Artsoft Retro-Game Library * -*----------------------------------------------------------* -* (c) 1994-2006 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* sdl.h * -***********************************************************/ +// ============================================================================ +// Artsoft Retro-Game Library +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// sdl.h +// ============================================================================ #ifndef SDL_H #define SDL_H @@ -25,7 +23,11 @@ /* definitions needed for "system.c" */ +#if defined(TARGET_SDL2) +#define SURFACE_FLAGS (0) +#else #define SURFACE_FLAGS (SDL_SWSURFACE) +#endif #if defined(TARGET_SDL2) #define SET_TRANSPARENT_PIXEL (SDL_TRUE) @@ -35,14 +37,26 @@ #define UNSET_TRANSPARENT_PIXEL (0) #endif -#if defined(TARGET_SDL2) -#define SDL_DisplayFormat(s) (s) -#endif - /* system dependent definitions */ +#if defined(TARGET_SDL2) +#define TARGET_STRING "SDL2" +#else #define TARGET_STRING "SDL" +#endif + +#if defined(PLATFORM_ANDROID) +#define WINDOW_SCALING_STATUS WINDOW_SCALING_NOT_AVAILABLE +#define FULLSCREEN_STATUS FULLSCREEN_AVAILABLE +#define USE_DESKTOP_FULLSCREEN TRUE +#elif defined(TARGET_SDL2) +#define WINDOW_SCALING_STATUS WINDOW_SCALING_AVAILABLE #define FULLSCREEN_STATUS FULLSCREEN_AVAILABLE +#define USE_DESKTOP_FULLSCREEN TRUE +#else // SDL 1.2 +#define WINDOW_SCALING_STATUS WINDOW_SCALING_NOT_AVAILABLE +#define FULLSCREEN_STATUS FULLSCREEN_AVAILABLE +#endif #define CURSOR_MAX_WIDTH 32 #define CURSOR_MAX_HEIGHT 32 @@ -58,25 +72,26 @@ typedef SDL_Cursor *Cursor; #if defined(TARGET_SDL2) typedef SDL_Keycode Key; +typedef SDL_Keymod KeyMod; #else typedef SDLKey Key; -#endif typedef unsigned int KeyMod; +#endif typedef SDL_Event Event; typedef SDL_MouseButtonEvent ButtonEvent; typedef SDL_MouseMotionEvent MotionEvent; +#if defined(TARGET_SDL2) +typedef SDL_TouchFingerEvent FingerEvent; +typedef SDL_TextInputEvent TextEvent; +typedef SDL_Event PauseResumeEvent; +typedef SDL_WindowEvent WindowEvent; +#endif typedef SDL_KeyboardEvent KeyEvent; typedef SDL_Event ExposeEvent; typedef SDL_Event FocusChangeEvent; typedef SDL_Event ClientMessageEvent; -typedef int GC; -typedef int Pixmap; -typedef int Display; -typedef int Visual; -typedef int Colormap; - /* structure definitions */ @@ -87,8 +102,6 @@ struct SDLSurfaceInfo int width, height; SDL_Surface *surface; SDL_Surface *surface_masked; - GC gc; - GC stored_clip_gc; }; struct MouseCursorInfo @@ -111,6 +124,12 @@ struct MouseCursorInfo #define EVENT_BUTTONPRESS SDL_MOUSEBUTTONDOWN #define EVENT_BUTTONRELEASE SDL_MOUSEBUTTONUP #define EVENT_MOTIONNOTIFY SDL_MOUSEMOTION +#if defined(TARGET_SDL2) +#define EVENT_FINGERPRESS SDL_FINGERDOWN +#define EVENT_FINGERRELEASE SDL_FINGERUP +#define EVENT_FINGERMOTION SDL_FINGERMOTION +#define EVENT_TEXTINPUT SDL_TEXTINPUT +#endif #define EVENT_KEYPRESS SDL_KEYDOWN #define EVENT_KEYRELEASE SDL_KEYUP #define EVENT_EXPOSE SDL_USEREVENT + 0 @@ -148,6 +167,7 @@ struct MouseCursorInfo #define KSYM_Shift_R SDLK_RSHIFT #define KSYM_Control_L SDLK_LCTRL #define KSYM_Control_R SDLK_RCTRL + #if defined(TARGET_SDL2) #define KSYM_Meta_L SDLK_LGUI #define KSYM_Meta_R SDLK_RGUI @@ -155,6 +175,7 @@ struct MouseCursorInfo #define KSYM_Meta_L SDLK_LMETA #define KSYM_Meta_R SDLK_RMETA #endif + #define KSYM_Alt_L SDLK_LALT #define KSYM_Alt_R SDLK_RALT #if !defined(TARGET_SDL2) @@ -172,14 +193,24 @@ struct MouseCursorInfo #define KSYM_End SDLK_END #define KSYM_Page_Up SDLK_PAGEUP #define KSYM_Page_Down SDLK_PAGEDOWN + +#if defined(TARGET_SDL2) #define KSYM_Menu SDLK_MENU +#define KSYM_Back SDLK_AC_BACK +#endif #define KSYM_space SDLK_SPACE #define KSYM_exclam SDLK_EXCLAIM #define KSYM_quotedbl SDLK_QUOTEDBL #define KSYM_numbersign SDLK_HASH #define KSYM_dollar SDLK_DOLLAR -#define KSYM_percent KSYM_UNDEFINED /* undefined */ + +#if defined(TARGET_SDL2) +#define KSYM_percent SDLK_PERCENT +#else +#define KSYM_percent 37 /* undefined in SDL */ +#endif + #define KSYM_ampersand SDLK_AMPERSAND #define KSYM_apostrophe SDLK_QUOTE #define KSYM_parenleft SDLK_LEFTPAREN @@ -212,7 +243,16 @@ struct MouseCursorInfo #define KSYM_braceright KSYM_UNDEFINED /* undefined */ #define KSYM_asciitilde KSYM_UNDEFINED /* undefined */ -#if !defined(TARGET_SDL2) +#if defined(TARGET_SDL2) +#define KSYM_degree 176 +#define KSYM_Adiaeresis 196 +#define KSYM_Odiaeresis 214 +#define KSYM_Udiaeresis 220 +#define KSYM_adiaeresis 228 +#define KSYM_odiaeresis 246 +#define KSYM_udiaeresis 252 +#define KSYM_ssharp 223 +#else #define KSYM_degree SDLK_WORLD_16 #define KSYM_Adiaeresis SDLK_WORLD_36 #define KSYM_Odiaeresis SDLK_WORLD_54 @@ -353,28 +393,17 @@ struct MouseCursorInfo #define KSYM_F10 SDLK_F10 #define KSYM_F11 SDLK_F11 #define KSYM_F12 SDLK_F12 -#define KSYM_F13 SDLK_F13 -#define KSYM_F14 SDLK_F14 -#define KSYM_F15 SDLK_F15 -#define KSYM_F16 KSYM_UNDEFINED -#define KSYM_F17 KSYM_UNDEFINED -#define KSYM_F18 KSYM_UNDEFINED -#define KSYM_F19 KSYM_UNDEFINED -#define KSYM_F20 KSYM_UNDEFINED -#define KSYM_F21 KSYM_UNDEFINED -#define KSYM_F22 KSYM_UNDEFINED -#define KSYM_F23 KSYM_UNDEFINED -#define KSYM_F24 KSYM_UNDEFINED #define KSYM_FKEY_FIRST KSYM_F1 -#define KSYM_FKEY_LAST KSYM_F15 +#define KSYM_FKEY_LAST KSYM_F12 #define KSYM_NUM_FKEYS (KSYM_FKEY_LAST - KSYM_FKEY_FIRST + 1) -#define KMOD_None None +#define KMOD_None KMOD_NONE #define KMOD_Shift_L KMOD_LSHIFT #define KMOD_Shift_R KMOD_RSHIFT #define KMOD_Control_L KMOD_LCTRL #define KMOD_Control_R KMOD_RCTRL + #if defined(TARGET_SDL2) #define KMOD_Meta_L KMOD_LGUI #define KMOD_Meta_R KMOD_RGUI @@ -382,6 +411,7 @@ struct MouseCursorInfo #define KMOD_Meta_L KMOD_LMETA #define KMOD_Meta_R KMOD_RMETA #endif + #define KMOD_Alt_L KMOD_LALT #define KMOD_Alt_R KMOD_RALT @@ -390,9 +420,26 @@ struct MouseCursorInfo #define KMOD_Meta (KMOD_Meta_L | KMOD_Meta_R) #define KMOD_Alt (KMOD_Alt_L | KMOD_Alt_R) +#if defined(TARGET_SDL2) +#define KMOD_TextInput (KMOD_Shift | KMOD_Alt_R) +#endif /* SDL function definitions */ +boolean SDLSetNativeSurface(SDL_Surface **); +SDL_Surface *SDLGetNativeSurface(SDL_Surface *); + +#if defined(TARGET_SDL2) +SDL_Surface *SDL_DisplayFormat(SDL_Surface *); +void SDLSetWindowScaling(int); +void SDLSetWindowScalingQuality(char *); +void SDLSetWindowFullscreen(boolean); +void SDLRedrawWindow(); +#endif + +void SDLSetWindowTitle(void); + +void SDLLimitScreenUpdates(boolean); void SDLInitVideoDisplay(void); void SDLInitVideoBuffer(DrawBuffer **, DrawWindow **, boolean); boolean SDLSetVideoMode(DrawBuffer **, boolean); @@ -410,7 +457,7 @@ void SDLPutPixel(Bitmap *, int, int, Pixel); void SDLInvertArea(Bitmap *, int, int, int, int, Uint32); void SDLCopyInverseMasked(Bitmap *, Bitmap *, int, int, int, int, int, int); -void SDLZoomBitmap(Bitmap *, Bitmap *); +Bitmap *SDLZoomBitmap(Bitmap *, int, int); Bitmap *SDLLoadImage(char *);