projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed determining program main data path for Mac OS X
[rocksndiamonds.git]
/
src
/
libgame
/
system.h
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index 0bd948bd640ff684c88f25ee3ddff7637a303b0a..130db06da03f4eb9aa92e96388c2a72d4651406a 100644
(file)
--- a/
src/libgame/system.h
+++ b/
src/libgame/system.h
@@
-85,6
+85,7
@@
/* values for touch control */
#define TOUCH_CONTROL_VIRTUAL_BUTTONS "virtual_buttons"
#define TOUCH_CONTROL_WIPE_GESTURES "wipe_gestures"
/* values for touch control */
#define TOUCH_CONTROL_VIRTUAL_BUTTONS "virtual_buttons"
#define TOUCH_CONTROL_WIPE_GESTURES "wipe_gestures"
+#define TOUCH_CONTROL_FOLLOW_FINGER "follow_finger"
#define TOUCH_CONTROL_DEFAULT TOUCH_CONTROL_VIRTUAL_BUTTONS
#define TOUCH_CONTROL_DEFAULT TOUCH_CONTROL_VIRTUAL_BUTTONS
@@
-92,6
+93,15
@@
#define TOUCH_DROP_DISTANCE_DEFAULT 5
#define TOUCH_DROP_DISTANCE_DEFAULT 5
+/* values for special settings for mobile devices */
+#if defined(PLATFORM_ANDROID)
+#define USE_TOUCH_INPUT_OVERLAY
+#define USE_COMPLETE_DISPLAY
+#define HAS_SCREEN_KEYBOARD
+#define SCREEN_KEYBOARD_POS(h) ((h) / 2)
+#endif
+
+
/* 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
@@
-179,12
+189,12
@@
#define MB_WHEEL_DOWN 5
#define MB_WHEEL_LEFT 6
#define MB_WHEEL_RIGHT 7
#define MB_WHEEL_DOWN 5
#define MB_WHEEL_LEFT 6
#define MB_WHEEL_RIGHT 7
-#define IS_WHEEL_BUTTON_VERTICAL(b) ((b)
>= MB_WHEEL_UP &&
\
- (b)
<
= MB_WHEEL_DOWN)
-#define IS_WHEEL_BUTTON_HORIZONTAL(b) ((b)
>= MB_WHEEL_LEFT &&
\
- (b)
<
= MB_WHEEL_RIGHT)
-#define IS_WHEEL_BUTTON(b) (
(b) >= MB_WHEEL_UP &&
\
-
(b) <= MB_WHEEL_DOWN
)
+#define IS_WHEEL_BUTTON_VERTICAL(b) ((b)
== MB_WHEEL_UP ||
\
+ (b)
=
= MB_WHEEL_DOWN)
+#define IS_WHEEL_BUTTON_HORIZONTAL(b) ((b)
== MB_WHEEL_LEFT ||
\
+ (b)
=
= MB_WHEEL_RIGHT)
+#define IS_WHEEL_BUTTON(b) (
IS_WHEEL_BUTTON_VERTICAL(b) ||
\
+
IS_WHEEL_BUTTON_HORIZONTAL(b)
)
#define DEFAULT_WHEEL_STEPS 3
#define BUTTON_STEPSIZE(b) ((b) == MB_LEFTBUTTON ? 1 : \
#define DEFAULT_WHEEL_STEPS 3
#define BUTTON_STEPSIZE(b) ((b) == MB_LEFTBUTTON ? 1 : \
@@
-715,14
+725,6
@@
}
}
-/* type definitions */
-#if defined(TARGET_SDL2)
-typedef int (*EventFilter)(void *, Event *);
-#else
-typedef int (*EventFilter)(const Event *);
-#endif
-
-
/* structure definitions */
struct ProgramInfo
/* structure definitions */
struct ProgramInfo
@@
-777,6
+779,7
@@
struct OptionInfo
char *special_flags;
char *special_flags;
+ boolean mytapes;
boolean serveronly;
boolean network;
boolean verbose;
boolean serveronly;
boolean network;
boolean verbose;
@@
-788,6
+791,9
@@
struct VideoSystemInfo
int default_depth;
int width, height, depth;
int window_width, window_height;
int default_depth;
int width, height, depth;
int window_width, window_height;
+ int display_width, display_height;
+ int screen_width, screen_height;
+ int screen_xoffset, screen_yoffset;
boolean fullscreen_available;
boolean fullscreen_enabled;
boolean fullscreen_available;
boolean fullscreen_enabled;
@@
-801,6
+807,12
@@
struct VideoSystemInfo
unsigned int frame_delay;
unsigned int frame_delay_value;
unsigned int frame_delay;
unsigned int frame_delay_value;
+ boolean shifted_up;
+ int shifted_up_pos;
+ int shifted_up_pos_last;
+ unsigned int shifted_up_delay;
+ unsigned int shifted_up_delay_value;
+
boolean initialized;
};
boolean initialized;
};
@@
-901,6
+913,11
@@
struct GfxInfo
int cursor_mode;
};
int cursor_mode;
};
+struct OverlayInfo
+{
+ boolean active;
+};
+
struct JoystickInfo
{
int status;
struct JoystickInfo
{
int status;
@@
-1294,6
+1311,12
@@
struct XY
int x, y;
};
int x, y;
};
+struct XYTileSize
+{
+ int x, y;
+ int tile_size;
+};
+
struct Rect
{
int x, y;
struct Rect
{
int x, y;
@@
-1358,6
+1381,7
@@
extern struct OptionInfo options;
extern struct VideoSystemInfo video;
extern struct AudioSystemInfo audio;
extern struct GfxInfo gfx;
extern struct VideoSystemInfo video;
extern struct AudioSystemInfo audio;
extern struct GfxInfo gfx;
+extern struct OverlayInfo overlay;
extern struct AnimInfo anim;
extern struct ArtworkInfo artwork;
extern struct JoystickInfo joystick;
extern struct AnimInfo anim;
extern struct ArtworkInfo artwork;
extern struct JoystickInfo joystick;
@@
-1376,6
+1400,7
@@
extern DrawBuffer *drawto;
extern int button_status;
extern boolean motion_status;
extern int button_status;
extern boolean motion_status;
+extern int wheel_steps;
#if defined(TARGET_SDL2)
extern boolean keyrepeat_status;
#endif
#if defined(TARGET_SDL2)
extern boolean keyrepeat_status;
#endif
@@
-1411,6
+1436,9
@@
void InitGfxDrawGlobalAnimFunction(void (*draw_global_anim_function)(int, int));
void InitGfxDrawGlobalBorderFunction(void (*draw_global_border_function)(int));
void InitGfxCustomArtworkInfo();
void InitGfxOtherSettings();
void InitGfxDrawGlobalBorderFunction(void (*draw_global_border_function)(int));
void InitGfxCustomArtworkInfo();
void InitGfxOtherSettings();
+void InitOverlayInfo();
+void SetOverlayActive(boolean);
+boolean GetOverlayActive();
void SetDrawDeactivationMask(int);
void SetDrawBackgroundMask(int);
void SetWindowBackgroundBitmap(Bitmap *);
void SetDrawDeactivationMask(int);
void SetDrawBackgroundMask(int);
void SetWindowBackgroundBitmap(Bitmap *);
@@
-1461,7
+1489,6
@@
Bitmap *LoadImage(char *);
Bitmap *LoadCustomImage(char *);
void ReloadCustomImage(Bitmap *, char *);
Bitmap *LoadCustomImage(char *);
void ReloadCustomImage(Bitmap *, char *);
-Bitmap *ZoomBitmap(Bitmap *, int, int);
void ReCreateGameTileSizeBitmap(Bitmap **);
void CreateBitmapWithSmallBitmaps(Bitmap **, int, int);
void CreateBitmapTextures(Bitmap **);
void ReCreateGameTileSizeBitmap(Bitmap **);
void CreateBitmapWithSmallBitmaps(Bitmap **, int, int);
void CreateBitmapTextures(Bitmap **);
@@
-1474,7
+1501,6
@@
void OpenAudio(void);
void CloseAudio(void);
void SetAudioMode(boolean);
void CloseAudio(void);
void SetAudioMode(boolean);
-void InitEventFilter(EventFilter);
boolean PendingEvent(void);
void NextEvent(Event *event);
void PeekEvent(Event *event);
boolean PendingEvent(void);
void NextEvent(Event *event);
void PeekEvent(Event *event);
@@
-1482,6
+1508,8
@@
Key GetEventKey(KeyEvent *, boolean);
KeyMod HandleKeyModState(Key, int);
KeyMod GetKeyModState();
KeyMod GetKeyModStateFromEvents();
KeyMod HandleKeyModState(Key, int);
KeyMod GetKeyModState();
KeyMod GetKeyModStateFromEvents();
+void StartTextInput(int, int, int, int);
+void StopTextInput();
boolean CheckCloseWindowEvent(ClientMessageEvent *);
void InitJoysticks();
boolean CheckCloseWindowEvent(ClientMessageEvent *);
void InitJoysticks();