projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20140104-4-src
[rocksndiamonds.git]
/
src
/
libgame
/
system.h
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index 5c1976917b04dd8c44d6790ec709fbddd1884645..b9f65d149e19f77bffcc2b2aefc5ccc982ec461d 100644
(file)
--- a/
src/libgame/system.h
+++ b/
src/libgame/system.h
@@
-24,6
+24,8
@@
#include "windows.h"
#elif defined(PLATFORM_MSDOS)
#include "msdos.h"
#include "windows.h"
#elif defined(PLATFORM_MSDOS)
#include "msdos.h"
+#elif defined(PLATFORM_ANDROID)
+#include "android.h"
#endif
#if defined(TARGET_SDL)
#endif
#if defined(TARGET_SDL)
@@
-45,9
+47,18
@@
#define BLIT_INVERSE 2
#define BLIT_ON_BACKGROUND 3
#define BLIT_INVERSE 2
#define BLIT_ON_BACKGROUND 3
+/* values for fullscreen status */
#define FULLSCREEN_NOT_AVAILABLE FALSE
#define FULLSCREEN_AVAILABLE TRUE
#define FULLSCREEN_NOT_AVAILABLE FALSE
#define FULLSCREEN_AVAILABLE TRUE
+/* values for window scaling */
+#define WINDOW_SCALING_NOT_AVAILABLE FALSE
+#define WINDOW_SCALING_AVAILABLE TRUE
+
+#define MIN_WINDOW_SCALING_PERCENT 10
+#define STD_WINDOW_SCALING_PERCENT 100
+#define MAX_WINDOW_SCALING_PERCENT 300
+
/* default input keys */
#define DEFAULT_KEY_LEFT KSYM_Left
#define DEFAULT_KEY_RIGHT KSYM_Right
/* default input keys */
#define DEFAULT_KEY_LEFT KSYM_Left
#define DEFAULT_KEY_RIGHT KSYM_Right
@@
-644,7
+655,11
@@
/* type definitions */
/* type definitions */
+#if defined(TARGET_SDL2)
+typedef int (*EventFilter)(void *, Event *);
+#else
typedef int (*EventFilter)(const Event *);
typedef int (*EventFilter)(const Event *);
+#endif
/* structure definitions */
/* structure definitions */
@@
-722,6
+737,9
@@
struct VideoSystemInfo
boolean fullscreen_enabled;
struct ScreenModeInfo *fullscreen_modes;
char *fullscreen_mode_current;
boolean fullscreen_enabled;
struct ScreenModeInfo *fullscreen_modes;
char *fullscreen_mode_current;
+
+ boolean window_scaling_available;
+ int window_scaling_percent;
};
struct AudioSystemInfo
};
struct AudioSystemInfo
@@
-931,6
+949,7
@@
struct SetupInfo
boolean time_limit;
boolean fullscreen;
char *fullscreen_mode;
boolean time_limit;
boolean fullscreen;
char *fullscreen_mode;
+ int window_scaling_percent;
boolean ask_on_escape;
boolean ask_on_escape_editor;
boolean quick_switch;
boolean ask_on_escape;
boolean ask_on_escape_editor;
boolean quick_switch;
@@
-1219,6
+1238,9
@@
extern DrawBuffer *drawto;
extern int button_status;
extern boolean motion_status;
extern int button_status;
extern boolean motion_status;
+#if defined(TARGET_SDL2)
+extern boolean keyrepeat_status;
+#endif
extern int redraw_mask;
extern int redraw_tiles;
extern int redraw_mask;
extern int redraw_tiles;