X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=a5e0b22eba295bc28cd03645f49bcbaec44e293f;hb=4096fcbae692bfbf2f6506786659872a60b31693;hp=a73f8a4653cc04836faaf245ff72fe5f121122ce;hpb=75add713b14147fbd222c48504c4e797f3125286;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index a73f8a46..a5e0b22e 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -43,6 +43,7 @@
 #define BLIT_OPAQUE		0
 #define BLIT_MASKED		1
 #define BLIT_INVERSE		2
+#define BLIT_ON_BACKGROUND	3
 
 #define FULLSCREEN_NOT_AVAILABLE FALSE
 #define FULLSCREEN_AVAILABLE	 TRUE
@@ -67,21 +68,46 @@
 #define DEFAULT_KEY_LOAD_GAME	KSYM_F2
 #define DEFAULT_KEY_TOGGLE_PAUSE KSYM_space
 
+/* values for key_status */
+#define KEY_NOT_PRESSED		FALSE
+#define KEY_RELEASED		FALSE
+#define KEY_PRESSED		TRUE
 
-/* values for move directions and special "button" keys */
+/* values for button status */
+#define MB_NOT_PRESSED		FALSE
+#define MB_NOT_RELEASED		TRUE
+#define MB_RELEASED		FALSE
+#define MB_PRESSED		TRUE
+#define MB_MENU_CHOICE		FALSE
+#define MB_MENU_MARK		TRUE
+#define MB_MENU_INITIALIZE	(-1)
+#define MB_MENU_LEAVE		(-2)
+#define MB_LEFTBUTTON		1
+#define MB_MIDDLEBUTTON		2
+#define MB_RIGHTBUTTON		3
+
+
+/* values for move directions */
 #define MV_BIT_LEFT		0
 #define MV_BIT_RIGHT		1
 #define MV_BIT_UP		2
 #define MV_BIT_DOWN	       	3
+
 #define NUM_DIRECTIONS		4
 
+/* values for special "button" bitmasks */
+#define BUTTON_1		4
+#define BUTTON_2		5
+
+/* values for move direction and special "button" key bitmasks */
 #define MV_NO_MOVING		0
 #define MV_LEFT			(1 << MV_BIT_LEFT)
 #define MV_RIGHT		(1 << MV_BIT_RIGHT)
 #define MV_UP			(1 << MV_BIT_UP)
 #define MV_DOWN	       		(1 << MV_BIT_DOWN)
-#define KEY_BUTTON_1		(1 << 4)
-#define KEY_BUTTON_2		(1 << 5)
+
+#define KEY_BUTTON_1		(1 << BUTTON_1)
+#define KEY_BUTTON_2		(1 << BUTTON_2)
 #define KEY_MOTION		(MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN)
 #define KEY_BUTTON		(KEY_BUTTON_1 | KEY_BUTTON_2)
 #define KEY_ACTION		(KEY_MOTION | KEY_BUTTON)
@@ -91,20 +117,6 @@
 				 (x) == MV_UP    ? MV_BIT_UP    : MV_BIT_DOWN)
 
 
-/* values for button status */
-#define MB_NOT_PRESSED		FALSE
-#define MB_NOT_RELEASED		TRUE
-#define MB_RELEASED		FALSE
-#define MB_PRESSED		TRUE
-#define MB_MENU_CHOICE		FALSE
-#define MB_MENU_MARK		TRUE
-#define MB_MENU_INITIALIZE	(-1)
-#define MB_MENU_LEAVE		(-2)
-#define MB_LEFTBUTTON		1
-#define MB_MIDDLEBUTTON		2
-#define MB_RIGHTBUTTON		3
-
-
 /* values for animation mode (frame order and direction) */
 #define ANIM_NONE		0
 #define ANIM_LOOP		(1 << 0)
@@ -192,6 +204,7 @@
 #define LEVELS_DIRECTORY	"levels"
 #define TAPES_DIRECTORY		"tapes"
 #define SCORES_DIRECTORY	"scores"
