Mercurial > sdl-ios-xcode
view src/video/qtopia/SDL_QWin.h @ 4427:eada7e321df6 SDL-1.2
Fixed bug #943
Ozkan Sezer 2010-02-06 12:31:06 PST
Hi:
Here are some small fixes for compiling SDL against mingw-w64.
(see http://mingw-w64.sourceforge.net/ . Despite the name, it
supports both win32 and win64.) Two patches, one for SDL-1.2
and one for SDL-1.3 attached.
src/audio/windx5/directx.h and src/video/windx5/directx.h (both
SDL-1.2 and SDL-1.3.) I get compilation errors about some union
not having a member named u1 and alike, because of other system
headers being included before this one and them already defining
DUMMYUNIONNAME and stuff. This header probably assumes that those
stuff are defined in windef.h, but mingw-w64 headers define them
in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to
the top of the file. SDL_dx5yuv.c (SDL-1.2-only) also needs to
include the header before SDL_video.h to avoid the same problem.
src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) :
The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric
because _beginthreadex returns uintptr_t, not unsigned long which
is 32 bits in win64. Changing the return type to uintptr_t fixes
it.
Hope these are useful. Thanks.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 10 Mar 2010 15:04:13 +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 */