Mercurial > sdl-ios-xcode
view Makefile.dc @ 4393:9afe12fb4c41 SDL-1.2
Fixed bug #901
Tim Angus 2009-12-11 11:45:46 PST
Disable mouse event generation when state is not SDL_APPMOUSEFOCUS
If a Windows SDL application is minimised by using alt-tab, SDL_APPMOUSEFOCUS
is lost as part of the minimisation. Unfortunately, the directx driver doesn't
pay any attention to this state when generating mouse button events, so
clicking on the Desktop can cause mouse clicks in the SDL application, while
it's still minimised. The attached patch fixes this. It looks much more
complicated than it actually is due to indentation; here it is ignoring
whitespace:
tma@abraxas:~/sources/SDL-1.2-svn$ svn diff -x -b
Index: src/video/windx5/SDL_dx5events.c
===================================================================
--- src/video/windx5/SDL_dx5events.c (revision 5376)
+++ src/video/windx5/SDL_dx5events.c (working copy)
@@ -374,10 +374,9 @@
if ( !(SDL_GetAppState() & SDL_APPMOUSEFOCUS) ) {
mouse_lost = 1;
ClipCursor(NULL);
- }
-
+ } else {
/* If the mouse was lost, regain some sense of mouse state */
- if ( mouse_lost && (SDL_GetAppState() & SDL_APPMOUSEFOCUS) ) {
+ if ( mouse_lost ) {
POINT mouse_pos;
Uint8 old_state;
Uint8 new_state;
@@ -548,6 +547,7 @@
if ( xrel || yrel ) {
post_mouse_motion(1, xrel, yrel);
}
+ }
}
/* The main Win32 event handler */
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Mon, 14 Dec 2009 22:41:31 +0000 |
| parents | c8f42ed8805e |
| children | c121d94672cb |
line wrap: on
line source
#GL=1 CC = sh-elf-gcc AR = sh-elf-ar ifdef GL DEFS += -DSDL_VIDEO_OPENGL=1 TARGET = libSDL_gl.a else TARGET = libSDL.a endif CFLAGS=$(KOS_CFLAGS) $(DEFS) -Iinclude SRCS = \ src/audio/dc/SDL_dcaudio.c \ src/audio/dc/aica.c \ src/audio/dummy/SDL_dummyaudio.c \ src/audio/SDL_audio.c \ src/audio/SDL_audiocvt.c \ src/audio/SDL_audiodev.c \ src/audio/SDL_mixer.c \ src/audio/SDL_wave.c \ src/cdrom/dc/SDL_syscdrom.c \ src/cdrom/SDL_cdrom.c \ src/events/SDL_active.c \ src/events/SDL_events.c \ src/events/SDL_expose.c \ src/events/SDL_keyboard.c \ src/events/SDL_mouse.c \ src/events/SDL_quit.c \ src/events/SDL_resize.c \ src/file/SDL_rwops.c \ src/joystick/dc/SDL_sysjoystick.c \ src/joystick/SDL_joystick.c \ src/loadso/dummy/SDL_sysloadso.c \ src/SDL.c \ src/SDL_error.c \ src/SDL_fatal.c \ src/stdlib/SDL_getenv.c \ src/stdlib/SDL_iconv.c \ src/stdlib/SDL_malloc.c \ src/stdlib/SDL_qsort.c \ src/stdlib/SDL_stdlib.c \ src/stdlib/SDL_string.c \ src/thread/dc/SDL_syscond.c \ src/thread/dc/SDL_sysmutex.c \ src/thread/dc/SDL_syssem.c \ src/thread/dc/SDL_systhread.c \ src/thread/SDL_thread.c \ src/timer/dc/SDL_systimer.c \ src/timer/SDL_timer.c \ src/video/dc/SDL_dcevents.c \ src/video/dc/SDL_dcvideo.c \ src/video/dummy/SDL_nullevents.c \ src/video/dummy/SDL_nullmouse.c \ src/video/dummy/SDL_nullvideo.c \ src/video/SDL_blit.c \ src/video/SDL_blit_0.c \ src/video/SDL_blit_1.c \ src/video/SDL_blit_A.c \ src/video/SDL_blit_N.c \ src/video/SDL_bmp.c \ src/video/SDL_cursor.c \ src/video/SDL_gamma.c \ src/video/SDL_pixels.c \ src/video/SDL_RLEaccel.c \ src/video/SDL_stretch.c \ src/video/SDL_surface.c \ src/video/SDL_video.c \ src/video/SDL_yuv.c \ src/video/SDL_yuv_sw.c \ OBJS = $(SRCS:.c=.o) TEST = \ test/checkkeys.c \ test/graywin.c \ test/loopwave.c \ test/testalpha.c \ test/testbitmap.c \ test/testcdrom.c \ test/testerror.c \ test/testgamma.c \ test/testgl.c \ test/testhread.c \ test/testjoystick.c \ test/testkeys.c \ test/testlock.c \ test/testoverlay.c \ test/testpalette.c \ test/testsem.c \ test/testsprite.c \ test/testtimer.c \ test/testtypes.c \ test/testver.c \ test/testvidinfo.c \ test/testwin.c \ test/testwm.c \ test/threadwin.c \ test/torturethread.c \ $(TARGET): copy_config \ $(OBJS) $(AR) rcs $(TARGET) $(OBJS) copy_config: @cp include/SDL_config.h.default include/SDL_config.h clean: rm -f include/SDL_config.h $(OBJS)