X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsdl.h;h=05ddfed6ac406c974bb368e6bfbbd390d095239e;hb=a7c06161253796a30a0237a7f5a044f459c8cf35;hp=254b9927166fc33d126911e9898c49b803610369;hpb=307f92e3ee14cdab72466e5998eef66c0ef3ae38;p=rocksndiamonds.git

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index 254b9927..05ddfed6 100644
--- a/src/libgame/sdl.h
+++ b/src/libgame/sdl.h
@@ -47,7 +47,18 @@
 #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
@@ -75,6 +86,7 @@ typedef SDL_MouseMotionEvent	MotionEvent;
 #if defined(TARGET_SDL2)
 typedef SDL_TouchFingerEvent	FingerEvent;
 typedef SDL_TextInputEvent	TextEvent;
+typedef SDL_WindowEvent		WindowEvent;
 #endif
 typedef SDL_KeyboardEvent	KeyEvent;
 typedef SDL_Event		ExposeEvent;
@@ -201,7 +213,13 @@ struct MouseCursorInfo
 #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
@@ -411,11 +429,17 @@ 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 */
 
 #if defined(TARGET_SDL2)
 SDL_Surface *SDL_DisplayFormat(SDL_Surface *);
+void SDLSetWindowScaling(int);
+void SDLSetWindowFullscreen(boolean);
+void SDLRedrawWindow();
 #endif
 
 void SDLInitVideoDisplay(void);