X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=d07e0e1ddab91f3f8ee30b8d12dcebf171574890;hp=5249adfcb599df787c497ba9aa6ba153949eedfb;hb=2965766321c0bc9b8985b3760a624ea9ef8e44e5;hpb=5f9b6d3b52c7f8dc10c01782d466a1e8f5ca5f26

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 5249adfc..d07e0e1d 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -118,6 +118,13 @@
 #define SCREEN_KEYBOARD_POS(h)		((h) / 2)
 #endif
 
+// values for drag-and-drop support (some parts not added before SDL 2.0.5)
+#if !SDL_VERSION_ATLEAST(2,0,5)
+#define SDL_DROPTEXT			(SDL_DROPFILE + 1)
+#define SDL_DROPBEGIN			(SDL_DROPFILE + 2)
+#define SDL_DROPCOMPLETE		(SDL_DROPFILE + 3)
+#endif
+
 // default input keys
 #define DEFAULT_KEY_LEFT		KSYM_Left
 #define DEFAULT_KEY_RIGHT		KSYM_Right
@@ -345,11 +352,30 @@
 
 #define STYLE_DEFAULT		STYLE_NONE
 
+// values for special global animation delay types
+#define ANIM_DELAY_UNDEFINED	-1
+#define ANIM_DELAY_NONE		0
+#define ANIM_DELAY_INIT		1
+#define ANIM_DELAY_ANIM		2
+#define ANIM_DELAY_POST		3
+
+// values for special global animation delay actions
+#define ANIM_DELAY_ACTION_NONE	-1
+
 // values for special global animation events
+#define ANIM_EVENT_UNDEFINED	-1
 #define ANIM_EVENT_NONE		0
 #define ANIM_EVENT_SELF		(1 << 16)
 #define ANIM_EVENT_ANY		(1 << 17)
-
+#define ANIM_EVENT_CLICK	(1 << 18)
+#define ANIM_EVENT_INIT		(1 << 19)
+#define ANIM_EVENT_START	(1 << 20)
+#define ANIM_EVENT_END		(1 << 21)
+#define ANIM_EVENT_POST		(1 << 22)
+#define ANIM_EVENT_UNCLICK_ANY	(1 << 23)
+
+// anim number: bits 0-7
+// part number: bits 8-15
 #define ANIM_EVENT_ANIM_BIT	0
 #define ANIM_EVENT_PART_BIT	8
 
@@ -384,6 +410,11 @@
 
 #define FADE_MODE_DEFAULT	FADE_MODE_FADE
 
+#define AUTO_DELAY_UNIT_MS	0
+#define AUTO_DELAY_UNIT_FRAMES	1
+
+#define AUTO_DELAY_UNIT_DEFAULT	AUTO_DELAY_UNIT_MS
+
 // values for toon positions
 #define POS_UNDEFINED		-1
 #define POS_LEFT		0
@@ -443,6 +474,7 @@
 				 y >= gfx.ey && y < gfx.ey + gfx.eysize)
 
 // values for mouse cursor
+#define CURSOR_UNDEFINED	-1
 #define CURSOR_DEFAULT		0
 #define CURSOR_NONE		1
 #define CURSOR_PLAYFIELD	2
@@ -753,6 +785,16 @@
 				 &artwork.mus_first :			\
 				 NULL)
 
+#define TREE_FIRST_NODE(t)	((t) == TREE_TYPE_LEVEL_DIR ?		\
+				 leveldir_first :			\
+				 (t) == TREE_TYPE_GRAPHICS_DIR ?	\
+				 artwork.gfx_first :			\
+				 (t) == TREE_TYPE_SOUNDS_DIR ?		\
+				 artwork.snd_first :			\
+				 (t) == TREE_TYPE_MUSIC_DIR ?		\
+				 artwork.mus_first :			\
+				 NULL)
+
 // values for artwork handling
 #define LEVELDIR_ARTWORK_SET_PTR(leveldir, type)			\
 				((type) == ARTWORK_TYPE_GRAPHICS ?	\
@@ -856,6 +898,13 @@
 				 (type) == ARTWORK_TYPE_MUSIC ?		\
 				 getUserMusicDir() : "")
 
