X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsdl.h;h=b228c00934820a81e4d300270aae8cb0ca764574;hb=7ecf99096c7c23909ada034e05d971464f66552f;hp=19ead5e5200254255dd6ff022ee4a7c4fb3dee5c;hpb=9cb181e05e485435ef48586dd4f2811ba1e672b3;p=rocksndiamonds.git diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h index 19ead5e5..b228c009 100644 --- a/src/libgame/sdl.h +++ b/src/libgame/sdl.h @@ -19,15 +19,34 @@ #include #include #include - +#if defined(PLATFORM_WIN32) +#include +#endif /* 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) +#define UNSET_TRANSPARENT_PIXEL (SDL_FALSE) +#else +#define SET_TRANSPARENT_PIXEL (SDL_SRCCOLORKEY) +#define UNSET_TRANSPARENT_PIXEL (0) +#endif /* system dependent definitions */ +#if defined(TARGET_SDL2) +#define TARGET_STRING "SDL2" +#else #define TARGET_STRING "SDL" +#endif + #define FULLSCREEN_STATUS FULLSCREEN_AVAILABLE #define CURSOR_MAX_WIDTH 32 @@ -42,12 +61,19 @@ typedef struct SDLSurfaceInfo DrawWindow; typedef Uint32 Pixel; typedef SDL_Cursor *Cursor; +#if defined(TARGET_SDL2) +typedef SDL_Keycode Key; +#else typedef SDLKey Key; +#endif typedef unsigned int KeyMod; typedef SDL_Event Event; typedef SDL_MouseButtonEvent ButtonEvent; typedef SDL_MouseMotionEvent MotionEvent; +#if defined(TARGET_SDL2) +typedef SDL_TouchFingerEvent FingerEvent; +#endif typedef SDL_KeyboardEvent KeyEvent; typedef SDL_Event ExposeEvent; typedef SDL_Event FocusChangeEvent; @@ -93,6 +119,11 @@ 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 +#endif #define EVENT_KEYPRESS SDL_KEYDOWN #define EVENT_KEYRELEASE SDL_KEYUP #define EVENT_EXPOSE SDL_USEREVENT + 0 @@ -130,12 +161,19 @@ 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 +#else #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) #define KSYM_Super_L SDLK_LSUPER #define KSYM_Super_R SDLK_RSUPER +#endif #define KSYM_Mode_switch SDLK_MODE #define KSYM_Multi_key SDLK_RCTRL @@ -147,7 +185,9 @@ struct MouseCursorInfo #define KSYM_End SDLK_END #define KSYM_Page_Up SDLK_PAGEUP #define KSYM_Page_Down SDLK_PAGEDOWN + #define KSYM_Menu SDLK_MENU +#define KSYM_Back SDLK_AC_BACK #define KSYM_space SDLK_SPACE #define KSYM_exclam SDLK_EXCLAIM @@ -187,6 +227,7 @@ struct MouseCursorInfo #define KSYM_braceright KSYM_UNDEFINED /* undefined */ #define KSYM_asciitilde KSYM_UNDEFINED /* undefined */ +#if !defined(TARGET_SDL2) #define KSYM_degree SDLK_WORLD_16 #define KSYM_Adiaeresis SDLK_WORLD_36 #define KSYM_Odiaeresis SDLK_WORLD_54 @@ -195,6 +236,7 @@ struct MouseCursorInfo #define KSYM_odiaeresis SDLK_WORLD_86 #define KSYM_udiaeresis SDLK_WORLD_92 #define KSYM_ssharp SDLK_WORLD_63 +#endif #ifndef SDLK_A #define SDLK_A 65 @@ -290,6 +332,18 @@ struct MouseCursorInfo #define KSYM_8 SDLK_8 #define KSYM_9 SDLK_9 +#if defined(TARGET_SDL2) +#define KSYM_KP_0 SDLK_KP_0 +#define KSYM_KP_1 SDLK_KP_1 +#define KSYM_KP_2 SDLK_KP_2 +#define KSYM_KP_3 SDLK_KP_3 +#define KSYM_KP_4 SDLK_KP_4 +#define KSYM_KP_5 SDLK_KP_5 +#define KSYM_KP_6 SDLK_KP_6 +#define KSYM_KP_7 SDLK_KP_7 +#define KSYM_KP_8 SDLK_KP_8 +#define KSYM_KP_9 SDLK_KP_9 +#else #define KSYM_KP_0 SDLK_KP0 #define KSYM_KP_1 SDLK_KP1 #define KSYM_KP_2 SDLK_KP2 @@ -300,6 +354,7 @@ struct MouseCursorInfo #define KSYM_KP_7 SDLK_KP7 #define KSYM_KP_8 SDLK_KP8 #define KSYM_KP_9 SDLK_KP9 +#endif #define KSYM_F1 SDLK_F1 #define KSYM_F2 SDLK_F2 @@ -335,8 +390,13 @@ struct MouseCursorInfo #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 +#else #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 @@ -348,6 +408,10 @@ struct MouseCursorInfo /* SDL function definitions */ +#if defined(TARGET_SDL2) +SDL_Surface *SDL_DisplayFormat(SDL_Surface *); +#endif + void SDLInitVideoDisplay(void); void SDLInitVideoBuffer(DrawBuffer **, DrawWindow **, boolean); boolean SDLSetVideoMode(DrawBuffer **, boolean); @@ -375,6 +439,7 @@ void SDLOpenAudio(void); void SDLCloseAudio(void); void SDLNextEvent(Event *); +void SDLHandleWindowManagerEvent(Event *); void HandleJoystickEvent(Event *); void SDLInitJoysticks(void);