projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed handling clickable global animations during request dialog
[rocksndiamonds.git]
/
src
/
libgame
/
sdl.h
diff --git
a/src/libgame/sdl.h
b/src/libgame/sdl.h
index 4f9ced82a7cc193a6a2561c01b0cf9631f9af740..ad7dca8c1a95ee9cdf4535838be523469ead2c0f 100644
(file)
--- 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 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
// structure definitions
@@
-91,6
+90,21
@@
struct MouseCursorInfo
byte mask[CURSOR_MAX_WIDTH * CURSOR_MAX_HEIGHT / 8];
};
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
// 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_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
#define KSYM_UNDEFINED SDLK_UNKNOWN
@@
-413,7
+423,7
@@
void SDLOpenAudio(void);
void SDLCloseAudio(void);
void SDLWaitEvent(Event *);
void SDLCloseAudio(void);
void SDLWaitEvent(Event *);
-void SDL
HandleWindowManagerEvent(Eve
nt *);
+void SDL
CorrectRawMousePosition(int *, i
nt *);
void HandleJoystickEvent(Event *);
void SDLInitJoysticks(void);
void HandleJoystickEvent(Event *);
void SDLInitJoysticks(void);