Mercurial > sdl-ios-xcode
view src/audio/mint/SDL_mintaudio_stfa.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 Library General Public License as published by the Free Software Foundation; either version 2 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" /* STFA control structure Patrice Mandin */ #ifndef _SDL_mintaudio_stfa_h #define _SDL_mintaudio_stfa_h /*--- Defines ---*/ #define C_STFA 0x53544641L /* Sound treiber für atari (seb/The removers) */ #define STFA_PLAY_ENABLE (1<<0) #define STFA_PLAY_DISABLE (0<<0) #define STFA_PLAY_REPEAT (1<<1) #define STFA_PLAY_SINGLE (0<<1) #define STFA_FORMAT_SIGNED (1<<15) #define STFA_FORMAT_UNSIGNED (0<<15) #define STFA_FORMAT_STEREO (1<<14) #define STFA_FORMAT_MONO (0<<14) #define STFA_FORMAT_16BIT (1<<13) #define STFA_FORMAT_8BIT (0<<13) #define STFA_FORMAT_LITENDIAN (1<<9) #define STFA_FORMAT_BIGENDIAN (0<<9) #define STFA_FORMAT_FREQ_MASK 0x0f enum { STFA_FORMAT_F4995=0, STFA_FORMAT_F6269, STFA_FORMAT_F7493, STFA_FORMAT_F8192, STFA_FORMAT_F9830, STFA_FORMAT_F10971, STFA_FORMAT_F12538, STFA_FORMAT_F14985, STFA_FORMAT_F16384, STFA_FORMAT_F19819, STFA_FORMAT_F21943, STFA_FORMAT_F24576, STFA_FORMAT_F30720, STFA_FORMAT_F32336, STFA_FORMAT_F43885, STFA_FORMAT_F49152 }; /*--- Types ---*/ typedef struct { unsigned short sound_enable; unsigned short sound_control; unsigned short sound_output; unsigned long sound_start; unsigned long sound_current; unsigned long sound_end; unsigned short version; void *old_vbl; void *old_timera; unsigned long old_mfp_status; void *new_vbl; void *drivers_list; void *play_stop; unsigned short frequency; void *set_frequency; unsigned short frequency_threshold; unsigned short *custom_freq_table; unsigned short stfa_on_off; void *new_drivers_list; unsigned long old_bit_2_of_cookie_snd; void (*stfa_it)(void); } cookie_stfa_t __attribute__((packed)); #endif /* _SDL_mintaudio_stfa_h */