X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsdl.h;h=ad7dca8c1a95ee9cdf4535838be523469ead2c0f;hp=4f9ced82a7cc193a6a2561c01b0cf9631f9af740;hb=aaa6bf53eceb4c7801966a017dcc8a57c2fdface;hpb=d3e24bbfb70edb9a805806345eede28c7129baf8

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index 4f9ced82..ad7dca8c 100644
--- a/src/libgame/sdl.h
+++ b/src/libgame/sdl.h
@@ -64,9 +64,8 @@ typedef SDL_TextInputEvent	TextEvent;
 typedef SDL_Event		PauseResumeEvent;
 typedef SDL_WindowEvent		WindowEvent;
 typedef SDL_KeyboardEvent	KeyEvent;
-typedef SDL_Event		ExposeEvent;
-typedef SDL_Event		FocusChangeEvent;
-typedef SDL_Event		ClientMessageEvent;
+
+typedef SDL_EventFilter		EventFilter;
 
 
 // structure definitions
@@ -91,6 +90,21 @@ struct MouseCursorInfo
   byte mask[CURSOR_MAX_WIDTH * CURSOR_MAX_HEIGHT / 8];
 };
 
+struct UserEventInfo
+{
+  // same as in "struct SDL_UserEvent"
+  Uint32 type;
+  Uint32 timestamp;
+  Uint32 windowID;
+  Sint32 code;
+
+  // changed to use integer values instead of void pointers
+  Uint32 value1;
+  Uint32 value2;
+};
+
+typedef struct UserEventInfo	UserEvent;
+
 
 // SDL symbol definitions
 
@@ -109,12 +123,8 @@ struct MouseCursorInfo
 #define EVENT_TEXTINPUT		SDL_TEXTINPUT
 #define EVENT_KEYPRESS		SDL_KEYDOWN
 #define EVENT_KEYRELEASE	SDL_KEYUP
-#define EVENT_EXPOSE		SDL_USEREVENT + 0
-#define EVENT_FOCUSIN		SDL_USEREVENT + 1
-#define EVENT_FOCUSOUT		SDL_USEREVENT + 2
-#define EVENT_CLIENTMESSAGE	SDL_QUIT
-#define EVENT_MAPNOTIFY		SDL_USEREVENT + 4
-#define EVENT_UNMAPNOTIFY	SDL_USEREVENT + 5
+#define EVENT_USER		SDL_USEREVENT
+#define EVENT_QUIT		SDL_QUIT
 
 #define KSYM_UNDEFINED		SDLK_UNKNOWN
 
@@ -413,7 +423,7 @@ void SDLOpenAudio(void);
 void SDLCloseAudio(void);
 
 void SDLWaitEvent(Event *);
-void SDLHandleWindowManagerEvent(Event *);
+void SDLCorrectRawMousePosition(int *, int *);
 
 void HandleJoystickEvent(Event *);
 void SDLInitJoysticks(void);