+#define DOCS_DIRECTORY		"docs"
 
 #if !defined(PLATFORM_MSDOS)
 #define GRAPHICS_SUBDIR		"gfx_classic"
@@ -223,18 +236,22 @@
 #define DOOR_GFX_PAGEY2		(gfx.dysize)
 
 /* functions for version handling */
-#define VERSION_IDENT(x,y,z)	((x) * 10000 + (y) * 100 + (z))
-#define VERSION_MAJOR(x)	((x) / 10000)
-#define VERSION_MINOR(x)	(((x) % 10000) / 100)
-#define VERSION_PATCH(x)	((x) % 100)
+#define VERSION_IDENT(x,y,z)	((x) * 1000000 + (y) * 10000 + (z) * 100)
+#define RELEASE_IDENT(x,y,z,r)	(VERSION_IDENT(x,y,z) + (r))
+#define VERSION_MAJOR(x)	((x) / 1000000)
+#define VERSION_MINOR(x)	(((x) % 1000000) / 10000)
+#define VERSION_PATCH(x)	(((x) % 10000) / 100)
+#define VERSION_RELEASE(x)	((x) % 100)
 
 /* functions for parent/child process identification */
 #if defined(PLATFORM_UNIX)
 #define IS_PARENT_PROCESS()	(audio.mixer_pid != getpid())
 #define IS_CHILD_PROCESS()	(audio.mixer_pid == getpid())
+#define HAS_CHILD_PROCESS()	(audio.mixer_pid > 0)
 #else
 #define IS_PARENT_PROCESS()	TRUE
 #define IS_CHILD_PROCESS()	FALSE
+#define HAS_CHILD_PROCESS()	FALSE
 #endif
 
 /* type definitions */
@@ -278,6 +295,7 @@ struct OptionInfo
   char *graphics_directory;
   char *sounds_directory;
   char *music_directory;
+  char *docs_directory;
   char *execute_command;
 
   boolean serveronly;
@@ -324,7 +342,6 @@ struct FontBitmapInfo
 
 #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
   Pixmap *clip_mask;		/* single-char-only clip mask array for X11 */
-  int last_num_chars;		/* to free last font clip masks */
 #endif
 };
 
@@ -353,7 +370,6 @@ struct GfxInfo
   int num_fonts;
   struct FontBitmapInfo *font_bitmap_info;
   int (*select_font_function)(int);
-  Pixel inverse_text_color;
 
   int anim_random_frame;
 };
@@ -529,6 +545,12 @@ struct ArtworkInfo
   char *mus_current_identifier;
 };
 
+struct ValueTextInfo
+{
+  int value;
+  char *text;
+};
+
 struct ConfigInfo
 {
   char *token;
@@ -536,6 +558,12 @@ struct ConfigInfo
   int type;
 };
 
+struct TokenIntPtrInfo
+{
+  char *token;
+  int *value;
+};
+
 struct FileInfo
 {
   char *token;
@@ -653,8 +681,8 @@ void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *,
 		     char *, char *, char *, int);
 
 void InitExitFunction(void (*exit_function)(int));
-void InitPlatformDependantStuff(void);
-void ClosePlatformDependantStuff(void);
+void InitPlatformDependentStuff(void);
+void ClosePlatformDependentStuff(void);
 
 void InitGfxFieldInfo(int, int, int, int, int, int, int, int, Bitmap *);
 void InitGfxDoor1Info(int, int, int, int);
@@ -712,6 +740,8 @@ inline void InitEventFilter(EventFilter);
 inline boolean PendingEvent(void);
 inline void NextEvent(Event *event);
 inline Key GetEventKey(KeyEvent *, boolean);
+inline KeyMod HandleKeyModState(Key, int);
+inline KeyMod GetKeyModState();
 inline boolean CheckCloseWindowEvent(ClientMessageEvent *);
 
 inline void InitJoysticks();