Mercurial > sdl-ios-xcode
annotate src/video/bwindow/SDL_BView.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 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
| 4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
| 0 | 7 License as published by the Free Software Foundation; either |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
| 0 | 9 |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
13 Lesser General Public License for more details. |
| 0 | 14 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 18 |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
114
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
|
756
10332c6fad2e
te: Mon, 15 Dec 2003 08:25:14 -0800 PST
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
24 #ifndef _SDL_BView_h |
|
10332c6fad2e
te: Mon, 15 Dec 2003 08:25:14 -0800 PST
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
25 #define _SDL_BView_h |
|
10332c6fad2e
te: Mon, 15 Dec 2003 08:25:14 -0800 PST
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
26 |
| 0 | 27 /* This is the event handling and graphics update portion of SDL_BWin */ |
| 28 | |
| 29 extern "C" { | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
30 #include "../../events/SDL_events_c.h" |
| 0 | 31 }; |
| 32 | |
| 33 class SDL_BView : public BView | |
| 34 { | |
| 35 public: | |
| 36 SDL_BView(BRect frame) : | |
| 37 BView(frame, "SDL View", B_FOLLOW_ALL_SIDES, | |
| 38 (B_WILL_DRAW|B_FRAME_EVENTS)) { | |
| 39 image = NULL; | |
| 4012 | 40 xoff = yoff = 0; |
| 0 | 41 SetViewColor(0,0,0,0); |
| 42 SetHighColor(0,0,0,0); | |
| 43 } | |
| 44 virtual ~SDL_BView() { | |
| 45 SetBitmap(NULL); | |
| 46 } | |
| 4012 | 47 /* Set drawing offsets for fullscreen mode */ |
| 48 virtual void SetXYOffset(int x, int y) { | |
| 49 xoff = x; | |
| 50 yoff = y; | |
| 51 } | |
| 52 virtual void GetXYOffset(int &x, int &y) { | |
| 53 x = xoff; | |
| 54 y = yoff; | |
| 55 } | |
| 56 virtual void GetXYOffset(float &x, float &y) { | |
| 57 x = (float)xoff; | |
| 58 y = (float)yoff; | |
| 59 } | |
| 0 | 60 /* The view changed size. If it means we're in fullscreen, we |
| 61 * draw a nice black box in the entire view to get black borders. | |
| 62 */ | |
| 63 virtual void FrameResized(float width, float height) { | |
| 64 BRect bounds; | |
| 65 bounds.top = bounds.left = 0; | |
| 66 bounds.right = width; | |
| 67 bounds.bottom = height; | |
| 68 /* Fill the entire view with black */ | |
| 4012 | 69 FillRect(bounds, B_SOLID_HIGH); |
| 0 | 70 /* And if there's an image, redraw it. */ |
| 71 if( image ) { | |
| 72 bounds = image->Bounds(); | |
| 73 Draw(bounds); | |
| 74 } | |
| 75 } | |
| 4012 | 76 |
| 0 | 77 /* Drawing portion of this complete breakfast. :) */ |
| 78 virtual void SetBitmap(BBitmap *bitmap) { | |
| 79 if ( image ) { | |
| 80 delete image; | |
| 81 } | |
| 82 image = bitmap; | |
| 83 } | |
| 84 virtual void Draw(BRect updateRect) { | |
| 85 if ( image ) { | |
| 4012 | 86 if(xoff || yoff) { |
| 87 BRect dest; | |
| 88 dest.top = updateRect.top + yoff; | |
| 89 dest.left = updateRect.left + xoff; | |
| 90 dest.bottom = updateRect.bottom + yoff; | |
| 91 dest.right = updateRect.right + xoff; | |
| 92 DrawBitmap(image, updateRect, dest); | |
| 93 } else { | |
| 94 DrawBitmap(image, updateRect, updateRect); | |
| 95 } | |
| 0 | 96 } |
| 97 } | |
| 98 virtual void DrawAsync(BRect updateRect) { | |
| 4012 | 99 if(xoff || yoff) { |
| 100 BRect dest; | |
| 101 dest.top = updateRect.top + yoff; | |
| 102 dest.left = updateRect.left + xoff; | |
| 103 dest.bottom = updateRect.bottom + yoff; | |
| 104 dest.right = updateRect.right + xoff;; | |
| 105 DrawBitmapAsync(image, updateRect, dest); | |
| 106 } else { | |
| 0 | 107 DrawBitmapAsync(image, updateRect, updateRect); |
| 108 } | |
| 109 } | |
| 110 | |
| 111 private: | |
| 112 BBitmap *image; | |
| 4012 | 113 int xoff, yoff; |
| 0 | 114 }; |
|
756
10332c6fad2e
te: Mon, 15 Dec 2003 08:25:14 -0800 PST
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
115 |
|
10332c6fad2e
te: Mon, 15 Dec 2003 08:25:14 -0800 PST
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
116 #endif /* _SDL_BView_h */ |