ubergames/ioef
0
0
Fork 0
mirror of https://github.com/UberGames/ioef.git synced 2024-11-24 13:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

* The latest round of SDL tweaks

Browse source
This commit is contained in:
Tim Angus 2008-09-01 21:22:41 +00:00
parent 9dd887b2ea
commit b6b19caadd
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
misc/sdl-win32-fixes.diff
View file

@ -171,7 +171,17 @@ Index: src/video/wincommon/SDL_sysmouse.c
=================================================================== ===================================================================
--- src/video/wincommon/SDL_sysmouse.c (revision 4067) --- src/video/wincommon/SDL_sysmouse.c (revision 4067)
+++ src/video/wincommon/SDL_sysmouse.c (working copy) +++ src/video/wincommon/SDL_sysmouse.c (working copy)
@@ -208,15 +208,20 @@ @@ -188,8 +188,7 @@
{
POINT mouse_pos;
- /* The fullscreen cursor must be done in software with DirectInput */
- if ( !this->screen || DDRAW_FULLSCREEN() ) {
+ if ( !this->screen ) {
return(0);
}
@@ -208,15 +207,20 @@
void WIN_WarpWMCursor(_THIS, Uint16 x, Uint16 y) void WIN_WarpWMCursor(_THIS, Uint16 x, Uint16 y)
{ {
@ -195,7 +205,7 @@ Index: src/video/wincommon/SDL_sysmouse.c
pt.x = x; pt.x = x;
pt.y = y; pt.y = y;
ClientToScreen(SDL_Window, &pt); ClientToScreen(SDL_Window, &pt);
@@ -227,20 +232,15 @@ @@ -227,20 +231,15 @@
/* Update the current mouse state and position */ /* Update the current mouse state and position */
void WIN_UpdateMouse(_THIS) void WIN_UpdateMouse(_THIS)
{ {
@ -251,7 +261,7 @@ Index: src/video/windib/SDL_dibevents.c
+ SetCursorPos(center.x, center.y); + SetCursorPos(center.x, center.y);
+ posted = SDL_PrivateMouseMotion(0, 1, mouse.x, mouse.y); + posted = SDL_PrivateMouseMotion(0, 1, mouse.x, mouse.y);
+ } + }
+ } else { + } else if ( SDL_GetAppState() & SDL_APPMOUSEFOCUS ) {
+ ScreenToClient(SDL_Window, &mouse); + ScreenToClient(SDL_Window, &mouse);
+#ifdef _WIN32_WCE +#ifdef _WIN32_WCE
+ if (SDL_VideoSurface) + if (SDL_VideoSurface)
@ -288,7 +298,7 @@ Index: src/video/windx5/SDL_dx5events.c
=================================================================== ===================================================================
--- src/video/windx5/SDL_dx5events.c (revision 4067) --- src/video/windx5/SDL_dx5events.c (revision 4067)
+++ src/video/windx5/SDL_dx5events.c (working copy) +++ src/video/windx5/SDL_dx5events.c (working copy)
@@ -143,7 +143,12 @@ @@ -143,9 +143,14 @@
(DISCL_FOREGROUND|DISCL_NONEXCLUSIVE), (DISCL_FOREGROUND|DISCL_NONEXCLUSIVE),
(DISCL_FOREGROUND|DISCL_NONEXCLUSIVE), handle_keyboard }, (DISCL_FOREGROUND|DISCL_NONEXCLUSIVE), handle_keyboard },
{ "mouse", { "mouse",
@ -300,8 +310,11 @@ Index: src/video/windx5/SDL_dx5events.c
+ &c_dfDIMouse, + &c_dfDIMouse,
+#endif +#endif
(DISCL_FOREGROUND|DISCL_NONEXCLUSIVE), (DISCL_FOREGROUND|DISCL_NONEXCLUSIVE),
(DISCL_FOREGROUND|DISCL_EXCLUSIVE), handle_mouse }, - (DISCL_FOREGROUND|DISCL_EXCLUSIVE), handle_mouse },
+ (DISCL_FOREGROUND|DISCL_NONEXCLUSIVE), handle_mouse },
{ NULL, NULL, NULL, 0, 0, NULL } { NULL, NULL, NULL, 0, 0, NULL }
};
@@ -285,6 +290,76 @@ @@ -285,6 +290,76 @@
} }
} }