Mercurial > sdl-ios-xcode
view src/video/gem/SDL_gemmouse.c @ 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" /* * GEM Mouse manager * * Patrice Mandin */ #include <gem.h> #include "SDL_mouse.h" #include "../../events/SDL_events_c.h" #include "../SDL_cursor_c.h" #include "SDL_gemmouse_c.h" #include "SDL_gemvideo.h" /* Defines */ /*#define DEBUG_VIDEO_GEM 1*/ #define MAXCURWIDTH 16 #define MAXCURHEIGHT 16 void GEM_FreeWMCursor(_THIS, WMcursor *cursor) { #ifdef DEBUG_VIDEO_GEM printf("sdl:video:gem: free cursor\n"); #endif if (cursor == NULL) return; graf_mouse(ARROW, NULL); if (cursor->mform_p != NULL) SDL_free(cursor->mform_p); SDL_free(cursor); } WMcursor *GEM_CreateWMCursor(_THIS, Uint8 *data, Uint8 *mask, int w, int h, int hot_x, int hot_y) { WMcursor *cursor; MFORM *new_mform; int i; #ifdef DEBUG_VIDEO_GEM Uint16 *data1, *mask1; printf("sdl:video:gem: create cursor\n"); #endif /* Check the size */ if ( (w > MAXCURWIDTH) || (h > MAXCURHEIGHT) ) { SDL_SetError("Only cursors of dimension (%dx%d) are allowed", MAXCURWIDTH, MAXCURHEIGHT); return(NULL); } /* Allocate the cursor memory */ cursor = (WMcursor *)SDL_malloc(sizeof(WMcursor)); if ( cursor == NULL ) { SDL_OutOfMemory(); return(NULL); } /* Allocate mform */ new_mform = (MFORM *)SDL_malloc(sizeof(MFORM)); if (new_mform == NULL) { SDL_free(cursor); SDL_OutOfMemory(); return(NULL); } cursor->mform_p = new_mform; new_mform->mf_xhot = hot_x; new_mform->mf_yhot = hot_y; new_mform->mf_nplanes = 1; new_mform->mf_fg = 0; new_mform->mf_bg = 1; for (i=0;i<MAXCURHEIGHT;i++) { new_mform->mf_mask[i]=0; new_mform->mf_data[i]=0; #ifdef DEBUG_VIDEO_GEM data1 = (Uint16 *) &data[i<<1]; mask1 = (Uint16 *) &mask[i<<1]; printf("sdl:video:gem: source: line %d: data=0x%04x, mask=0x%04x\n", i, data1[i], mask1[i]); #endif } if (w<=8) { for (i=0;i<h;i++) { new_mform->mf_mask[i]= mask[i]<<8; new_mform->mf_data[i]= data[i]<<8; } } else { for (i=0;i<h;i++) { new_mform->mf_mask[i]= (mask[i<<1]<<8) | mask[(i<<1)+1]; new_mform->mf_data[i]= (data[i<<1]<<8) | data[(i<<1)+1]; } } #ifdef DEBUG_VIDEO_GEM for (i=0; i<h ;i++) { printf("sdl:video:gem: cursor: line %d: data=0x%04x, mask=0x%04x\n", i, new_mform->mf_data[i], new_mform->mf_mask[i]); } printf("sdl:video:gem: CreateWMCursor(): done\n"); #endif return cursor; } int GEM_ShowWMCursor(_THIS, WMcursor *cursor) { GEM_cursor = cursor; GEM_CheckMouseMode(this); #ifdef DEBUG_VIDEO_GEM printf("sdl:video:gem: ShowWMCursor(0x%08x)\n", (long) cursor); #endif return 1; } #if 0 void GEM_WarpWMCursor(_THIS, Uint16 x, Uint16 y) { /* This seems to work only on AES 3.4 (Falcon) */ EVNTREC warpevent; warpevent.ap_event = APPEVNT_MOUSE; warpevent.ap_value = (x << 16) | y; appl_tplay(&warpevent, 1, 1000); } #endif void GEM_CheckMouseMode(_THIS) { const Uint8 full_focus = (SDL_APPACTIVE|SDL_APPINPUTFOCUS|SDL_APPMOUSEFOCUS); int set_system_cursor = 1, show_system_cursor = 1; #ifdef DEBUG_VIDEO_GEM printf("sdl:video:gem: check mouse mode\n"); #endif /* If the mouse is hidden and input is grabbed, we use relative mode */ GEM_mouse_relative = (!(SDL_cursorstate & CURSOR_VISIBLE)) && (this->input_grab != SDL_GRAB_OFF) && (SDL_GetAppState() & SDL_APPACTIVE); SDL_AtariXbios_LockMousePosition(GEM_mouse_relative); if (SDL_cursorstate & CURSOR_VISIBLE) { /* Application defined cursor only over the application window */ if ((SDL_GetAppState() & full_focus) == full_focus) { if (GEM_cursor) { graf_mouse(USER_DEF, GEM_cursor->mform_p); set_system_cursor = 0; } else { show_system_cursor = 0; } } } else { /* Mouse cursor hidden only over the application window */ if ((SDL_GetAppState() & full_focus) == full_focus) { set_system_cursor = 0; show_system_cursor = 0; } } graf_mouse(show_system_cursor ? M_ON : M_OFF, NULL); if (set_system_cursor) { graf_mouse(ARROW, NULL); } }