Mercurial > sdl-ios-xcode
view src/video/ps2gs/SDL_gsvideo.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" #ifndef _SDL_gsvideo_h #define _SDL_gsvideo_h #include <sys/types.h> #include <termios.h> #include <linux/ps2/dev.h> #include <linux/ps2/gs.h> #include "SDL_mouse.h" #include "SDL_mutex.h" #include "../SDL_sysvideo.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_VideoDevice *this /* Private display data */ struct SDL_PrivateVideoData { /* Gotta love that simple PS2 graphics interface. :) */ int console_fd; int memory_fd; struct ps2_screeninfo saved_vinfo; /* Ye olde linux keyboard code */ int current_vt; int saved_vt; int keyboard_fd; int saved_kbd_mode; struct termios saved_kbd_termios; /* Ye olde linux mouse code */ int mouse_fd; int cursor_drawn; /* The memory mapped DMA area and associated variables */ caddr_t mapped_mem; int pixels_len; int mapped_len; struct ps2_image screen_image; int screen_image_size; unsigned long long *head_tags_mem; unsigned long long *image_tags_mem; unsigned long long *tex_tags_mem; unsigned long long *scale_tags_mem; int dma_pending; }; /* Old variable names */ #define console_fd (this->hidden->console_fd) #define memory_fd (this->hidden->memory_fd) #define saved_vinfo (this->hidden->saved_vinfo) #define current_vt (this->hidden->current_vt) #define saved_vt (this->hidden->saved_vt) #define keyboard_fd (this->hidden->keyboard_fd) #define saved_kbd_mode (this->hidden->saved_kbd_mode) #define saved_kbd_termios (this->hidden->saved_kbd_termios) #define mouse_fd (this->hidden->mouse_fd) #define cursor_drawn (this->hidden->cursor_drawn) #define mapped_mem (this->hidden->mapped_mem) #define pixels_len (this->hidden->pixels_len) #define mapped_len (this->hidden->mapped_len) #define screen_image (this->hidden->screen_image) #define screen_image_size (this->hidden->screen_image_size) #define head_tags_mem (this->hidden->head_tags_mem) #define image_tags_mem (this->hidden->image_tags_mem) #define tex_tags_mem (this->hidden->tex_tags_mem) #define scale_tags_mem (this->hidden->scale_tags_mem) #define dma_pending (this->hidden->dma_pending) /* Shared between the mouse and video code for screen update scaling */ extern int scaleimage_nonblock(int fd, unsigned long long *tm, unsigned long long *sm); #endif /* _SDL_gsvideo_h */