Mercurial > sdl-ios-xcode
view src/video/qtopia/SDL_QWin.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_QWin_h #define _SDL_QWin_h #include <stdio.h> #include <qimage.h> #include <qpixmap.h> #include <qwidget.h> #include <qpainter.h> #include <qdirectpainter_qws.h> #include "SDL_events.h" extern "C" { #include "../../events/SDL_events_c.h" }; typedef enum { SDL_QT_NO_ROTATION = 0, SDL_QT_ROTATION_90, SDL_QT_ROTATION_270 } screenRotationT; extern screenRotationT screenRotation; class SDL_QWin : public QWidget { void QueueKey(QKeyEvent *e, int pressed); public: SDL_QWin(const QSize& size); virtual ~SDL_QWin(); virtual bool shown(void) { return isVisible(); } /* If called, the next resize event will not be forwarded to SDL. */ virtual void inhibitResize(void) { my_inhibit_resize = true; } void setImage(QImage *image); void setOffset(int x, int y) { my_offset = QPoint(x, y); } void GetXYOffset(int &x, int &y) { x = my_offset.x(); y = my_offset.y(); } QImage *image(void) { return my_image; } void setWFlags(WFlags flags) { QWidget::setWFlags(flags); my_flags = flags; } const QPoint& mousePos() const { return my_mouse_pos; } void setMousePos(const QPoint& newpos); void setFullscreen(bool); bool lockScreen(bool force=false); void unlockScreen(); void repaintRect(const QRect& rect); protected: /* Handle resizing of the window */ virtual void resizeEvent(QResizeEvent *e); void focusInEvent(QFocusEvent *); void focusOutEvent(QFocusEvent *); void closeEvent(QCloseEvent *e); void mouseMoveEvent(QMouseEvent *e); void mousePressEvent(QMouseEvent *e); void mouseReleaseEvent(QMouseEvent *e); void paintEvent(QPaintEvent *ev); void keyPressEvent(QKeyEvent *e) { QueueKey(e, 1); } void keyReleaseEvent(QKeyEvent *e) { QueueKey(e, 0); } private: bool repaintRotation0(const QRect& rect); bool repaintRotation1(const QRect& rect); bool repaintRotation3(const QRect& rect); void enableFullscreen(); QDirectPainter *my_painter; QImage *my_image; bool my_inhibit_resize; QPoint my_offset; QPoint my_mouse_pos; WFlags my_flags; WFlags my_has_fullscreen; unsigned int my_locked; }; #endif /* _SDL_QWin_h */