Mercurial > sdl-ios-xcode
view src/audio/mint/SDL_mintaudio_gsxb.h @ 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 | a1b03ba2fcd0 |
children |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2009 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" /* * GSXB audio definitions * * Patrice Mandin */ #ifndef _SDL_mintaudio_gsxb_h #define _SDL_mintaudio_gsxb_h #include <mint/falcon.h> /* for trap_14_xxx macros */ /* GSXB Cookie */ #define C_GSXB 0x47535842L /* Bit 5 in cookie _SND */ #define SND_GSXB (1<<5) /* NSoundcmd modes */ #define SETRATE 7 /* Set sample rate */ #define SET8BITFORMAT 8 /* 8 bits format */ #define SET16BITFORMAT 9 /* 16 bits format */ #define SET24BITFORMAT 10 /* 24 bits format */ #define SET32BITFORMAT 11 /* 32 bits format */ #define LTATTEN_MASTER 12 /* Attenuation */ #define RTATTEN_MASTER 13 #define LTATTEN_MICIN 14 #define RTATTEN_MICIN 15 #define LTATTEN_FMGEN 16 #define RTATTEN_FMGEN 17 #define LTATTEN_LINEIN 18 #define RTATTEN_LINEIN 19 #define LTATTEN_CDIN 20 #define RTATTEN_CDIN 21 #define LTATTEN_VIDIN 22 #define RTATTEN_VIDIN 23 #define LTATTEN_AUXIN 24 #define RTATTEN_AUXIN 25 /* Setmode modes */ #define MONO16 3 #define STEREO24 4 #define STEREO32 5 #define MONO24 6 #define MONO32 7 /* Sndstatus modes */ #define SND_QUERYFORMATS 2 #define SND_QUERYMIXERS 3 #define SND_QUERYSOURCES 4 #define SND_QUERYDUPLEX 5 #define SND_QUERY8BIT 8 #define SND_QUERY16BIT 9 #define SND_QUERY24BIT 10 #define SND_QUERY32BIT 11 #define SND_FORMAT8 (1<<0) #define SND_FORMAT16 (1<<1) #define SND_FORMAT24 (1<<2) #define SND_FORMAT32 (1<<3) #define SND_FORMATSIGNED (1<<0) #define SND_FORMATUNSIGNED (1<<1) #define SND_FORMATBIGENDIAN (1<<2) #define SND_FORMATLITTLEENDIAN (1<<3) /* Devconnect prescalers */ #define CLK_44K 1 #define CLK_22K 3 #define CLK_11K 7 /* Extra xbios functions */ #define NSoundcmd(mode,data,data2) \ (long)trap_14_wwl((short)130,(short)(mode),(short)(data),(long)(data2)) #define NSetinterrupt(src_inter,cause,inth_addr) \ (long)trap_14_wwwl((short)135,(short)(src_inter),(short)(cause), \ (long)(inth_addr)) #endif /* _SDL_mintaudio_gsxb_h */