annotate src/video/caca/SDL_cacavideo.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 d1c0ac95d023
children
rev   line source
4315
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
1 /*
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
2 SDL - Simple DirectMedia Layer
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
3 Copyright (C) 2003 Sam Hocevar
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
4
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
5 This library is free software; you can redistribute it and/or
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
6 modify it under the terms of the GNU Library General Public
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
7 License as published by the Free Software Foundation; either
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
8 version 2 of the License, or (at your option) any later version.
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
9
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
10 This library is distributed in the hope that it will be useful,
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
13 Library General Public License for more details.
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
14
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
15 You should have received a copy of the GNU Library General Public
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
16 License along with this library; if not, write to the Free
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
18
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
19 Sam Hocevar
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
20 sam@zoy.org
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
21 */
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
22
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
23 #ifdef SAVE_RCSID
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
24 static char rcsid =
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
25 "@(#) $Id: libsdl-1.2.11-libcaca.patch,v 1.1 2006/09/18 16:06:06 mr_bones_ Exp $";
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
26 #endif
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
27
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
28 #ifndef _SDL_cacavideo_h
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
29 #define _SDL_cacavideo_h
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
30
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
31 #include "SDL_mouse.h"
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
32 #include "../SDL_sysvideo.h"
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
33 #include "SDL_mutex.h"
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
34
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
35 #include <sys/time.h>
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
36 #include <time.h>
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
37
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
38 #include <caca.h>
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
39 #ifdef CACA_API_VERSION_1
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
40 #include <caca0.h>
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
41 #endif
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
42
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
43 /* Hidden "this" pointer for the video functions */
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
44 #define _THIS SDL_VideoDevice *this
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
45
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
46 #define SDL_NUMMODES 6
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
47
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
48 /* Private display data */
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
49 struct SDL_PrivateVideoData {
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
50 SDL_Rect *SDL_modelist[SDL_NUMMODES+1];
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
51 SDL_mutex *mutex;
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
52
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
53 struct caca_bitmap *bitmap;
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
54 void *buffer;
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
55 int w, h;
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
56
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
57 int lastkey;
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
58 struct timeval lasttime;
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
59 };
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
60
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
61 /* Old variable names */
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
62 #define SDL_modelist (this->hidden->SDL_modelist)
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
63 #define Caca_palette (this->hidden->palette)
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
64 #define Caca_bitmap (this->hidden->bitmap)
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
65 #define Caca_buffer (this->hidden->buffer)
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
66
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
67 #define Caca_w (this->hidden->w)
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
68 #define Caca_h (this->hidden->h)
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
69
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
70 #define Caca_lastkey (this->hidden->lastkey)
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
71 #define Caca_lasttime (this->hidden->lasttime)
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
72
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
73 #define Caca_mutex (this->hidden->mutex)
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
74
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
75 #endif /* _SDL_cacavideo_h */
d1c0ac95d023 Added missing caca files
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
76