+#define ARTWORK_DEFAULT_SUBDIR(type)					\
+				((type) == ARTWORK_TYPE_GRAPHICS ?	\
+				 GFX_DEFAULT_SUBDIR :			\
+				 (type) == ARTWORK_TYPE_SOUNDS ?	\
+				 SND_DEFAULT_SUBDIR :			\
+				 MUS_DEFAULT_SUBDIR)
+
 #define UPDATE_BUSY_STATE()			\
 {						\
   if (gfx.draw_busy_anim_function != NULL)	\
@@ -918,6 +967,11 @@ struct NetworkInfo
 
 };
 
+struct RuntimeInfo
+{
+  boolean uses_touch_device;
+};
+
 struct OptionInfo
 {
   char *server_host;
@@ -962,6 +1016,7 @@ struct VideoSystemInfo
   int screen_rendering_mode;
   int vsync_mode;
 
+  unsigned int frame_counter;
   unsigned int frame_delay;
   unsigned int frame_delay_value;
 
@@ -1073,6 +1128,9 @@ struct GfxInfo
   void (*draw_tile_cursor_function)(int);
 
   int cursor_mode;
+  int cursor_mode_override;
+  int cursor_mode_final;
+  int mouse_x, mouse_y;
 };
 
 struct TileCursorInfo
@@ -1268,6 +1326,17 @@ struct SetupInternalInfo
 
   boolean choose_from_top_leveldir;
   boolean show_scaling_in_title;
+
+  boolean menu_game;
+  boolean menu_editor;
+  boolean menu_graphics;
+  boolean menu_sound;
+  boolean menu_artwork;
+  boolean menu_input;
+  boolean menu_touch;
+  boolean menu_shortcuts;
+  boolean menu_exit;
+  boolean menu_save_and_exit;
 };
 
 struct SetupDebugInfo
@@ -1621,6 +1690,8 @@ struct TextPosInfo
   int tile_size;		// special case for list of network players
   int border_size;		// special case for list of preview players
   int vertical;			// special case for list of preview players
+
+  boolean redefined;		// redefined by custom artwork
 };
 
 struct MouseActionInfo
@@ -1651,6 +1722,7 @@ struct LevelStats
 
 extern struct ProgramInfo	program;
 extern struct NetworkInfo	network;
+extern struct RuntimeInfo	runtime;
 extern struct OptionInfo	options;
 extern struct VideoSystemInfo	video;
 extern struct AudioSystemInfo	audio;
@@ -1689,6 +1761,7 @@ extern int			FrameCounter;
 void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *,
 		     char *, int);
 void InitNetworkInfo(boolean, boolean, boolean, char *, int);
+void InitRuntimeInfo(void);
 
 void InitScoresInfo(void);
 void SetWindowTitle(void);
@@ -1785,14 +1858,18 @@ void FreeBitmapTextures(Bitmap **);
 void ScaleBitmap(Bitmap **, int);
 
 void SetMouseCursor(int);
+void UpdateRawMousePosition(int, int);
+void UpdateMousePosition(void);
 
 void OpenAudio(void);
 void CloseAudio(void);
 void SetAudioMode(boolean);
 
+void InitEventFilter(EventFilter);
 boolean PendingEvent(void);
 void WaitEvent(Event *event);
 void PeekEvent(Event *event);
+void PumpEvents(void);
 void CheckQuitEvent(void);
 Key GetEventKey(KeyEvent *, boolean);
 KeyMod HandleKeyModState(Key, int);
@@ -1800,7 +1877,7 @@ KeyMod GetKeyModState(void);
 KeyMod GetKeyModStateFromEvents(void);
 void StartTextInput(int, int, int, int);
 void StopTextInput(void);
-boolean CheckCloseWindowEvent(ClientMessageEvent *);
+void PushUserEvent(int, int, int);
 
 void InitJoysticks(void);
 boolean ReadJoystick(int, int *, int *, boolean *, boolean *);