Mercurial > sdl-ios-xcode
annotate src/video/SDL_video.c @ 3282:10a12f77f597
Oh yeah, need this option for PPC as well now.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sun, 20 Sep 2009 04:13:23 +0000 |
| parents | 00cace2d9080 |
| children | 1ed5d432e468 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
| 2859 | 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:
1296
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:
1296
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:
1296
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:
1296
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:
1296
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:
1296
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:
229
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:
1385
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
| 24 /* The high-level video driver subsystem */ | |
| 25 | |
|
2999
b2025ca5d7a5
Fixed missing include for SDL_INIT_EVENTTHREAD
Sam Lantinga <slouken@libsdl.org>
parents:
2984
diff
changeset
|
26 #include "SDL.h" |
|
2984
0b160c970b7e
Fixed some dependency issues with SDL_revision.h
Sam Lantinga <slouken@libsdl.org>
parents:
2967
diff
changeset
|
27 #include "SDL_video.h" |
| 0 | 28 #include "SDL_sysvideo.h" |
| 29 #include "SDL_blit.h" | |
| 30 #include "SDL_pixels_c.h" | |
|
1918
092bd3a019c5
Starting on the OpenGL renderer...
Sam Lantinga <slouken@libsdl.org>
parents:
1913
diff
changeset
|
31 #include "SDL_renderer_gl.h" |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
32 #include "SDL_renderer_gles.h" |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
33 #include "SDL_renderer_sw.h" |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
34 #include "../events/SDL_sysevents.h" |
|
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
35 #include "../events/SDL_events_c.h" |
| 0 | 36 |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
37 #if SDL_VIDEO_OPENGL_ES |
|
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
38 #include "SDL_opengles.h" |
| 2753 | 39 #endif /* SDL_VIDEO_OPENGL_ES */ |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
40 |
|
1926
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
41 #if SDL_VIDEO_OPENGL |
|
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
42 #include "SDL_opengl.h" |
|
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
43 |
|
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
44 /* On Windows, windows.h defines CreateWindow */ |
|
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
45 #ifdef CreateWindow |
|
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
46 #undef CreateWindow |
|
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
47 #endif |
| 2753 | 48 #endif /* SDL_VIDEO_OPENGL */ |
|
1926
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
49 |
| 0 | 50 /* Available video drivers */ |
|
3166
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
51 static VideoBootStrap *bootstrap[] = { |
|
1931
103c6fec2a60
The Mac OS X Cocoa video driver is under construction...
Sam Lantinga <slouken@libsdl.org>
parents:
1930
diff
changeset
|
52 #if SDL_VIDEO_DRIVER_COCOA |
| 2753 | 53 &COCOA_bootstrap, |
|
1133
609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
Ryan C. Gordon <icculus@icculus.org>
parents:
1076
diff
changeset
|
54 #endif |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
55 #if SDL_VIDEO_DRIVER_X11 |
| 2753 | 56 &X11_bootstrap, |
| 0 | 57 #endif |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
58 #if SDL_VIDEO_DRIVER_FBCON |
| 2753 | 59 &FBCON_bootstrap, |
| 0 | 60 #endif |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
61 #if SDL_VIDEO_DRIVER_DIRECTFB |
| 2753 | 62 &DirectFB_bootstrap, |
|
167
cb384ef627f6
Added support for DirectFB video on Linux (thanks Denis!)
Sam Lantinga <slouken@libsdl.org>
parents:
125
diff
changeset
|
63 #endif |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
64 #if SDL_VIDEO_DRIVER_PS2GS |
| 2753 | 65 &PS2GS_bootstrap, |
| 0 | 66 #endif |
|
3257
94fb40a4a9a7
Merged Martin's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3196
diff
changeset
|
67 #if SDL_VIDEO_DRIVER_PS3 |
|
94fb40a4a9a7
Merged Martin's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3196
diff
changeset
|
68 &PS3_bootstrap, |
|
94fb40a4a9a7
Merged Martin's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3196
diff
changeset
|
69 #endif |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
70 #if SDL_VIDEO_DRIVER_SVGALIB |
| 2753 | 71 &SVGALIB_bootstrap, |
| 0 | 72 #endif |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
73 #if SDL_VIDEO_DRIVER_GAPI |
| 2753 | 74 &GAPI_bootstrap, |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
75 #endif |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
76 #if SDL_VIDEO_DRIVER_WIN32 |
| 2753 | 77 &WIN32_bootstrap, |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
78 #endif |
|
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
79 #if SDL_VIDEO_DRIVER_BWINDOW |
| 2753 | 80 &BWINDOW_bootstrap, |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
81 #endif |
|
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
82 #if SDL_VIDEO_DRIVER_PHOTON |
|
3083
0bc41e0361d3
Date: Mon, 2 Mar 2009 16:27:42 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3058
diff
changeset
|
83 &photon_bootstrap, |
|
0bc41e0361d3
Date: Mon, 2 Mar 2009 16:27:42 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3058
diff
changeset
|
84 #endif |
|
0bc41e0361d3
Date: Mon, 2 Mar 2009 16:27:42 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3058
diff
changeset
|
85 #if SDL_VIDEO_DRIVER_QNXGF |
|
0bc41e0361d3
Date: Mon, 2 Mar 2009 16:27:42 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3058
diff
changeset
|
86 &qnxgf_bootstrap, |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
87 #endif |
|
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
88 #if SDL_VIDEO_DRIVER_EPOC |
| 2753 | 89 &EPOC_bootstrap, |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
90 #endif |
|
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
91 #if SDL_VIDEO_DRIVER_XBIOS |
| 2753 | 92 &XBIOS_bootstrap, |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
93 #endif |
|
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
94 #if SDL_VIDEO_DRIVER_GEM |
| 2753 | 95 &GEM_bootstrap, |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
96 #endif |
|
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
97 #if SDL_VIDEO_DRIVER_RISCOS |
| 2753 | 98 &RISCOS_bootstrap, |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
99 #endif |
|
2743
453ec0c21f6f
Rolling back changes to revision 4071 ... made some mistakes, will try merging work again.
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2740
diff
changeset
|
100 #if SDL_VIDEO_DRIVER_NDS |
| 2753 | 101 &NDS_bootstrap, |
|
2735
204be4fc2726
Final merge of Google Summer of Code 2008 work...
Sam Lantinga <slouken@libsdl.org>
parents:
2702
diff
changeset
|
102 #endif |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
103 #if SDL_VIDEO_DRIVER_UIKIT |
| 2753 | 104 &UIKIT_bootstrap, |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
105 #endif |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
106 #if SDL_VIDEO_DRIVER_DUMMY |
| 2753 | 107 &DUMMY_bootstrap, |
|
610
95433459fbd2
Date: Mon, 14 Apr 2003 22:08:27 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
580
diff
changeset
|
108 #endif |
|
3161
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3139
diff
changeset
|
109 #if SDL_VIDEO_DRIVER_PANDORA |
|
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3139
diff
changeset
|
110 &PND_bootstrap, |
|
494559cc723b
OpenPandora support added by David Carré
Sam Lantinga <slouken@libsdl.org>
parents:
3139
diff
changeset
|
111 #endif |
| 2753 | 112 NULL |
| 0 | 113 }; |
|
173
83018110dce8
Added initial support for EPOC/Symbian OS (thanks Hannu!)
Sam Lantinga <slouken@libsdl.org>
parents:
167
diff
changeset
|
114 |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
115 static SDL_VideoDevice *_this = NULL; |
| 0 | 116 |
| 117 /* Various local functions */ | |
| 2876 | 118 static void SDL_UpdateWindowGrab(SDL_Window * window); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
119 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
120 static int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
121 cmpmodes(const void *A, const void *B) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
122 { |
| 2753 | 123 SDL_DisplayMode a = *(const SDL_DisplayMode *) A; |
| 124 SDL_DisplayMode b = *(const SDL_DisplayMode *) B; | |
| 0 | 125 |
| 2753 | 126 if (a.w != b.w) { |
| 127 return b.w - a.w; | |
| 128 } | |
| 129 if (a.h != b.h) { | |
| 130 return b.h - a.h; | |
| 131 } | |
| 132 if (SDL_BITSPERPIXEL(a.format) != SDL_BITSPERPIXEL(b.format)) { | |
| 133 return SDL_BITSPERPIXEL(b.format) - SDL_BITSPERPIXEL(a.format); | |
| 134 } | |
|
3178
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
135 if (SDL_PIXELLAYOUT(a.format) != SDL_PIXELLAYOUT(b.format)) { |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
136 return SDL_PIXELLAYOUT(b.format) - SDL_PIXELLAYOUT(a.format); |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
137 } |
| 2753 | 138 if (a.refresh_rate != b.refresh_rate) { |
| 139 return b.refresh_rate - a.refresh_rate; | |
| 140 } | |
| 141 return 0; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
142 } |
| 0 | 143 |
|
1912
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
144 static void |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
145 SDL_UninitializedVideo() |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
146 { |
| 2753 | 147 SDL_SetError("Video subsystem has not been initialized"); |
|
1912
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
148 } |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
149 |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
150 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
151 SDL_GetNumVideoDrivers(void) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
152 { |
| 2753 | 153 return SDL_arraysize(bootstrap) - 1; |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
154 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
155 |
| 2753 | 156 const char * |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
157 SDL_GetVideoDriver(int index) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
158 { |
| 2753 | 159 if (index >= 0 && index < SDL_GetNumVideoDrivers()) { |
| 160 return bootstrap[index]->name; | |
| 161 } | |
| 162 return NULL; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
163 } |
| 0 | 164 |
| 165 /* | |
| 166 * Initialize the video and event subsystems -- determine native pixel format | |
| 167 */ | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
168 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
169 SDL_VideoInit(const char *driver_name, Uint32 flags) |
| 0 | 170 { |
| 2753 | 171 SDL_VideoDevice *video; |
| 172 int index; | |
| 173 int i; | |
| 0 | 174 |
| 2753 | 175 /* Toggle the event thread flags, based on OS requirements */ |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
176 #if defined(MUST_THREAD_EVENTS) |
| 2753 | 177 flags |= SDL_INIT_EVENTTHREAD; |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
178 #elif defined(CANT_THREAD_EVENTS) |
| 2753 | 179 if ((flags & SDL_INIT_EVENTTHREAD) == SDL_INIT_EVENTTHREAD) { |
| 180 SDL_SetError("OS doesn't support threaded events"); | |
| 181 return -1; | |
| 182 } | |
| 1190 | 183 #endif |
|
229
4d24d5a660a8
Fix a crash if an OpenGL video mode can't be set.
Sam Lantinga <slouken@libsdl.org>
parents:
216
diff
changeset
|
184 |
| 2753 | 185 /* Start the event loop */ |
| 186 if (SDL_StartEventLoop(flags) < 0) { | |
| 187 return -1; | |
| 188 } | |
| 189 /* Check to make sure we don't overwrite '_this' */ | |
| 190 if (_this != NULL) { | |
| 191 SDL_VideoQuit(); | |
| 192 } | |
| 193 /* Select the proper video driver */ | |
| 194 index = 0; | |
| 195 video = NULL; | |
| 196 if (driver_name == NULL) { | |
| 197 driver_name = SDL_getenv("SDL_VIDEODRIVER"); | |
| 198 } | |
| 199 if (driver_name != NULL) { | |
| 200 for (i = 0; bootstrap[i]; ++i) { | |
| 201 if (SDL_strcasecmp(bootstrap[i]->name, driver_name) == 0) { | |
| 202 if (bootstrap[i]->available()) { | |
| 203 video = bootstrap[i]->create(index); | |
| 204 } | |
| 205 break; | |
| 206 } | |
| 207 } | |
| 208 } else { | |
| 209 for (i = 0; bootstrap[i]; ++i) { | |
| 210 if (bootstrap[i]->available()) { | |
| 211 video = bootstrap[i]->create(index); | |
| 212 if (video != NULL) { | |
| 213 break; | |
| 214 } | |
| 215 } | |
| 216 } | |
| 217 } | |
| 218 if (video == NULL) { | |
| 219 if (driver_name) { | |
| 220 SDL_SetError("%s not available", driver_name); | |
| 221 } else { | |
| 222 SDL_SetError("No available video device"); | |
| 223 } | |
| 224 return -1; | |
| 225 } | |
| 226 _this = video; | |
| 227 _this->name = bootstrap[i]->name; | |
| 228 _this->next_object_id = 1; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
229 |
| 0 | 230 |
| 2753 | 231 /* Set some very sane GL defaults */ |
| 232 _this->gl_config.driver_loaded = 0; | |
| 233 _this->gl_config.dll_handle = NULL; | |
| 234 _this->gl_config.red_size = 3; | |
| 235 _this->gl_config.green_size = 3; | |
| 236 _this->gl_config.blue_size = 2; | |
| 237 _this->gl_config.alpha_size = 0; | |
| 238 _this->gl_config.buffer_size = 0; | |
| 239 _this->gl_config.depth_size = 16; | |
| 240 _this->gl_config.stencil_size = 0; | |
| 241 _this->gl_config.double_buffer = 1; | |
| 242 _this->gl_config.accum_red_size = 0; | |
| 243 _this->gl_config.accum_green_size = 0; | |
| 244 _this->gl_config.accum_blue_size = 0; | |
| 245 _this->gl_config.accum_alpha_size = 0; | |
| 246 _this->gl_config.stereo = 0; | |
| 247 _this->gl_config.multisamplebuffers = 0; | |
| 248 _this->gl_config.multisamplesamples = 0; | |
| 249 _this->gl_config.retained_backing = 1; | |
| 250 _this->gl_config.accelerated = -1; /* not known, don't set */ | |
|
3100
7dc982143c06
Date: Sun, 22 Mar 2009 12:52:29 +0000
Sam Lantinga <slouken@libsdl.org>
parents:
3099
diff
changeset
|
251 _this->gl_config.major_version = 2; |
|
7dc982143c06
Date: Sun, 22 Mar 2009 12:52:29 +0000
Sam Lantinga <slouken@libsdl.org>
parents:
3099
diff
changeset
|
252 _this->gl_config.minor_version = 1; |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
253 |
| 2753 | 254 /* Initialize the video subsystem */ |
| 255 if (_this->VideoInit(_this) < 0) { | |
| 256 SDL_VideoQuit(); | |
| 257 return -1; | |
| 258 } | |
| 259 /* Make sure some displays were added */ | |
| 260 if (_this->num_displays == 0) { | |
| 261 SDL_SetError("The video driver did not add any displays"); | |
| 262 SDL_VideoQuit(); | |
| 263 return (-1); | |
| 264 } | |
| 265 /* The software renderer is always available */ | |
| 266 for (i = 0; i < _this->num_displays; ++i) { | |
|
2744
1aede15771d0
Ran GNU indent on file
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2743
diff
changeset
|
267 #if SDL_VIDEO_RENDER_OGL |
| 2753 | 268 SDL_AddRenderDriver(i, &GL_RenderDriver); |
|
2744
1aede15771d0
Ran GNU indent on file
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2743
diff
changeset
|
269 #endif |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
270 |
|
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
271 #if SDL_VIDEO_RENDER_OGL_ES |
| 2753 | 272 SDL_AddRenderDriver(i, &GL_ES_RenderDriver); |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
273 #endif |
| 2753 | 274 if (_this->displays[i].num_render_drivers > 0) { |
| 275 SDL_AddRenderDriver(i, &SW_RenderDriver); | |
| 276 } | |
| 277 } | |
| 0 | 278 |
| 2753 | 279 /* We're ready to go! */ |
| 280 return 0; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
281 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
282 |
| 2753 | 283 const char * |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
284 SDL_GetCurrentVideoDriver() |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
285 { |
| 2753 | 286 if (!_this) { |
| 287 SDL_UninitializedVideo(); | |
| 288 return NULL; | |
| 289 } | |
| 290 return _this->name; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
291 } |
| 0 | 292 |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
293 SDL_VideoDevice * |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
294 SDL_GetVideoDevice() |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
295 { |
| 2753 | 296 return _this; |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
297 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
298 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
299 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
300 SDL_AddBasicVideoDisplay(const SDL_DisplayMode * desktop_mode) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
301 { |
| 2753 | 302 SDL_VideoDisplay display; |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
303 |
| 2753 | 304 SDL_zero(display); |
| 305 if (desktop_mode) { | |
| 306 display.desktop_mode = *desktop_mode; | |
| 307 } | |
| 308 display.current_mode = display.desktop_mode; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
309 |
| 2753 | 310 return SDL_AddVideoDisplay(&display); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
311 } |
| 0 | 312 |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
313 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
314 SDL_AddVideoDisplay(const SDL_VideoDisplay * display) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
315 { |
| 2753 | 316 SDL_VideoDisplay *displays; |
| 317 int index = -1; | |
| 0 | 318 |
| 2753 | 319 displays = |
| 320 SDL_realloc(_this->displays, | |
| 321 (_this->num_displays + 1) * sizeof(*displays)); | |
| 322 if (displays) { | |
| 323 index = _this->num_displays++; | |
| 324 displays[index] = *display; | |
| 325 displays[index].device = _this; | |
| 326 _this->displays = displays; | |
| 327 } else { | |
| 328 SDL_OutOfMemory(); | |
| 329 } | |
| 330 return index; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
331 } |
| 0 | 332 |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
333 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
334 SDL_GetNumVideoDisplays(void) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
335 { |
| 2753 | 336 if (!_this) { |
| 337 SDL_UninitializedVideo(); | |
| 338 return 0; | |
| 339 } | |
| 340 return _this->num_displays; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
341 } |
| 0 | 342 |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
343 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
344 SDL_SelectVideoDisplay(int index) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
345 { |
| 2753 | 346 if (!_this) { |
| 347 SDL_UninitializedVideo(); | |
| 348 return (-1); | |
| 349 } | |
| 350 if (index < 0 || index >= _this->num_displays) { | |
| 351 SDL_SetError("index must be in the range 0 - %d", | |
| 352 _this->num_displays - 1); | |
| 353 return -1; | |
| 354 } | |
| 355 _this->current_display = index; | |
| 356 return 0; | |
|
1963
2590b68531ef
Added SDL_GetCurrentVideoDisplay()
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset
|
357 } |
|
2590b68531ef
Added SDL_GetCurrentVideoDisplay()
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset
|
358 |
|
2590b68531ef
Added SDL_GetCurrentVideoDisplay()
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset
|
359 int |
|
2590b68531ef
Added SDL_GetCurrentVideoDisplay()
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset
|
360 SDL_GetCurrentVideoDisplay(void) |
|
2590b68531ef
Added SDL_GetCurrentVideoDisplay()
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset
|
361 { |
| 2753 | 362 if (!_this) { |
| 363 SDL_UninitializedVideo(); | |
| 364 return (-1); | |
| 365 } | |
| 366 return _this->current_display; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
367 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
368 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
369 SDL_bool |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
370 SDL_AddDisplayMode(int displayIndex, const SDL_DisplayMode * mode) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
371 { |
| 2753 | 372 SDL_VideoDisplay *display = &_this->displays[displayIndex]; |
| 373 SDL_DisplayMode *modes; | |
| 374 int i, nmodes; | |
|
910
4ab6d1fd028f
Date: Sat, 26 Jun 2004 14:58:42 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
883
diff
changeset
|
375 |
| 2753 | 376 /* Make sure we don't already have the mode in the list */ |
| 377 modes = display->display_modes; | |
| 378 nmodes = display->num_display_modes; | |
| 379 for (i = nmodes; i--;) { | |
| 380 if (SDL_memcmp(mode, &modes[i], sizeof(*mode)) == 0) { | |
| 381 return SDL_FALSE; | |
| 382 } | |
| 383 } | |
|
910
4ab6d1fd028f
Date: Sat, 26 Jun 2004 14:58:42 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
883
diff
changeset
|
384 |
| 2753 | 385 /* Go ahead and add the new mode */ |
| 386 if (nmodes == display->max_display_modes) { | |
| 387 modes = | |
| 388 SDL_realloc(modes, | |
| 389 (display->max_display_modes + 32) * sizeof(*modes)); | |
| 390 if (!modes) { | |
| 391 return SDL_FALSE; | |
| 392 } | |
| 393 display->display_modes = modes; | |
| 394 display->max_display_modes += 32; | |
| 395 } | |
| 396 modes[nmodes] = *mode; | |
| 397 display->num_display_modes++; | |
|
650
fe445b59d307
We need to lookup the address of glGetString before calling GL_MakeCurrent(),
Ryan C. Gordon <icculus@icculus.org>
parents:
630
diff
changeset
|
398 |
|
3178
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
399 /* Re-sort video modes */ |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
400 SDL_qsort(display->display_modes, display->num_display_modes, |
| 3186 | 401 sizeof(SDL_DisplayMode), cmpmodes); |
|
3178
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
402 |
| 2753 | 403 return SDL_TRUE; |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
404 } |
| 0 | 405 |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
406 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
407 SDL_GetNumDisplayModes() |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
408 { |
| 2753 | 409 if (_this) { |
| 410 SDL_VideoDisplay *display = &SDL_CurrentDisplay; | |
| 411 if (!display->num_display_modes && _this->GetDisplayModes) { | |
| 412 _this->GetDisplayModes(_this); | |
| 413 SDL_qsort(display->display_modes, display->num_display_modes, | |
| 414 sizeof(SDL_DisplayMode), cmpmodes); | |
| 415 } | |
| 416 return display->num_display_modes; | |
| 417 } | |
| 418 return 0; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
419 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
420 |
|
1967
01e29c3e9a29
In general, fill in pointers to structures, rather than return them.
Sam Lantinga <slouken@libsdl.org>
parents:
1965
diff
changeset
|
421 int |
|
01e29c3e9a29
In general, fill in pointers to structures, rather than return them.
Sam Lantinga <slouken@libsdl.org>
parents:
1965
diff
changeset
|
422 SDL_GetDisplayMode(int index, SDL_DisplayMode * mode) |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
423 { |
| 2753 | 424 if (index < 0 || index >= SDL_GetNumDisplayModes()) { |
| 425 SDL_SetError("index must be in the range of 0 - %d", | |
| 426 SDL_GetNumDisplayModes() - 1); | |
| 427 return -1; | |
| 428 } | |
| 429 if (mode) { | |
| 430 *mode = SDL_CurrentDisplay.display_modes[index]; | |
| 431 } | |
| 432 return 0; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
433 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
434 |
|
1967
01e29c3e9a29
In general, fill in pointers to structures, rather than return them.
Sam Lantinga <slouken@libsdl.org>
parents:
1965
diff
changeset
|
435 int |
|
01e29c3e9a29
In general, fill in pointers to structures, rather than return them.
Sam Lantinga <slouken@libsdl.org>
parents:
1965
diff
changeset
|
436 SDL_GetDesktopDisplayMode(SDL_DisplayMode * mode) |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
437 { |
| 2753 | 438 if (!_this) { |
| 439 SDL_UninitializedVideo(); | |
| 440 return -1; | |
| 441 } | |
| 442 if (mode) { | |
| 443 *mode = SDL_CurrentDisplay.desktop_mode; | |
| 444 } | |
| 445 return 0; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
446 } |
| 0 | 447 |
|
1967
01e29c3e9a29
In general, fill in pointers to structures, rather than return them.
Sam Lantinga <slouken@libsdl.org>
parents:
1965
diff
changeset
|
448 int |
|
01e29c3e9a29
In general, fill in pointers to structures, rather than return them.
Sam Lantinga <slouken@libsdl.org>
parents:
1965
diff
changeset
|
449 SDL_GetCurrentDisplayMode(SDL_DisplayMode * mode) |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
450 { |
| 2753 | 451 if (!_this) { |
| 452 SDL_UninitializedVideo(); | |
| 453 return -1; | |
| 454 } | |
| 455 if (mode) { | |
| 456 *mode = SDL_CurrentDisplay.current_mode; | |
| 457 } | |
| 458 return 0; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
459 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
460 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
461 SDL_DisplayMode * |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
462 SDL_GetClosestDisplayMode(const SDL_DisplayMode * mode, |
| 2753 | 463 SDL_DisplayMode * closest) |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
464 { |
| 2753 | 465 Uint32 target_format; |
| 466 int target_refresh_rate; | |
| 467 int i; | |
| 468 SDL_DisplayMode *current, *match; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
469 |
| 2753 | 470 if (!_this || !mode || !closest) { |
| 471 return NULL; | |
| 472 } | |
| 473 /* Default to the desktop format */ | |
| 474 if (mode->format) { | |
| 475 target_format = mode->format; | |
| 476 } else { | |
| 477 target_format = SDL_CurrentDisplay.desktop_mode.format; | |
| 478 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
479 |
| 2753 | 480 /* Default to the desktop refresh rate */ |
| 481 if (mode->refresh_rate) { | |
| 482 target_refresh_rate = mode->refresh_rate; | |
| 483 } else { | |
| 484 target_refresh_rate = SDL_CurrentDisplay.desktop_mode.refresh_rate; | |
| 485 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
486 |
| 2753 | 487 match = NULL; |
| 488 for (i = 0; i < SDL_GetNumDisplayModes(); ++i) { | |
| 489 current = &SDL_CurrentDisplay.display_modes[i]; | |
| 0 | 490 |
|
2789
985001797115
Fixed bug #605, per Martin's suggestion
Sam Lantinga <slouken@libsdl.org>
parents:
2787
diff
changeset
|
491 if (current->w && (current->w < mode->w)) { |
| 2753 | 492 /* Out of sorted modes large enough here */ |
| 493 break; | |
| 494 } | |
|
2789
985001797115
Fixed bug #605, per Martin's suggestion
Sam Lantinga <slouken@libsdl.org>
parents:
2787
diff
changeset
|
495 if (current->h && (current->h < mode->h)) { |
|
985001797115
Fixed bug #605, per Martin's suggestion
Sam Lantinga <slouken@libsdl.org>
parents:
2787
diff
changeset
|
496 if (current->w && (current->w == mode->w)) { |
|
985001797115
Fixed bug #605, per Martin's suggestion
Sam Lantinga <slouken@libsdl.org>
parents:
2787
diff
changeset
|
497 /* Out of sorted modes large enough here */ |
|
985001797115
Fixed bug #605, per Martin's suggestion
Sam Lantinga <slouken@libsdl.org>
parents:
2787
diff
changeset
|
498 break; |
|
985001797115
Fixed bug #605, per Martin's suggestion
Sam Lantinga <slouken@libsdl.org>
parents:
2787
diff
changeset
|
499 } |
|
985001797115
Fixed bug #605, per Martin's suggestion
Sam Lantinga <slouken@libsdl.org>
parents:
2787
diff
changeset
|
500 /* Wider, but not tall enough, due to a different |
|
985001797115
Fixed bug #605, per Martin's suggestion
Sam Lantinga <slouken@libsdl.org>
parents:
2787
diff
changeset
|
501 aspect ratio. This mode must be skipped, but closer |
|
985001797115
Fixed bug #605, per Martin's suggestion
Sam Lantinga <slouken@libsdl.org>
parents:
2787
diff
changeset
|
502 modes may still follow. */ |
|
985001797115
Fixed bug #605, per Martin's suggestion
Sam Lantinga <slouken@libsdl.org>
parents:
2787
diff
changeset
|
503 continue; |
|
985001797115
Fixed bug #605, per Martin's suggestion
Sam Lantinga <slouken@libsdl.org>
parents:
2787
diff
changeset
|
504 } |
| 2753 | 505 if (!match || current->w < match->w || current->h < match->h) { |
| 506 match = current; | |
| 507 continue; | |
| 508 } | |
| 509 if (current->format != match->format) { | |
| 510 /* Sorted highest depth to lowest */ | |
| 511 if (current->format == target_format || | |
| 512 (SDL_BITSPERPIXEL(current->format) >= | |
| 513 SDL_BITSPERPIXEL(target_format) | |
| 514 && SDL_PIXELTYPE(current->format) == | |
| 515 SDL_PIXELTYPE(target_format))) { | |
| 516 match = current; | |
| 517 } | |
| 518 continue; | |
| 519 } | |
| 520 if (current->refresh_rate != match->refresh_rate) { | |
| 521 /* Sorted highest refresh to lowest */ | |
| 522 if (current->refresh_rate >= target_refresh_rate) { | |
| 523 match = current; | |
| 524 } | |
| 525 } | |
| 526 } | |
| 527 if (match) { | |
| 528 if (match->format) { | |
| 529 closest->format = match->format; | |
| 530 } else { | |
| 531 closest->format = mode->format; | |
| 532 } | |
| 533 if (match->w && match->h) { | |
| 534 closest->w = match->w; | |
| 535 closest->h = match->h; | |
| 536 } else { | |
| 537 closest->w = mode->w; | |
| 538 closest->h = mode->h; | |
| 539 } | |
| 540 if (match->refresh_rate) { | |
| 541 closest->refresh_rate = match->refresh_rate; | |
| 542 } else { | |
| 543 closest->refresh_rate = mode->refresh_rate; | |
| 544 } | |
| 545 closest->driverdata = match->driverdata; | |
| 0 | 546 |
| 2753 | 547 /* |
| 548 * Pick some reasonable defaults if the app and driver don't | |
| 549 * care | |
| 550 */ | |
| 551 if (!closest->format) { | |
| 552 closest->format = SDL_PIXELFORMAT_RGB888; | |
| 553 } | |
| 554 if (!closest->w) { | |
| 555 closest->w = 640; | |
| 556 } | |
| 557 if (!closest->h) { | |
| 558 closest->h = 480; | |
| 559 } | |
| 560 return closest; | |
| 561 } | |
| 562 return NULL; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
563 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
564 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
565 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
566 SDL_SetDisplayMode(const SDL_DisplayMode * mode) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
567 { |
| 2753 | 568 SDL_VideoDisplay *display; |
| 569 SDL_DisplayMode display_mode; | |
| 570 SDL_DisplayMode current_mode; | |
| 571 int i, ncolors; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
572 |
| 2753 | 573 if (!_this) { |
| 574 SDL_UninitializedVideo(); | |
| 575 return -1; | |
| 576 } | |
| 577 display = &SDL_CurrentDisplay; | |
| 578 if (!mode) { | |
| 579 mode = &display->desktop_mode; | |
| 580 } | |
| 581 display_mode = *mode; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
582 |
| 2753 | 583 /* Default to the current mode */ |
| 584 if (!display_mode.format) { | |
| 585 display_mode.format = display->current_mode.format; | |
| 586 } | |
| 587 if (!display_mode.w) { | |
| 588 display_mode.w = display->current_mode.w; | |
| 589 } | |
| 590 if (!display_mode.h) { | |
| 591 display_mode.h = display->current_mode.h; | |
| 592 } | |
| 593 if (!display_mode.refresh_rate) { | |
| 594 display_mode.refresh_rate = display->current_mode.refresh_rate; | |
| 595 } | |
| 596 /* Get a good video mode, the closest one possible */ | |
| 597 if (!SDL_GetClosestDisplayMode(&display_mode, &display_mode)) { | |
| 598 SDL_SetError("No video mode large enough for %dx%d", | |
| 599 display_mode.w, display_mode.h); | |
| 600 return -1; | |
| 601 } | |
| 602 /* See if there's anything left to do */ | |
| 603 SDL_GetCurrentDisplayMode(¤t_mode); | |
| 604 if (SDL_memcmp(&display_mode, ¤t_mode, sizeof(display_mode)) == 0) { | |
| 605 return 0; | |
| 606 } | |
| 607 /* Actually change the display mode */ | |
| 608 if (_this->SetDisplayMode(_this, &display_mode) < 0) { | |
| 609 return -1; | |
| 610 } | |
| 611 display->current_mode = display_mode; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
612 |
| 2753 | 613 /* Set up a palette, if necessary */ |
| 614 if (SDL_ISPIXELFORMAT_INDEXED(display_mode.format)) { | |
| 615 ncolors = (1 << SDL_BITSPERPIXEL(display_mode.format)); | |
| 616 } else { | |
| 617 ncolors = 0; | |
| 618 } | |
| 619 if ((!ncolors && display->palette) || (ncolors && !display->palette) | |
| 620 || (ncolors && ncolors != display->palette->ncolors)) { | |
| 621 if (display->palette) { | |
| 622 SDL_FreePalette(display->palette); | |
| 623 display->palette = NULL; | |
| 624 } | |
| 625 if (ncolors) { | |
| 626 display->palette = SDL_AllocPalette(ncolors); | |
| 627 if (!display->palette) { | |
| 628 return -1; | |
| 629 } | |
| 630 SDL_DitherColors(display->palette->colors, | |
| 631 SDL_BITSPERPIXEL(display_mode.format)); | |
| 632 } | |
| 633 } | |
| 634 /* Move any fullscreen windows into position */ | |
| 635 for (i = 0; i < display->num_windows; ++i) { | |
| 636 SDL_Window *window = &display->windows[i]; | |
| 637 if (FULLSCREEN_VISIBLE(window)) { | |
|
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
638 SDL_SetWindowPosition(window->id, window->x, window->y); |
| 2753 | 639 } |
| 640 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
641 |
| 2753 | 642 return 0; |
| 0 | 643 } |
| 644 | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
645 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
646 SDL_SetFullscreenDisplayMode(const SDL_DisplayMode * mode) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
647 { |
| 2753 | 648 SDL_VideoDisplay *display; |
| 649 SDL_DisplayMode fullscreen_mode; | |
| 650 int i; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
651 |
| 2753 | 652 if (!_this) { |
| 653 SDL_UninitializedVideo(); | |
| 654 return -1; | |
| 655 } | |
| 656 display = &SDL_CurrentDisplay; | |
| 657 if (!mode) { | |
| 658 mode = &display->desktop_mode; | |
| 659 } | |
|
2869
2fe507a2ef7d
Whoops, the X11 driver doesn't support fullscreen modes (yet)
Sam Lantinga <slouken@libsdl.org>
parents:
2860
diff
changeset
|
660 if (!SDL_GetClosestDisplayMode(mode, &fullscreen_mode)) { |
|
2fe507a2ef7d
Whoops, the X11 driver doesn't support fullscreen modes (yet)
Sam Lantinga <slouken@libsdl.org>
parents:
2860
diff
changeset
|
661 SDL_SetError("Couldn't find display mode match"); |
|
2fe507a2ef7d
Whoops, the X11 driver doesn't support fullscreen modes (yet)
Sam Lantinga <slouken@libsdl.org>
parents:
2860
diff
changeset
|
662 return -1; |
|
2fe507a2ef7d
Whoops, the X11 driver doesn't support fullscreen modes (yet)
Sam Lantinga <slouken@libsdl.org>
parents:
2860
diff
changeset
|
663 } |
|
3092
cad1aefa2ed9
Date: Thu, 12 Mar 2009 15:14:38 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3091
diff
changeset
|
664 |
| 2753 | 665 if (SDL_memcmp |
| 666 (&fullscreen_mode, &display->fullscreen_mode, | |
| 667 sizeof(fullscreen_mode)) == 0) { | |
| 668 /* Nothing to do... */ | |
| 669 return 0; | |
| 670 } | |
| 671 display->fullscreen_mode = fullscreen_mode; | |
|
1970
db3ba6c0d0df
Allow the render context to do necessary work when the video mode changes.
Sam Lantinga <slouken@libsdl.org>
parents:
1969
diff
changeset
|
672 |
| 2753 | 673 /* Actually set the mode if we have a fullscreen window visible */ |
| 674 for (i = 0; i < display->num_windows; ++i) { | |
| 675 SDL_Window *window = &display->windows[i]; | |
| 676 if (FULLSCREEN_VISIBLE(window)) { | |
| 677 if (SDL_SetDisplayMode(&display->fullscreen_mode) < 0) { | |
| 678 return -1; | |
| 679 } | |
| 680 } | |
| 681 if (window->flags & SDL_WINDOW_FULLSCREEN) { | |
| 682 SDL_OnWindowResized(window); | |
| 683 } | |
| 684 } | |
| 685 return 0; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
686 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
687 |
|
1967
01e29c3e9a29
In general, fill in pointers to structures, rather than return them.
Sam Lantinga <slouken@libsdl.org>
parents:
1965
diff
changeset
|
688 int |
|
01e29c3e9a29
In general, fill in pointers to structures, rather than return them.
Sam Lantinga <slouken@libsdl.org>
parents:
1965
diff
changeset
|
689 SDL_GetFullscreenDisplayMode(SDL_DisplayMode * mode) |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
690 { |
| 2753 | 691 if (!_this) { |
| 692 SDL_UninitializedVideo(); | |
| 693 return -1; | |
| 694 } | |
| 695 if (mode) { | |
| 696 *mode = SDL_CurrentDisplay.fullscreen_mode; | |
| 697 } | |
| 698 return 0; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
699 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
700 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
701 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
702 SDL_SetDisplayPalette(const SDL_Color * colors, int firstcolor, int ncolors) |
| 0 | 703 { |
| 2753 | 704 SDL_Palette *palette; |
| 705 int status = 0; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
706 |
| 2753 | 707 if (!_this) { |
| 708 SDL_UninitializedVideo(); | |
| 709 return -1; | |
| 710 } | |
| 711 palette = SDL_CurrentDisplay.palette; | |
| 712 if (!palette) { | |
| 713 SDL_SetError("Display mode does not have a palette"); | |
| 714 return -1; | |
| 715 } | |
| 716 status = SDL_SetPaletteColors(palette, colors, firstcolor, ncolors); | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
717 |
| 2753 | 718 if (_this->SetDisplayPalette) { |
| 719 if (_this->SetDisplayPalette(_this, palette) < 0) { | |
| 720 status = -1; | |
| 721 } | |
| 722 } | |
| 723 return status; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
724 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
725 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
726 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
727 SDL_GetDisplayPalette(SDL_Color * colors, int firstcolor, int ncolors) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
728 { |
| 2753 | 729 SDL_Palette *palette; |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
730 |
| 2753 | 731 if (!_this) { |
| 732 SDL_UninitializedVideo(); | |
| 733 return -1; | |
| 734 } | |
| 735 palette = SDL_CurrentDisplay.palette; | |
| 736 if (!palette->ncolors) { | |
| 737 SDL_SetError("Display mode does not have a palette"); | |
| 738 return -1; | |
| 739 } | |
| 740 if (firstcolor < 0 || (firstcolor + ncolors) > palette->ncolors) { | |
| 741 SDL_SetError("Palette indices are out of range"); | |
| 742 return -1; | |
| 743 } | |
| 744 SDL_memcpy(colors, &palette->colors[firstcolor], | |
| 745 ncolors * sizeof(*colors)); | |
| 746 return 0; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
747 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
748 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
749 SDL_WindowID |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
750 SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
751 { |
| 2753 | 752 const Uint32 allowed_flags = (SDL_WINDOW_FULLSCREEN | |
| 753 SDL_WINDOW_OPENGL | | |
| 754 SDL_WINDOW_BORDERLESS | | |
|
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
755 SDL_WINDOW_RESIZABLE | |
|
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
756 SDL_WINDOW_INPUT_GRABBED); |
| 2753 | 757 SDL_VideoDisplay *display; |
| 758 SDL_Window window; | |
| 759 int num_windows; | |
| 760 SDL_Window *windows; | |
|
1912
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
761 |
| 2753 | 762 if (!_this) { |
| 763 SDL_UninitializedVideo(); | |
| 764 return 0; | |
| 765 } | |
|
3057
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
766 if (flags & SDL_WINDOW_OPENGL) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
767 if (!_this->GL_CreateContext) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
768 SDL_SetError("No OpenGL support in video driver"); |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
769 return 0; |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
770 } |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
771 SDL_GL_LoadLibrary(NULL); |
| 2753 | 772 } |
| 773 SDL_zero(window); | |
| 774 window.id = _this->next_object_id++; | |
| 775 window.x = x; | |
| 776 window.y = y; | |
| 777 window.w = w; | |
| 778 window.h = h; | |
| 779 window.flags = (flags & allowed_flags); | |
| 780 window.display = _this->current_display; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
781 |
| 2753 | 782 if (_this->CreateWindow && _this->CreateWindow(_this, &window) < 0) { |
|
3057
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
783 if (flags & SDL_WINDOW_OPENGL) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
784 SDL_GL_UnloadLibrary(); |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
785 } |
| 2753 | 786 return 0; |
| 787 } | |
| 788 display = &SDL_CurrentDisplay; | |
| 789 num_windows = display->num_windows; | |
| 790 windows = | |
| 791 SDL_realloc(display->windows, (num_windows + 1) * sizeof(*windows)); | |
| 792 if (!windows) { | |
| 793 if (_this->DestroyWindow) { | |
| 794 _this->DestroyWindow(_this, &window); | |
| 795 } | |
|
3057
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
796 if (flags & SDL_WINDOW_OPENGL) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
797 SDL_GL_UnloadLibrary(); |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
798 } |
| 2753 | 799 return 0; |
| 800 } | |
| 801 windows[num_windows] = window; | |
| 802 display->windows = windows; | |
| 803 display->num_windows++; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
804 |
| 2753 | 805 if (title) { |
| 806 SDL_SetWindowTitle(window.id, title); | |
| 807 } | |
| 808 if (flags & SDL_WINDOW_MAXIMIZED) { | |
| 809 SDL_MaximizeWindow(window.id); | |
| 810 } | |
| 811 if (flags & SDL_WINDOW_MINIMIZED) { | |
| 812 SDL_MinimizeWindow(window.id); | |
| 813 } | |
| 814 if (flags & SDL_WINDOW_SHOWN) { | |
| 815 SDL_ShowWindow(window.id); | |
| 816 } | |
|
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
817 SDL_UpdateWindowGrab(&window); |
|
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
818 |
| 2753 | 819 return window.id; |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
820 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
821 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
822 SDL_WindowID |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
823 SDL_CreateWindowFrom(const void *data) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
824 { |
| 2753 | 825 SDL_VideoDisplay *display; |
| 826 SDL_Window window; | |
| 827 int num_windows; | |
| 828 SDL_Window *windows; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
829 |
| 2753 | 830 if (!_this) { |
| 831 SDL_UninitializedVideo(); | |
| 832 return (0); | |
| 833 } | |
| 834 SDL_zero(window); | |
| 835 window.id = _this->next_object_id++; | |
| 836 window.display = _this->current_display; | |
|
3057
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
837 window.flags = SDL_WINDOW_FOREIGN; |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
838 |
| 2753 | 839 if (!_this->CreateWindowFrom || |
| 840 _this->CreateWindowFrom(_this, &window, data) < 0) { | |
| 841 return 0; | |
| 842 } | |
| 843 display = &SDL_CurrentDisplay; | |
| 844 num_windows = display->num_windows; | |
| 845 windows = | |
| 846 SDL_realloc(display->windows, (num_windows + 1) * sizeof(*windows)); | |
| 847 if (!windows) { | |
| 848 if (_this->DestroyWindow) { | |
| 849 _this->DestroyWindow(_this, &window); | |
| 850 } | |
| 851 if (window.title) { | |
| 852 SDL_free(window.title); | |
| 853 } | |
| 854 return 0; | |
| 855 } | |
| 856 windows[num_windows] = window; | |
| 857 display->windows = windows; | |
| 858 display->num_windows++; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
859 |
| 2753 | 860 return window.id; |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
861 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
862 |
|
1924
69217fdd2c0a
If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled.
Sam Lantinga <slouken@libsdl.org>
parents:
1923
diff
changeset
|
863 int |
|
1928
861bc36f0ab3
Fixed crash with multiple windows
Sam Lantinga <slouken@libsdl.org>
parents:
1926
diff
changeset
|
864 SDL_RecreateWindow(SDL_Window * window, Uint32 flags) |
|
1924
69217fdd2c0a
If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled.
Sam Lantinga <slouken@libsdl.org>
parents:
1923
diff
changeset
|
865 { |
|
3057
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
866 const Uint32 allowed_flags = (SDL_WINDOW_FULLSCREEN | |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
867 SDL_WINDOW_OPENGL | |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
868 SDL_WINDOW_BORDERLESS | |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
869 SDL_WINDOW_RESIZABLE | |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
870 SDL_WINDOW_INPUT_GRABBED); |
| 2753 | 871 char *title = window->title; |
|
1956
ba0d62354872
Simplified driver window creation code.
Sam Lantinga <slouken@libsdl.org>
parents:
1952
diff
changeset
|
872 |
| 2753 | 873 if ((flags & SDL_WINDOW_OPENGL) && !_this->GL_CreateContext) { |
| 874 SDL_SetError("No OpenGL support in video driver"); | |
| 875 return -1; | |
| 876 } | |
|
3057
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
877 if ((window->flags & SDL_WINDOW_OPENGL) != (flags & SDL_WINDOW_OPENGL)) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
878 if (flags & SDL_WINDOW_OPENGL) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
879 SDL_GL_LoadLibrary(NULL); |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
880 } else { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
881 SDL_GL_UnloadLibrary(); |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
882 } |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
883 } |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
884 |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
885 if (window->flags & SDL_WINDOW_FOREIGN) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
886 /* Can't destroy and re-create foreign windows, hrm */ |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
887 flags |= SDL_WINDOW_FOREIGN; |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
888 } else { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
889 flags &= ~SDL_WINDOW_FOREIGN; |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
890 } |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
891 |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
892 if (_this->DestroyWindow && !(flags & SDL_WINDOW_FOREIGN)) { |
| 2753 | 893 _this->DestroyWindow(_this, window); |
| 894 } | |
|
3057
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
895 |
| 2753 | 896 window->title = NULL; |
|
3057
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
897 window->flags = (flags & allowed_flags); |
|
1956
ba0d62354872
Simplified driver window creation code.
Sam Lantinga <slouken@libsdl.org>
parents:
1952
diff
changeset
|
898 |
|
3057
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
899 if (_this->CreateWindow && !(flags & SDL_WINDOW_FOREIGN)) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
900 if (_this->CreateWindow(_this, window) < 0) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
901 if (flags & SDL_WINDOW_OPENGL) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
902 SDL_GL_UnloadLibrary(); |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
903 } |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
904 return -1; |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
905 } |
| 2753 | 906 } |
|
3057
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
907 |
| 2753 | 908 if (title) { |
| 909 SDL_SetWindowTitle(window->id, title); | |
| 910 SDL_free(title); | |
| 911 } | |
| 912 if (flags & SDL_WINDOW_MAXIMIZED) { | |
| 913 SDL_MaximizeWindow(window->id); | |
| 914 } | |
| 915 if (flags & SDL_WINDOW_MINIMIZED) { | |
| 916 SDL_MinimizeWindow(window->id); | |
| 917 } | |
| 918 if (flags & SDL_WINDOW_SHOWN) { | |
| 919 SDL_ShowWindow(window->id); | |
| 920 } | |
|
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
921 SDL_UpdateWindowGrab(window); |
|
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
922 |
| 2753 | 923 return 0; |
|
1924
69217fdd2c0a
If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled.
Sam Lantinga <slouken@libsdl.org>
parents:
1923
diff
changeset
|
924 } |
|
69217fdd2c0a
If the OpenGL renderer is selected for a non-OpenGL window, recreate the window with OpenGL enabled.
Sam Lantinga <slouken@libsdl.org>
parents:
1923
diff
changeset
|
925 |
| 2753 | 926 SDL_Window * |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
927 SDL_GetWindowFromID(SDL_WindowID windowID) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
928 { |
| 2753 | 929 int i, j; |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
930 |
| 2753 | 931 if (!_this) { |
| 932 SDL_UninitializedVideo(); | |
| 933 return NULL; | |
| 934 } | |
| 935 for (i = 0; i < _this->num_displays; ++i) { | |
| 936 SDL_VideoDisplay *display = &_this->displays[i]; | |
| 937 for (j = 0; j < display->num_windows; ++j) { | |
| 938 SDL_Window *window = &display->windows[j]; | |
| 939 if (window->id == windowID) { | |
| 940 return window; | |
| 941 } | |
| 942 } | |
| 943 } | |
| 944 return NULL; | |
| 0 | 945 } |
| 946 | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
947 SDL_VideoDisplay * |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
948 SDL_GetDisplayFromWindow(SDL_Window * window) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
949 { |
| 2753 | 950 if (!_this) { |
| 951 SDL_UninitializedVideo(); | |
| 952 return NULL; | |
| 953 } | |
| 954 if (!window) { | |
| 955 return NULL; | |
| 956 } | |
| 957 return &_this->displays[window->display]; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
958 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
959 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
960 Uint32 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
961 SDL_GetWindowFlags(SDL_WindowID windowID) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
962 { |
| 2753 | 963 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
964 |
| 2753 | 965 if (!window) { |
| 966 return 0; | |
| 967 } | |
| 968 return window->flags; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
969 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
970 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
971 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
972 SDL_SetWindowTitle(SDL_WindowID windowID, const char *title) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
973 { |
| 2753 | 974 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1956
ba0d62354872
Simplified driver window creation code.
Sam Lantinga <slouken@libsdl.org>
parents:
1952
diff
changeset
|
975 |
| 2753 | 976 if (!window || title == window->title) { |
| 977 return; | |
| 978 } | |
| 979 if (window->title) { | |
| 980 SDL_free(window->title); | |
| 981 } | |
| 982 if (title) { | |
| 983 window->title = SDL_strdup(title); | |
| 984 } else { | |
| 985 window->title = NULL; | |
| 986 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
987 |
| 2753 | 988 if (_this->SetWindowTitle) { |
| 989 _this->SetWindowTitle(_this, window); | |
| 990 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
991 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
992 |
| 2753 | 993 const char * |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
994 SDL_GetWindowTitle(SDL_WindowID windowID) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
995 { |
| 2753 | 996 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
997 |
| 2753 | 998 if (!window) { |
| 999 return NULL; | |
| 1000 } | |
| 1001 return window->title; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1002 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1003 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1004 void |
|
2967
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1005 SDL_SetWindowIcon(SDL_WindowID windowID, SDL_Surface * icon) |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1006 { |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1007 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1008 |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1009 if (!window) { |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1010 return; |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1011 } |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1012 if (_this->SetWindowIcon) { |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1013 _this->SetWindowIcon(_this, window, icon); |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1014 } |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1015 } |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1016 |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1017 void |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1018 SDL_SetWindowData(SDL_WindowID windowID, void *userdata) |
| 0 | 1019 { |
| 2753 | 1020 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1021 |
| 2753 | 1022 if (!window) { |
| 1023 return; | |
| 1024 } | |
| 1025 window->userdata = userdata; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1026 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1027 |
| 2753 | 1028 void * |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1029 SDL_GetWindowData(SDL_WindowID windowID) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1030 { |
| 2753 | 1031 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1032 |
| 2753 | 1033 if (!window) { |
| 1034 return NULL; | |
| 1035 } | |
| 1036 return window->userdata; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1037 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1038 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1039 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1040 SDL_SetWindowPosition(SDL_WindowID windowID, int x, int y) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1041 { |
| 2753 | 1042 SDL_Window *window = SDL_GetWindowFromID(windowID); |
| 1043 SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window); | |
| 0 | 1044 |
| 2753 | 1045 if (!window) { |
| 1046 return; | |
| 1047 } | |
|
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
1048 if (x != SDL_WINDOWPOS_UNDEFINED) { |
| 2753 | 1049 window->x = x; |
| 1050 } | |
|
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
1051 if (y != SDL_WINDOWPOS_UNDEFINED) { |
| 2753 | 1052 window->y = y; |
| 1053 } | |
| 1054 if (_this->SetWindowPosition) { | |
| 1055 _this->SetWindowPosition(_this, window); | |
| 1056 } | |
|
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
1057 SDL_SendWindowEvent(window->id, SDL_WINDOWEVENT_MOVED, x, y); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1058 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1059 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1060 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1061 SDL_GetWindowPosition(SDL_WindowID windowID, int *x, int *y) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1062 { |
| 2753 | 1063 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1064 |
| 2753 | 1065 if (!window) { |
| 1066 return; | |
| 1067 } | |
| 1068 if (x) { | |
| 1069 *x = window->x; | |
| 1070 } | |
| 1071 if (y) { | |
| 1072 *y = window->y; | |
| 1073 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1074 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1075 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1076 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1077 SDL_SetWindowSize(SDL_WindowID windowID, int w, int h) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1078 { |
| 2753 | 1079 SDL_Window *window = SDL_GetWindowFromID(windowID); |
| 0 | 1080 |
| 2753 | 1081 if (!window) { |
| 1082 return; | |
| 1083 } | |
| 1084 window->w = w; | |
| 1085 window->h = h; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1086 |
| 2753 | 1087 if (_this->SetWindowSize) { |
| 1088 _this->SetWindowSize(_this, window); | |
| 1089 } | |
|
2849
523b10db69f8
There's no reason to add extra code to notify the mice of window size changes.
Sam Lantinga <slouken@libsdl.org>
parents:
2814
diff
changeset
|
1090 SDL_OnWindowResized(window); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1091 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1092 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1093 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1094 SDL_GetWindowSize(SDL_WindowID windowID, int *w, int *h) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1095 { |
| 2753 | 1096 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1097 |
|
2860
6ce28e5287e9
Date: Sun, 07 Dec 2008 13:35:23 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2859
diff
changeset
|
1098 if (window) { |
|
2849
523b10db69f8
There's no reason to add extra code to notify the mice of window size changes.
Sam Lantinga <slouken@libsdl.org>
parents:
2814
diff
changeset
|
1099 if (w) { |
|
523b10db69f8
There's no reason to add extra code to notify the mice of window size changes.
Sam Lantinga <slouken@libsdl.org>
parents:
2814
diff
changeset
|
1100 *w = window->w; |
|
523b10db69f8
There's no reason to add extra code to notify the mice of window size changes.
Sam Lantinga <slouken@libsdl.org>
parents:
2814
diff
changeset
|
1101 } |
|
523b10db69f8
There's no reason to add extra code to notify the mice of window size changes.
Sam Lantinga <slouken@libsdl.org>
parents:
2814
diff
changeset
|
1102 if (h) { |
|
523b10db69f8
There's no reason to add extra code to notify the mice of window size changes.
Sam Lantinga <slouken@libsdl.org>
parents:
2814
diff
changeset
|
1103 *h = window->h; |
|
523b10db69f8
There's no reason to add extra code to notify the mice of window size changes.
Sam Lantinga <slouken@libsdl.org>
parents:
2814
diff
changeset
|
1104 } |
|
523b10db69f8
There's no reason to add extra code to notify the mice of window size changes.
Sam Lantinga <slouken@libsdl.org>
parents:
2814
diff
changeset
|
1105 } else { |
|
523b10db69f8
There's no reason to add extra code to notify the mice of window size changes.
Sam Lantinga <slouken@libsdl.org>
parents:
2814
diff
changeset
|
1106 if (w) { |
|
523b10db69f8
There's no reason to add extra code to notify the mice of window size changes.
Sam Lantinga <slouken@libsdl.org>
parents:
2814
diff
changeset
|
1107 *w = 0; |
|
523b10db69f8
There's no reason to add extra code to notify the mice of window size changes.
Sam Lantinga <slouken@libsdl.org>
parents:
2814
diff
changeset
|
1108 } |
|
523b10db69f8
There's no reason to add extra code to notify the mice of window size changes.
Sam Lantinga <slouken@libsdl.org>
parents:
2814
diff
changeset
|
1109 if (h) { |
|
523b10db69f8
There's no reason to add extra code to notify the mice of window size changes.
Sam Lantinga <slouken@libsdl.org>
parents:
2814
diff
changeset
|
1110 *h = 0; |
|
523b10db69f8
There's no reason to add extra code to notify the mice of window size changes.
Sam Lantinga <slouken@libsdl.org>
parents:
2814
diff
changeset
|
1111 } |
| 2753 | 1112 } |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1113 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1114 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1115 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1116 SDL_ShowWindow(SDL_WindowID windowID) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1117 { |
| 2753 | 1118 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1119 |
| 2753 | 1120 if (!window || (window->flags & SDL_WINDOW_SHOWN)) { |
| 1121 return; | |
| 1122 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1123 |
| 2753 | 1124 if (_this->ShowWindow) { |
| 1125 _this->ShowWindow(_this, window); | |
| 1126 } | |
|
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
1127 SDL_SendWindowEvent(window->id, SDL_WINDOWEVENT_SHOWN, 0, 0); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1128 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1129 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1130 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1131 SDL_HideWindow(SDL_WindowID windowID) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1132 { |
| 2753 | 1133 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1134 |
| 2753 | 1135 if (!window || !(window->flags & SDL_WINDOW_SHOWN)) { |
| 1136 return; | |
| 1137 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1138 |
| 2753 | 1139 if (_this->HideWindow) { |
| 1140 _this->HideWindow(_this, window); | |
| 1141 } | |
|
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
1142 SDL_SendWindowEvent(window->id, SDL_WINDOWEVENT_HIDDEN, 0, 0); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1143 } |
| 0 | 1144 |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1145 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1146 SDL_RaiseWindow(SDL_WindowID windowID) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1147 { |
| 2753 | 1148 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1149 |
| 2753 | 1150 if (!window || !(window->flags & SDL_WINDOW_SHOWN)) { |
| 1151 return; | |
| 1152 } | |
| 1153 if (_this->RaiseWindow) { | |
| 1154 _this->RaiseWindow(_this, window); | |
| 1155 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1156 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1157 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1158 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1159 SDL_MaximizeWindow(SDL_WindowID windowID) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1160 { |
| 2753 | 1161 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1162 |
| 2753 | 1163 if (!window || (window->flags & SDL_WINDOW_MAXIMIZED)) { |
| 1164 return; | |
| 1165 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1166 |
| 2753 | 1167 if (_this->MaximizeWindow) { |
| 1168 _this->MaximizeWindow(_this, window); | |
| 1169 } | |
|
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
1170 SDL_SendWindowEvent(window->id, SDL_WINDOWEVENT_MAXIMIZED, 0, 0); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1171 } |
| 0 | 1172 |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1173 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1174 SDL_MinimizeWindow(SDL_WindowID windowID) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1175 { |
| 2753 | 1176 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1177 |
| 2753 | 1178 if (!window || (window->flags & SDL_WINDOW_MINIMIZED)) { |
| 1179 return; | |
| 1180 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1181 |
| 2753 | 1182 if (_this->MinimizeWindow) { |
| 1183 _this->MinimizeWindow(_this, window); | |
| 1184 } | |
|
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
1185 SDL_SendWindowEvent(window->id, SDL_WINDOWEVENT_MINIMIZED, 0, 0); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1186 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1187 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1188 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1189 SDL_RestoreWindow(SDL_WindowID windowID) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1190 { |
| 2753 | 1191 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1192 |
| 2753 | 1193 if (!window |
|
2934
1fcc36adc73d
Fixed logic problem with SDL_RestoreWindow()
Sam Lantinga <slouken@libsdl.org>
parents:
2928
diff
changeset
|
1194 || !(window->flags & (SDL_WINDOW_MAXIMIZED | SDL_WINDOW_MINIMIZED))) { |
| 2753 | 1195 return; |
| 1196 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1197 |
| 2753 | 1198 if (_this->RestoreWindow) { |
| 1199 _this->RestoreWindow(_this, window); | |
| 1200 } | |
|
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
1201 SDL_SendWindowEvent(window->id, SDL_WINDOWEVENT_RESTORED, 0, 0); |
| 0 | 1202 } |
| 1203 | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1204 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1205 SDL_SetWindowFullscreen(SDL_WindowID windowID, int fullscreen) |
| 0 | 1206 { |
| 2753 | 1207 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1208 |
| 2753 | 1209 if (!window) { |
| 1210 return -1; | |
| 1211 } | |
| 1212 if (fullscreen) { | |
| 1213 fullscreen = SDL_WINDOW_FULLSCREEN; | |
| 1214 } | |
| 1215 if ((window->flags & SDL_WINDOW_FULLSCREEN) == fullscreen) { | |
| 1216 return 0; | |
| 1217 } | |
| 1218 if (fullscreen) { | |
| 1219 window->flags |= SDL_WINDOW_FULLSCREEN; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1220 |
| 2753 | 1221 if (FULLSCREEN_VISIBLE(window)) { |
| 1222 SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window); | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1223 |
| 2753 | 1224 /* Hide any other fullscreen windows */ |
| 1225 int i; | |
| 1226 for (i = 0; i < display->num_windows; ++i) { | |
| 1227 SDL_Window *other = &display->windows[i]; | |
| 1228 if (other->id != windowID && FULLSCREEN_VISIBLE(other)) { | |
| 1229 SDL_MinimizeWindow(other->id); | |
| 1230 } | |
| 1231 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1232 |
| 2753 | 1233 SDL_SetDisplayMode(&display->fullscreen_mode); |
| 1234 } | |
| 1235 } else { | |
| 1236 window->flags &= ~SDL_WINDOW_FULLSCREEN; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1237 |
| 2753 | 1238 if (FULLSCREEN_VISIBLE(window)) { |
| 1239 SDL_SetDisplayMode(NULL); | |
| 1240 } | |
| 1241 } | |
| 1242 return 0; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1243 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1244 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1245 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1246 SDL_SetWindowGrab(SDL_WindowID windowID, int mode) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1247 { |
| 2753 | 1248 SDL_Window *window = SDL_GetWindowFromID(windowID); |
| 0 | 1249 |
| 2753 | 1250 if (!window || (!!mode == !!(window->flags & SDL_WINDOW_INPUT_GRABBED))) { |
| 1251 return; | |
| 1252 } | |
| 1253 if (mode) { | |
| 1254 window->flags |= SDL_WINDOW_INPUT_GRABBED; | |
| 1255 } else { | |
| 1256 window->flags &= ~SDL_WINDOW_INPUT_GRABBED; | |
| 1257 } | |
|
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
1258 SDL_UpdateWindowGrab(window); |
|
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
1259 } |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1260 |
|
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
1261 static void |
| 2876 | 1262 SDL_UpdateWindowGrab(SDL_Window * window) |
|
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
1263 { |
| 2753 | 1264 if ((window->flags & SDL_WINDOW_INPUT_FOCUS) && _this->SetWindowGrab) { |
| 1265 _this->SetWindowGrab(_this, window); | |
| 1266 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1267 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1268 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1269 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1270 SDL_GetWindowGrab(SDL_WindowID windowID) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1271 { |
| 2753 | 1272 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1273 |
| 2753 | 1274 if (!window) { |
| 1275 return 0; | |
| 1276 } | |
| 1277 return ((window->flags & SDL_WINDOW_INPUT_GRABBED) != 0); | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1278 } |
| 0 | 1279 |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1280 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1281 SDL_OnWindowShown(SDL_Window * window) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1282 { |
|
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
1283 if (window->flags & SDL_WINDOW_FULLSCREEN) { |
|
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
1284 SDL_SendWindowEvent(window->id, SDL_WINDOWEVENT_FOCUS_GAINED, 0, 0); |
|
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
1285 } |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1286 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1287 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1288 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1289 SDL_OnWindowHidden(SDL_Window * window) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1290 { |
|
2875
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
1291 if (window->flags & SDL_WINDOW_FULLSCREEN) { |
|
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
1292 SDL_SendWindowEvent(window->id, SDL_WINDOWEVENT_FOCUS_LOST, 0, 0); |
|
91a7e08cd238
* Implemented X11 fullscreen input grab
Sam Lantinga <slouken@libsdl.org>
parents:
2869
diff
changeset
|
1293 } |
| 0 | 1294 } |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1295 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1296 void |
|
1970
db3ba6c0d0df
Allow the render context to do necessary work when the video mode changes.
Sam Lantinga <slouken@libsdl.org>
parents:
1969
diff
changeset
|
1297 SDL_OnWindowResized(SDL_Window * window) |
|
db3ba6c0d0df
Allow the render context to do necessary work when the video mode changes.
Sam Lantinga <slouken@libsdl.org>
parents:
1969
diff
changeset
|
1298 { |
| 2753 | 1299 SDL_Renderer *renderer = window->renderer; |
|
1970
db3ba6c0d0df
Allow the render context to do necessary work when the video mode changes.
Sam Lantinga <slouken@libsdl.org>
parents:
1969
diff
changeset
|
1300 |
| 2753 | 1301 if (renderer && renderer->DisplayModeChanged) { |
| 1302 renderer->DisplayModeChanged(renderer); | |
| 1303 } | |
|
1970
db3ba6c0d0df
Allow the render context to do necessary work when the video mode changes.
Sam Lantinga <slouken@libsdl.org>
parents:
1969
diff
changeset
|
1304 } |
|
db3ba6c0d0df
Allow the render context to do necessary work when the video mode changes.
Sam Lantinga <slouken@libsdl.org>
parents:
1969
diff
changeset
|
1305 |
|
db3ba6c0d0df
Allow the render context to do necessary work when the video mode changes.
Sam Lantinga <slouken@libsdl.org>
parents:
1969
diff
changeset
|
1306 void |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1307 SDL_OnWindowFocusGained(SDL_Window * window) |
| 0 | 1308 { |
| 2753 | 1309 SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1310 |
| 2753 | 1311 if (window->flags & SDL_WINDOW_FULLSCREEN) { |
| 1312 SDL_SetDisplayMode(&display->fullscreen_mode); | |
| 1313 } | |
| 1314 if (display->gamma && _this->SetDisplayGammaRamp) { | |
| 1315 _this->SetDisplayGammaRamp(_this, display->gamma); | |
| 1316 } | |
| 2876 | 1317 if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN)) |
| 1318 && _this->SetWindowGrab) { | |
| 2753 | 1319 _this->SetWindowGrab(_this, window); |
| 1320 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1321 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1322 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1323 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1324 SDL_OnWindowFocusLost(SDL_Window * window) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1325 { |
| 2753 | 1326 SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window); |
| 0 | 1327 |
| 2753 | 1328 if (window->flags & SDL_WINDOW_FULLSCREEN) { |
| 1329 SDL_MinimizeWindow(window->id); | |
| 1330 SDL_SetDisplayMode(NULL); | |
| 1331 } | |
| 1332 if (display->gamma && _this->SetDisplayGammaRamp) { | |
| 1333 _this->SetDisplayGammaRamp(_this, display->saved_gamma); | |
| 1334 } | |
| 2876 | 1335 if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN)) |
| 1336 && _this->SetWindowGrab) { | |
| 2753 | 1337 _this->SetWindowGrab(_this, window); |
| 1338 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1339 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1340 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1341 SDL_WindowID |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1342 SDL_GetFocusWindow(void) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1343 { |
| 2753 | 1344 SDL_VideoDisplay *display; |
| 1345 int i; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1346 |
| 2753 | 1347 if (!_this) { |
| 1348 return 0; | |
| 1349 } | |
| 1350 display = &SDL_CurrentDisplay; | |
| 1351 for (i = 0; i < display->num_windows; ++i) { | |
| 1352 SDL_Window *window = &display->windows[i]; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1353 |
| 2753 | 1354 if (window->flags & SDL_WINDOW_INPUT_FOCUS) { |
| 1355 return window->id; | |
| 1356 } | |
| 1357 } | |
| 1358 return 0; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1359 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1360 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1361 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1362 SDL_DestroyWindow(SDL_WindowID windowID) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1363 { |
| 2753 | 1364 int i, j; |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1365 |
| 2753 | 1366 if (!_this) { |
| 1367 return; | |
| 1368 } | |
| 1369 /* Restore video mode, etc. */ | |
| 1370 SDL_SendWindowEvent(windowID, SDL_WINDOWEVENT_FOCUS_LOST, 0, 0); | |
| 0 | 1371 |
| 2753 | 1372 for (i = 0; i < _this->num_displays; ++i) { |
| 1373 SDL_VideoDisplay *display = &_this->displays[i]; | |
| 1374 for (j = 0; j < display->num_windows; ++j) { | |
| 1375 SDL_Window *window = &display->windows[j]; | |
| 1376 if (window->id != windowID) { | |
| 1377 continue; | |
| 1378 } | |
| 1379 if (window->title) { | |
| 1380 SDL_free(window->title); | |
| 1381 window->title = NULL; | |
| 1382 } | |
| 1383 if (window->renderer) { | |
| 1384 SDL_DestroyRenderer(window->id); | |
| 1385 window->renderer = NULL; | |
| 1386 } | |
| 1387 if (_this->DestroyWindow) { | |
| 1388 _this->DestroyWindow(_this, window); | |
| 1389 } | |
|
3057
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
1390 if (window->flags & SDL_WINDOW_OPENGL) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
1391 SDL_GL_UnloadLibrary(); |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
1392 } |
| 2753 | 1393 if (j != display->num_windows - 1) { |
| 1394 SDL_memcpy(&display->windows[i], | |
| 1395 &display->windows[i + 1], | |
| 1396 (display->num_windows - i - 1) * sizeof(*window)); | |
| 1397 } | |
| 1398 --display->num_windows; | |
| 1399 return; | |
| 1400 } | |
| 1401 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1402 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1403 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1404 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1405 SDL_AddRenderDriver(int displayIndex, const SDL_RenderDriver * driver) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1406 { |
| 2753 | 1407 SDL_VideoDisplay *display; |
| 1408 SDL_RenderDriver *render_drivers; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1409 |
| 2753 | 1410 if (displayIndex >= _this->num_displays) { |
| 1411 return; | |
| 1412 } | |
| 1413 display = &_this->displays[displayIndex]; | |
|
2119
9341a884a4d9
Fixed running on Windows under VMware
Sam Lantinga <slouken@libsdl.org>
parents:
2075
diff
changeset
|
1414 |
| 2753 | 1415 render_drivers = |
| 1416 SDL_realloc(display->render_drivers, | |
| 1417 (display->num_render_drivers + | |
| 1418 1) * sizeof(*render_drivers)); | |
| 1419 if (render_drivers) { | |
| 1420 render_drivers[display->num_render_drivers] = *driver; | |
| 1421 display->render_drivers = render_drivers; | |
| 1422 display->num_render_drivers++; | |
| 1423 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1424 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1425 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1426 int |
|
1969
5d3724f64f2b
Clarified the difference between render drivers and render contexts
Sam Lantinga <slouken@libsdl.org>
parents:
1967
diff
changeset
|
1427 SDL_GetNumRenderDrivers(void) |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1428 { |
| 2753 | 1429 if (_this) { |
| 1430 return SDL_CurrentDisplay.num_render_drivers; | |
| 1431 } | |
| 1432 return 0; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1433 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1434 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1435 int |
|
1969
5d3724f64f2b
Clarified the difference between render drivers and render contexts
Sam Lantinga <slouken@libsdl.org>
parents:
1967
diff
changeset
|
1436 SDL_GetRenderDriverInfo(int index, SDL_RendererInfo * info) |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1437 { |
| 2753 | 1438 if (!_this) { |
| 1439 SDL_UninitializedVideo(); | |
| 1440 return -1; | |
| 1441 } | |
| 1442 if (index < 0 || index >= SDL_GetNumRenderDrivers()) { | |
| 1443 SDL_SetError("index must be in the range of 0 - %d", | |
| 1444 SDL_GetNumRenderDrivers() - 1); | |
| 1445 return -1; | |
| 1446 } | |
| 1447 *info = SDL_CurrentDisplay.render_drivers[index].info; | |
| 1448 return 0; | |
| 0 | 1449 } |
| 1450 | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1451 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1452 SDL_CreateRenderer(SDL_WindowID windowID, int index, Uint32 flags) |
| 0 | 1453 { |
| 2753 | 1454 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1455 |
| 2753 | 1456 if (!window) { |
|
3091
32efcc94b3da
Fixed return value for SDL_CreateRenderer()
Sam Lantinga <slouken@libsdl.org>
parents:
3083
diff
changeset
|
1457 SDL_SetError("Invalid window ID"); |
|
32efcc94b3da
Fixed return value for SDL_CreateRenderer()
Sam Lantinga <slouken@libsdl.org>
parents:
3083
diff
changeset
|
1458 return -1; |
| 2753 | 1459 } |
| 1460 if (index < 0) { | |
| 1461 const char *override = SDL_getenv("SDL_VIDEO_RENDERER"); | |
| 1462 int n = SDL_GetNumRenderDrivers(); | |
| 1463 for (index = 0; index < n; ++index) { | |
| 1464 SDL_RenderDriver *driver = | |
| 1465 &SDL_CurrentDisplay.render_drivers[index]; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1466 |
| 2753 | 1467 if (override) { |
| 1468 if (SDL_strcasecmp(override, driver->info.name) == 0) { | |
| 1469 break; | |
| 1470 } | |
| 1471 } else { | |
| 1472 if ((driver->info.flags & flags) == flags) { | |
| 1473 break; | |
| 1474 } | |
| 1475 } | |
| 1476 } | |
| 1477 if (index == n) { | |
| 1478 SDL_SetError("Couldn't find matching render driver"); | |
| 1479 return -1; | |
| 1480 } | |
| 1481 } | |
| 1482 if (index >= SDL_GetNumRenderDrivers()) { | |
| 1483 SDL_SetError("index must be -1 or in the range of 0 - %d", | |
| 1484 SDL_GetNumRenderDrivers() - 1); | |
| 1485 return -1; | |
| 1486 } | |
| 1487 /* Free any existing renderer */ | |
| 1488 SDL_DestroyRenderer(windowID); | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1489 |
| 2753 | 1490 /* Create a new renderer instance */ |
| 1491 window->renderer = SDL_CurrentDisplay.render_drivers[index] | |
| 1492 .CreateRenderer(window, flags); | |
|
3092
cad1aefa2ed9
Date: Thu, 12 Mar 2009 15:14:38 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3091
diff
changeset
|
1493 |
| 3139 | 1494 if (window->renderer == NULL) { |
| 1495 /* Assuming renderer set its error */ | |
| 1496 return -1; | |
|
3092
cad1aefa2ed9
Date: Thu, 12 Mar 2009 15:14:38 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3091
diff
changeset
|
1497 } |
|
cad1aefa2ed9
Date: Thu, 12 Mar 2009 15:14:38 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3091
diff
changeset
|
1498 |
| 2753 | 1499 SDL_SelectRenderer(window->id); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1500 |
| 2753 | 1501 return 0; |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1502 } |
| 0 | 1503 |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1504 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1505 SDL_SelectRenderer(SDL_WindowID windowID) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1506 { |
| 2753 | 1507 SDL_Window *window = SDL_GetWindowFromID(windowID); |
| 1508 SDL_Renderer *renderer; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1509 |
| 2753 | 1510 if (!window || !window->renderer) { |
| 1511 return -1; | |
| 1512 } | |
| 1513 renderer = window->renderer; | |
| 1514 if (renderer && renderer->ActivateRenderer) { | |
| 1515 if (renderer->ActivateRenderer(renderer) < 0) { | |
| 1516 return -1; | |
| 1517 } | |
| 1518 } | |
| 1519 SDL_CurrentDisplay.current_renderer = renderer; | |
| 1520 return 0; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1521 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1522 |
|
1969
5d3724f64f2b
Clarified the difference between render drivers and render contexts
Sam Lantinga <slouken@libsdl.org>
parents:
1967
diff
changeset
|
1523 int |
|
5d3724f64f2b
Clarified the difference between render drivers and render contexts
Sam Lantinga <slouken@libsdl.org>
parents:
1967
diff
changeset
|
1524 SDL_GetRendererInfo(SDL_RendererInfo * info) |
|
5d3724f64f2b
Clarified the difference between render drivers and render contexts
Sam Lantinga <slouken@libsdl.org>
parents:
1967
diff
changeset
|
1525 { |
| 2753 | 1526 if (!_this) { |
| 1527 SDL_UninitializedVideo(); | |
| 1528 return -1; | |
| 1529 } | |
| 1530 if (!SDL_CurrentDisplay.current_renderer) { | |
| 1531 SDL_SetError("There is no current renderer"); | |
| 1532 return -1; | |
| 1533 } | |
| 1534 *info = SDL_CurrentDisplay.current_renderer->info; | |
| 1535 return 0; | |
|
1969
5d3724f64f2b
Clarified the difference between render drivers and render contexts
Sam Lantinga <slouken@libsdl.org>
parents:
1967
diff
changeset
|
1536 } |
|
5d3724f64f2b
Clarified the difference between render drivers and render contexts
Sam Lantinga <slouken@libsdl.org>
parents:
1967
diff
changeset
|
1537 |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1538 SDL_TextureID |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1539 SDL_CreateTexture(Uint32 format, int access, int w, int h) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1540 { |
| 2753 | 1541 int hash; |
| 1542 SDL_Renderer *renderer; | |
| 1543 SDL_Texture *texture; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1544 |
| 2753 | 1545 if (!_this) { |
| 1546 SDL_UninitializedVideo(); | |
| 1547 return 0; | |
| 1548 } | |
| 1549 renderer = SDL_CurrentDisplay.current_renderer; | |
|
2810
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
1550 if (!renderer) { |
|
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
1551 return 0; |
|
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
1552 } |
|
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
1553 if (!renderer->CreateTexture) { |
|
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
1554 SDL_Unsupported(); |
| 2753 | 1555 return 0; |
| 1556 } | |
| 1557 texture = (SDL_Texture *) SDL_calloc(1, sizeof(*texture)); | |
| 1558 if (!texture) { | |
| 1559 SDL_OutOfMemory(); | |
| 1560 return 0; | |
| 1561 } | |
| 1562 texture->id = _this->next_object_id++; | |
| 1563 texture->format = format; | |
| 1564 texture->access = access; | |
| 1565 texture->w = w; | |
| 1566 texture->h = h; | |
| 1567 texture->r = 255; | |
| 1568 texture->g = 255; | |
| 1569 texture->b = 255; | |
| 1570 texture->a = 255; | |
| 1571 texture->renderer = renderer; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1572 |
| 2753 | 1573 if (renderer->CreateTexture(renderer, texture) < 0) { |
| 1574 if (renderer->DestroyTexture) { | |
| 1575 renderer->DestroyTexture(renderer, texture); | |
| 1576 } | |
| 1577 SDL_free(texture); | |
| 1578 return 0; | |
| 1579 } | |
| 1580 hash = (texture->id % SDL_arraysize(SDL_CurrentDisplay.textures)); | |
| 1581 texture->next = SDL_CurrentDisplay.textures[hash]; | |
| 1582 SDL_CurrentDisplay.textures[hash] = texture; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1583 |
| 2753 | 1584 return texture->id; |
| 0 | 1585 } |
| 1586 | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1587 SDL_TextureID |
|
2222
926294b2bb4e
Emphasized the separation between SDL_Surface and SDL_Texture
Sam Lantinga <slouken@libsdl.org>
parents:
2130
diff
changeset
|
1588 SDL_CreateTextureFromSurface(Uint32 format, SDL_Surface * surface) |
| 0 | 1589 { |
| 2753 | 1590 SDL_TextureID textureID; |
|
3057
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
1591 Uint32 requested_format = format; |
| 2753 | 1592 SDL_PixelFormat *fmt; |
|
3166
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1593 SDL_Renderer *renderer; |
| 2753 | 1594 int bpp; |
| 1595 Uint32 Rmask, Gmask, Bmask, Amask; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1596 |
| 2753 | 1597 if (!surface) { |
| 1598 SDL_SetError("SDL_CreateTextureFromSurface() passed NULL surface"); | |
| 1599 return 0; | |
| 1600 } | |
| 1601 fmt = surface->format; | |
| 0 | 1602 |
|
3166
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1603 renderer = SDL_CurrentDisplay.current_renderer; |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1604 if (!renderer) { |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1605 return 0; |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1606 } |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1607 |
| 2753 | 1608 if (format) { |
| 1609 if (!SDL_PixelFormatEnumToMasks | |
| 1610 (format, &bpp, &Rmask, &Gmask, &Bmask, &Amask)) { | |
| 1611 SDL_SetError("Unknown pixel format"); | |
| 1612 return 0; | |
| 1613 } | |
| 1614 } else { | |
| 1615 if (surface->format->Amask | |
| 1616 || !(surface->map->info.flags & | |
| 1617 (SDL_COPY_COLORKEY | SDL_COPY_MASK | SDL_COPY_BLEND))) { | |
|
3196
413672b09bb3
Fixed some compile errors and warnings under Visual C++
Sam Lantinga <slouken@libsdl.org>
parents:
3186
diff
changeset
|
1618 Uint32 it; |
|
3178
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1619 int pfmt; |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1620 |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1621 /* Pixel formats, sorted by best first */ |
| 3186 | 1622 static const Uint32 sdl_pformats[] = { |
| 1623 SDL_PIXELFORMAT_ARGB8888, | |
| 1624 SDL_PIXELFORMAT_RGBA8888, | |
| 1625 SDL_PIXELFORMAT_ABGR8888, | |
| 1626 SDL_PIXELFORMAT_BGRA8888, | |
| 1627 SDL_PIXELFORMAT_RGB888, | |
| 1628 SDL_PIXELFORMAT_BGR888, | |
| 1629 SDL_PIXELFORMAT_RGB24, | |
| 1630 SDL_PIXELFORMAT_BGR24, | |
| 1631 SDL_PIXELFORMAT_RGB565, | |
| 1632 SDL_PIXELFORMAT_BGR565, | |
| 1633 SDL_PIXELFORMAT_ARGB1555, | |
| 1634 SDL_PIXELFORMAT_ABGR1555, | |
| 1635 SDL_PIXELFORMAT_RGB555, | |
| 1636 SDL_PIXELFORMAT_BGR555, | |
| 1637 SDL_PIXELFORMAT_ARGB4444, | |
| 1638 SDL_PIXELFORMAT_ABGR4444, | |
| 1639 SDL_PIXELFORMAT_RGB444, | |
| 1640 SDL_PIXELFORMAT_ARGB2101010, | |
| 1641 SDL_PIXELFORMAT_INDEX8, | |
| 1642 SDL_PIXELFORMAT_INDEX4LSB, | |
| 1643 SDL_PIXELFORMAT_INDEX4MSB, | |
| 1644 SDL_PIXELFORMAT_RGB332, | |
| 1645 SDL_PIXELFORMAT_INDEX1LSB, | |
| 1646 SDL_PIXELFORMAT_INDEX1MSB, | |
| 1647 SDL_PIXELFORMAT_UNKNOWN | |
| 1648 }; | |
|
3178
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1649 |
| 2753 | 1650 bpp = fmt->BitsPerPixel; |
| 1651 Rmask = fmt->Rmask; | |
| 1652 Gmask = fmt->Gmask; | |
| 1653 Bmask = fmt->Bmask; | |
| 1654 Amask = fmt->Amask; | |
|
3178
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1655 |
| 3186 | 1656 format = |
| 1657 SDL_MasksToPixelFormatEnum(bpp, Rmask, Gmask, Bmask, Amask); | |
|
3178
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1658 if (!format) { |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1659 SDL_SetError("Unknown pixel format"); |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1660 return 0; |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1661 } |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1662 |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1663 /* Search requested format in the supported texture */ |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1664 /* formats by current renderer */ |
| 3186 | 1665 for (it = 0; it < renderer->info.num_texture_formats; it++) { |
| 1666 if (renderer->info.texture_formats[it] == format) { | |
| 1667 break; | |
|
3178
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1668 } |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1669 } |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1670 |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1671 /* If requested format can't be found, search any best */ |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1672 /* format which renderer provides */ |
| 3186 | 1673 if (it == renderer->info.num_texture_formats) { |
| 1674 pfmt = 0; | |
| 1675 for (;;) { | |
| 1676 if (sdl_pformats[pfmt] == SDL_PIXELFORMAT_UNKNOWN) { | |
|
3178
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1677 break; |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1678 } |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1679 |
| 3186 | 1680 for (it = 0; it < renderer->info.num_texture_formats; |
| 1681 it++) { | |
| 1682 if (renderer->info.texture_formats[it] == | |
| 1683 sdl_pformats[pfmt]) { | |
| 1684 break; | |
| 1685 } | |
|
3178
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1686 } |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1687 |
| 3186 | 1688 if (it != renderer->info.num_texture_formats) { |
| 1689 /* The best format has been found */ | |
| 1690 break; | |
|
3178
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1691 } |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1692 pfmt++; |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1693 } |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1694 |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1695 /* If any format can't be found, then return an error */ |
| 3186 | 1696 if (it == renderer->info.num_texture_formats) { |
| 1697 SDL_SetError | |
| 1698 ("Any of the supported pixel formats can't be found"); | |
|
3178
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1699 return 0; |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1700 } |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1701 |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1702 /* Convert found pixel format back to color masks */ |
| 3186 | 1703 if (SDL_PixelFormatEnumToMasks |
| 1704 (renderer->info.texture_formats[it], &bpp, &Rmask, &Gmask, | |
| 1705 &Bmask, &Amask) != SDL_TRUE) { | |
|
3178
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1706 SDL_SetError("Unknown pixel format"); |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1707 return 0; |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1708 } |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1709 } |
| 2753 | 1710 } else { |
| 1711 /* Need a format with alpha */ | |
|
3196
413672b09bb3
Fixed some compile errors and warnings under Visual C++
Sam Lantinga <slouken@libsdl.org>
parents:
3186
diff
changeset
|
1712 Uint32 it; |
|
3166
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1713 int apfmt; |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1714 |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1715 /* Pixel formats with alpha, sorted by best first */ |
| 3169 | 1716 static const Uint32 sdl_alpha_pformats[] = { |
| 1717 SDL_PIXELFORMAT_ARGB8888, | |
| 1718 SDL_PIXELFORMAT_RGBA8888, | |
| 1719 SDL_PIXELFORMAT_ABGR8888, | |
| 1720 SDL_PIXELFORMAT_BGRA8888, | |
| 1721 SDL_PIXELFORMAT_ARGB1555, | |
| 1722 SDL_PIXELFORMAT_ABGR1555, | |
| 1723 SDL_PIXELFORMAT_ARGB4444, | |
| 1724 SDL_PIXELFORMAT_ABGR4444, | |
| 1725 SDL_PIXELFORMAT_ARGB2101010, | |
| 1726 SDL_PIXELFORMAT_UNKNOWN | |
| 1727 }; | |
|
3166
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1728 |
|
3178
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1729 if (surface->format->Amask) { |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1730 /* If surface already has alpha, then try an original */ |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1731 /* surface format first */ |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1732 bpp = fmt->BitsPerPixel; |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1733 Rmask = fmt->Rmask; |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1734 Gmask = fmt->Gmask; |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1735 Bmask = fmt->Bmask; |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1736 Amask = fmt->Amask; |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1737 } else { |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1738 bpp = 32; |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1739 Rmask = 0x00FF0000; |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1740 Gmask = 0x0000FF00; |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1741 Bmask = 0x000000FF; |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1742 Amask = 0xFF000000; |
|
72edc980789b
1. SDL_CreateTextureFromSurface() now tries to find surface's pixel format.
Mike Gorchak <lestat@i.com.ua>
parents:
3169
diff
changeset
|
1743 } |
|
3166
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1744 |
| 3169 | 1745 format = |
| 1746 SDL_MasksToPixelFormatEnum(bpp, Rmask, Gmask, Bmask, Amask); | |
|
3166
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1747 if (!format) { |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1748 SDL_SetError("Unknown pixel format"); |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1749 return 0; |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1750 } |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1751 |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1752 /* Search this format in the supported texture formats */ |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1753 /* by current renderer */ |
| 3169 | 1754 for (it = 0; it < renderer->info.num_texture_formats; it++) { |
| 1755 if (renderer->info.texture_formats[it] == format) { | |
| 1756 break; | |
|
3166
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1757 } |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1758 } |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1759 |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1760 /* If this format can't be found, search any best */ |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1761 /* compatible format with alpha which renderer provides */ |
| 3169 | 1762 if (it == renderer->info.num_texture_formats) { |
| 1763 apfmt = 0; | |
| 1764 for (;;) { | |
| 1765 if (sdl_alpha_pformats[apfmt] == SDL_PIXELFORMAT_UNKNOWN) { | |
|
3166
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1766 break; |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1767 } |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1768 |
| 3169 | 1769 for (it = 0; it < renderer->info.num_texture_formats; |
| 1770 it++) { | |
| 1771 if (renderer->info.texture_formats[it] == | |
| 1772 sdl_alpha_pformats[apfmt]) { | |
| 1773 break; | |
| 1774 } | |
|
3166
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1775 } |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1776 |
| 3169 | 1777 if (it != renderer->info.num_texture_formats) { |
| 1778 /* Compatible format has been found */ | |
| 1779 break; | |
|
3166
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1780 } |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1781 apfmt++; |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1782 } |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1783 |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1784 /* If compatible format can't be found, then return an error */ |
| 3169 | 1785 if (it == renderer->info.num_texture_formats) { |
|
3166
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1786 SDL_SetError("Compatible pixel format can't be found"); |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1787 return 0; |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1788 } |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1789 |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1790 /* Convert found pixel format back to color masks */ |
| 3169 | 1791 if (SDL_PixelFormatEnumToMasks |
| 1792 (renderer->info.texture_formats[it], &bpp, &Rmask, &Gmask, | |
| 1793 &Bmask, &Amask) != SDL_TRUE) { | |
|
3166
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1794 SDL_SetError("Unknown pixel format"); |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1795 return 0; |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1796 } |
|
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1797 } |
| 2753 | 1798 } |
|
3166
3a63a5824557
Best pixel formats with alpha search code has been added to function which converts surface to texture with enabled color keys. Now "testsprite2 --renderer opengl_es" works fine with all pixel formats with alpha. This affects other renderers too.
Mike Gorchak <lestat@i.com.ua>
parents:
3162
diff
changeset
|
1799 |
| 2753 | 1800 format = SDL_MasksToPixelFormatEnum(bpp, Rmask, Gmask, Bmask, Amask); |
| 1801 if (!format) { | |
| 1802 SDL_SetError("Unknown pixel format"); | |
| 1803 return 0; | |
| 1804 } | |
| 1805 } | |
| 0 | 1806 |
| 2753 | 1807 textureID = |
| 1808 SDL_CreateTexture(format, SDL_TEXTUREACCESS_STATIC, surface->w, | |
| 1809 surface->h); | |
|
3057
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
1810 if (!textureID && !requested_format) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
1811 SDL_DisplayMode desktop_mode; |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
1812 SDL_GetDesktopDisplayMode(&desktop_mode); |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
1813 format = desktop_mode.format; |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
1814 textureID = |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
1815 SDL_CreateTexture(format, SDL_TEXTUREACCESS_STATIC, surface->w, |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
1816 surface->h); |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
1817 } |
| 2753 | 1818 if (!textureID) { |
| 1819 return 0; | |
| 1820 } | |
| 1821 if (bpp == fmt->BitsPerPixel && Rmask == fmt->Rmask && Gmask == fmt->Gmask | |
| 1822 && Bmask == fmt->Bmask && Amask == fmt->Amask) { | |
| 1823 if (SDL_MUSTLOCK(surface)) { | |
| 1824 if (SDL_LockSurface(surface) < 0) { | |
| 1825 SDL_DestroyTexture(textureID); | |
| 1826 return 0; | |
| 1827 } | |
| 1828 SDL_UpdateTexture(textureID, NULL, surface->pixels, | |
| 1829 surface->pitch); | |
| 1830 SDL_UnlockSurface(surface); | |
| 1831 } else { | |
| 1832 SDL_UpdateTexture(textureID, NULL, surface->pixels, | |
| 1833 surface->pitch); | |
| 1834 } | |
| 1835 } else { | |
|
2967
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1836 SDL_PixelFormat dst_fmt; |
| 2753 | 1837 SDL_Surface *dst = NULL; |
|
2222
926294b2bb4e
Emphasized the separation between SDL_Surface and SDL_Texture
Sam Lantinga <slouken@libsdl.org>
parents:
2130
diff
changeset
|
1838 |
| 2753 | 1839 /* Set up a destination surface for the texture update */ |
|
2967
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1840 SDL_InitFormat(&dst_fmt, bpp, Rmask, Gmask, Bmask, Amask); |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1841 if (SDL_ISPIXELFORMAT_INDEXED(format)) { |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1842 dst_fmt.palette = |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1843 SDL_AllocPalette((1 << SDL_BITSPERPIXEL(format))); |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1844 if (dst_fmt.palette) { |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1845 /* |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1846 * FIXME: Should we try to copy |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1847 * fmt->palette? |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1848 */ |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1849 SDL_DitherColors(dst_fmt.palette->colors, |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1850 SDL_BITSPERPIXEL(format)); |
| 2753 | 1851 } |
|
2967
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1852 } |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1853 dst = SDL_ConvertSurface(surface, &dst_fmt, 0); |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1854 if (dst) { |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1855 SDL_UpdateTexture(textureID, NULL, dst->pixels, dst->pitch); |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1856 SDL_FreeSurface(dst); |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1857 } |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1858 if (dst_fmt.palette) { |
|
e4a469d6ddab
Implemented SDL_SetWindowIcon(), with translucent icon support under X11.
Sam Lantinga <slouken@libsdl.org>
parents:
2934
diff
changeset
|
1859 SDL_FreePalette(dst_fmt.palette); |
| 2753 | 1860 } |
| 1861 if (!dst) { | |
| 1862 SDL_DestroyTexture(textureID); | |
| 1863 return 0; | |
| 1864 } | |
| 1865 } | |
|
2743
453ec0c21f6f
Rolling back changes to revision 4071 ... made some mistakes, will try merging work again.
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2740
diff
changeset
|
1866 |
|
3053
aa34d1180d30
When creating a software texture, synchronize the surface with the texture.
Sam Lantinga <slouken@libsdl.org>
parents:
3029
diff
changeset
|
1867 { |
|
aa34d1180d30
When creating a software texture, synchronize the surface with the texture.
Sam Lantinga <slouken@libsdl.org>
parents:
3029
diff
changeset
|
1868 Uint8 r, g, b, a; |
|
aa34d1180d30
When creating a software texture, synchronize the surface with the texture.
Sam Lantinga <slouken@libsdl.org>
parents:
3029
diff
changeset
|
1869 int blendMode; |
|
aa34d1180d30
When creating a software texture, synchronize the surface with the texture.
Sam Lantinga <slouken@libsdl.org>
parents:
3029
diff
changeset
|
1870 int scaleMode; |
|
aa34d1180d30
When creating a software texture, synchronize the surface with the texture.
Sam Lantinga <slouken@libsdl.org>
parents:
3029
diff
changeset
|
1871 |
|
aa34d1180d30
When creating a software texture, synchronize the surface with the texture.
Sam Lantinga <slouken@libsdl.org>
parents:
3029
diff
changeset
|
1872 SDL_GetSurfaceColorMod(surface, &r, &g, &b); |
|
aa34d1180d30
When creating a software texture, synchronize the surface with the texture.
Sam Lantinga <slouken@libsdl.org>
parents:
3029
diff
changeset
|
1873 SDL_SetTextureColorMod(textureID, r, g, b); |
|
aa34d1180d30
When creating a software texture, synchronize the surface with the texture.
Sam Lantinga <slouken@libsdl.org>
parents:
3029
diff
changeset
|
1874 |
|
aa34d1180d30
When creating a software texture, synchronize the surface with the texture.
Sam Lantinga <slouken@libsdl.org>
parents:
3029
diff
changeset
|
1875 SDL_GetSurfaceAlphaMod(surface, &a); |
|
aa34d1180d30
When creating a software texture, synchronize the surface with the texture.
Sam Lantinga <slouken@libsdl.org>
parents:
3029
diff
changeset
|
1876 SDL_SetTextureAlphaMod(textureID, a); |
|
aa34d1180d30
When creating a software texture, synchronize the surface with the texture.
Sam Lantinga <slouken@libsdl.org>
parents:
3029
diff
changeset
|
1877 |
|
aa34d1180d30
When creating a software texture, synchronize the surface with the texture.
Sam Lantinga <slouken@libsdl.org>
parents:
3029
diff
changeset
|
1878 SDL_GetSurfaceBlendMode(surface, &blendMode); |
|
aa34d1180d30
When creating a software texture, synchronize the surface with the texture.
Sam Lantinga <slouken@libsdl.org>
parents:
3029
diff
changeset
|
1879 SDL_SetTextureBlendMode(textureID, blendMode); |
|
aa34d1180d30
When creating a software texture, synchronize the surface with the texture.
Sam Lantinga <slouken@libsdl.org>
parents:
3029
diff
changeset
|
1880 |
|
aa34d1180d30
When creating a software texture, synchronize the surface with the texture.
Sam Lantinga <slouken@libsdl.org>
parents:
3029
diff
changeset
|
1881 SDL_GetSurfaceScaleMode(surface, &scaleMode); |
|
aa34d1180d30
When creating a software texture, synchronize the surface with the texture.
Sam Lantinga <slouken@libsdl.org>
parents:
3029
diff
changeset
|
1882 SDL_SetTextureScaleMode(textureID, scaleMode); |
|
aa34d1180d30
When creating a software texture, synchronize the surface with the texture.
Sam Lantinga <slouken@libsdl.org>
parents:
3029
diff
changeset
|
1883 } |
|
aa34d1180d30
When creating a software texture, synchronize the surface with the texture.
Sam Lantinga <slouken@libsdl.org>
parents:
3029
diff
changeset
|
1884 |
| 2753 | 1885 if (SDL_ISPIXELFORMAT_INDEXED(format) && fmt->palette) { |
| 1886 SDL_SetTexturePalette(textureID, fmt->palette->colors, 0, | |
| 1887 fmt->palette->ncolors); | |
| 1888 } | |
| 1889 return textureID; | |
| 0 | 1890 } |
| 1891 | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1892 static __inline__ SDL_Texture * |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1893 SDL_GetTextureFromID(SDL_TextureID textureID) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1894 { |
| 2753 | 1895 int hash; |
| 1896 SDL_Texture *texture; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1897 |
| 2753 | 1898 if (!_this) { |
| 1899 return NULL; | |
| 1900 } | |
| 1901 hash = (textureID % SDL_arraysize(SDL_CurrentDisplay.textures)); | |
| 1902 for (texture = SDL_CurrentDisplay.textures[hash]; texture; | |
| 1903 texture = texture->next) { | |
| 1904 if (texture->id == textureID) { | |
| 1905 return texture; | |
| 1906 } | |
| 1907 } | |
| 1908 return NULL; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1909 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1910 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1911 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1912 SDL_QueryTexture(SDL_TextureID textureID, Uint32 * format, int *access, |
| 2753 | 1913 int *w, int *h) |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1914 { |
| 2753 | 1915 SDL_Texture *texture = SDL_GetTextureFromID(textureID); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1916 |
| 2753 | 1917 if (!texture) { |
| 1918 return -1; | |
| 1919 } | |
| 1920 if (format) { | |
| 1921 *format = texture->format; | |
| 1922 } | |
| 1923 if (access) { | |
| 1924 *access = texture->access; | |
| 1925 } | |
| 1926 if (w) { | |
| 1927 *w = texture->w; | |
| 1928 } | |
| 1929 if (h) { | |
| 1930 *h = texture->h; | |
| 1931 } | |
| 1932 return 0; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1933 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1934 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1935 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1936 SDL_QueryTexturePixels(SDL_TextureID textureID, void **pixels, int *pitch) |
| 0 | 1937 { |
| 2753 | 1938 SDL_Texture *texture = SDL_GetTextureFromID(textureID); |
| 1939 SDL_Renderer *renderer; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1940 |
| 2753 | 1941 if (!texture) { |
| 1942 return -1; | |
| 1943 } | |
| 1944 renderer = texture->renderer; | |
| 1945 if (!renderer->QueryTexturePixels) { | |
|
2810
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
1946 SDL_Unsupported(); |
| 2753 | 1947 return -1; |
| 1948 } | |
| 1949 return renderer->QueryTexturePixels(renderer, texture, pixels, pitch); | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1950 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1951 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1952 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1953 SDL_SetTexturePalette(SDL_TextureID textureID, const SDL_Color * colors, |
| 2753 | 1954 int firstcolor, int ncolors) |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1955 { |
| 2753 | 1956 SDL_Texture *texture = SDL_GetTextureFromID(textureID); |
| 1957 SDL_Renderer *renderer; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1958 |
| 2753 | 1959 if (!texture) { |
| 1960 return -1; | |
| 1961 } | |
| 1962 renderer = texture->renderer; | |
| 1963 if (!renderer->SetTexturePalette) { | |
|
2810
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
1964 SDL_Unsupported(); |
| 2753 | 1965 return -1; |
| 1966 } | |
| 1967 return renderer->SetTexturePalette(renderer, texture, colors, firstcolor, | |
| 1968 ncolors); | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1969 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1970 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1971 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1972 SDL_GetTexturePalette(SDL_TextureID textureID, SDL_Color * colors, |
| 2753 | 1973 int firstcolor, int ncolors) |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1974 { |
| 2753 | 1975 SDL_Texture *texture = SDL_GetTextureFromID(textureID); |
| 1976 SDL_Renderer *renderer; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1977 |
| 2753 | 1978 if (!texture) { |
| 1979 return -1; | |
| 1980 } | |
| 1981 renderer = texture->renderer; | |
| 1982 if (!renderer->GetTexturePalette) { | |
|
2810
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
1983 SDL_Unsupported(); |
| 2753 | 1984 return -1; |
| 1985 } | |
| 1986 return renderer->GetTexturePalette(renderer, texture, colors, firstcolor, | |
| 1987 ncolors); | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1988 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1989 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
1990 int |
|
1985
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
1991 SDL_SetTextureColorMod(SDL_TextureID textureID, Uint8 r, Uint8 g, Uint8 b) |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
1992 { |
| 2753 | 1993 SDL_Texture *texture = SDL_GetTextureFromID(textureID); |
| 1994 SDL_Renderer *renderer; | |
|
1985
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
1995 |
| 2753 | 1996 if (!texture) { |
| 1997 return -1; | |
| 1998 } | |
| 1999 renderer = texture->renderer; | |
| 2000 if (!renderer->SetTextureColorMod) { | |
|
2810
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
2001 SDL_Unsupported(); |
| 2753 | 2002 return -1; |
| 2003 } | |
| 2004 if (r < 255 || g < 255 || b < 255) { | |
| 2005 texture->modMode |= SDL_TEXTUREMODULATE_COLOR; | |
| 2006 } else { | |
| 2007 texture->modMode &= ~SDL_TEXTUREMODULATE_COLOR; | |
| 2008 } | |
| 2009 texture->r = r; | |
| 2010 texture->g = g; | |
| 2011 texture->b = b; | |
| 2012 return renderer->SetTextureColorMod(renderer, texture); | |
|
1985
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2013 } |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2014 |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2015 int |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2016 SDL_GetTextureColorMod(SDL_TextureID textureID, Uint8 * r, Uint8 * g, |
| 2753 | 2017 Uint8 * b) |
|
1985
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2018 { |
| 2753 | 2019 SDL_Texture *texture = SDL_GetTextureFromID(textureID); |
| 2020 SDL_Renderer *renderer; | |
|
1985
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2021 |
| 2753 | 2022 if (!texture) { |
| 2023 return -1; | |
| 2024 } | |
| 2025 renderer = texture->renderer; | |
| 2026 if (r) { | |
| 2027 *r = texture->r; | |
| 2028 } | |
| 2029 if (g) { | |
| 2030 *g = texture->g; | |
| 2031 } | |
| 2032 if (b) { | |
| 2033 *b = texture->b; | |
| 2034 } | |
| 2035 return 0; | |
|
1985
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2036 } |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2037 |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2038 int |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2039 SDL_SetTextureAlphaMod(SDL_TextureID textureID, Uint8 alpha) |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2040 { |
| 2753 | 2041 SDL_Texture *texture = SDL_GetTextureFromID(textureID); |
| 2042 SDL_Renderer *renderer; | |
|
1985
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2043 |
| 2753 | 2044 if (!texture) { |
| 2045 return -1; | |
| 2046 } | |
| 2047 renderer = texture->renderer; | |
| 2048 if (!renderer->SetTextureAlphaMod) { | |
|
2810
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
2049 SDL_Unsupported(); |
| 2753 | 2050 return -1; |
| 2051 } | |
| 2052 if (alpha < 255) { | |
| 2053 texture->modMode |= SDL_TEXTUREMODULATE_ALPHA; | |
| 2054 } else { | |
| 2055 texture->modMode &= ~SDL_TEXTUREMODULATE_ALPHA; | |
| 2056 } | |
| 2057 texture->a = alpha; | |
| 2058 return renderer->SetTextureAlphaMod(renderer, texture); | |
|
1985
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2059 } |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2060 |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2061 int |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2062 SDL_GetTextureAlphaMod(SDL_TextureID textureID, Uint8 * alpha) |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2063 { |
| 2753 | 2064 SDL_Texture *texture = SDL_GetTextureFromID(textureID); |
|
1985
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2065 |
| 2753 | 2066 if (!texture) { |
| 2067 return -1; | |
| 2068 } | |
| 2069 if (alpha) { | |
| 2070 *alpha = texture->a; | |
| 2071 } | |
| 2072 return 0; | |
|
1985
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2073 } |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2074 |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2075 int |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2076 SDL_SetTextureBlendMode(SDL_TextureID textureID, int blendMode) |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2077 { |
| 2753 | 2078 SDL_Texture *texture = SDL_GetTextureFromID(textureID); |
| 2079 SDL_Renderer *renderer; | |
|
1985
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2080 |
| 2753 | 2081 if (!texture) { |
| 2082 return -1; | |
| 2083 } | |
| 2084 renderer = texture->renderer; | |
| 2085 if (!renderer->SetTextureBlendMode) { | |
|
2810
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
2086 SDL_Unsupported(); |
| 2753 | 2087 return -1; |
| 2088 } | |
| 2089 texture->blendMode = blendMode; | |
| 2090 return renderer->SetTextureBlendMode(renderer, texture); | |
|
1985
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2091 } |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2092 |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2093 int |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2094 SDL_GetTextureBlendMode(SDL_TextureID textureID, int *blendMode) |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2095 { |
| 2753 | 2096 SDL_Texture *texture = SDL_GetTextureFromID(textureID); |
|
1985
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2097 |
| 2753 | 2098 if (!texture) { |
| 2099 return -1; | |
| 2100 } | |
| 2101 if (blendMode) { | |
| 2102 *blendMode = texture->blendMode; | |
| 2103 } | |
| 2104 return 0; | |
|
1985
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2105 } |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2106 |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2107 int |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2108 SDL_SetTextureScaleMode(SDL_TextureID textureID, int scaleMode) |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2109 { |
| 2753 | 2110 SDL_Texture *texture = SDL_GetTextureFromID(textureID); |
| 2111 SDL_Renderer *renderer; | |
|
1985
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2112 |
| 2753 | 2113 if (!texture) { |
| 2114 return -1; | |
| 2115 } | |
| 2116 renderer = texture->renderer; | |
| 2117 if (!renderer->SetTextureScaleMode) { | |
|
2810
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
2118 SDL_Unsupported(); |
| 2753 | 2119 return -1; |
| 2120 } | |
| 2121 texture->scaleMode = scaleMode; | |
| 2122 return renderer->SetTextureScaleMode(renderer, texture); | |
|
1985
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2123 } |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2124 |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2125 int |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2126 SDL_GetTextureScaleMode(SDL_TextureID textureID, int *scaleMode) |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2127 { |
| 2753 | 2128 SDL_Texture *texture = SDL_GetTextureFromID(textureID); |
|
1985
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2129 |
| 2753 | 2130 if (!texture) { |
| 2131 return -1; | |
| 2132 } | |
| 2133 if (scaleMode) { | |
| 2134 *scaleMode = texture->scaleMode; | |
| 2135 } | |
| 2136 return 0; | |
|
1985
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2137 } |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2138 |
|
8055185ae4ed
Added source color and alpha modulation support.
Sam Lantinga <slouken@libsdl.org>
parents:
1981
diff
changeset
|
2139 int |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2140 SDL_UpdateTexture(SDL_TextureID textureID, const SDL_Rect * rect, |
| 2753 | 2141 const void *pixels, int pitch) |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2142 { |
| 2753 | 2143 SDL_Texture *texture = SDL_GetTextureFromID(textureID); |
| 2144 SDL_Renderer *renderer; | |
| 2145 SDL_Rect full_rect; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2146 |
| 2753 | 2147 if (!texture) { |
| 2148 return -1; | |
| 2149 } | |
| 2150 renderer = texture->renderer; | |
| 2151 if (!renderer->UpdateTexture) { | |
|
2810
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
2152 SDL_Unsupported(); |
| 2753 | 2153 return -1; |
| 2154 } | |
| 2155 if (!rect) { | |
| 2156 full_rect.x = 0; | |
| 2157 full_rect.y = 0; | |
| 2158 full_rect.w = texture->w; | |
| 2159 full_rect.h = texture->h; | |
| 2160 rect = &full_rect; | |
| 2161 } | |
| 2162 return renderer->UpdateTexture(renderer, texture, rect, pixels, pitch); | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2163 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2164 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2165 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2166 SDL_LockTexture(SDL_TextureID textureID, const SDL_Rect * rect, int markDirty, |
| 2753 | 2167 void **pixels, int *pitch) |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2168 { |
| 2753 | 2169 SDL_Texture *texture = SDL_GetTextureFromID(textureID); |
| 2170 SDL_Renderer *renderer; | |
| 2171 SDL_Rect full_rect; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2172 |
| 2753 | 2173 if (!texture) { |
| 2174 return -1; | |
| 2175 } | |
| 2176 if (texture->access != SDL_TEXTUREACCESS_STREAMING) { | |
| 2177 SDL_SetError("SDL_LockTexture(): texture must be streaming"); | |
| 2178 return -1; | |
| 2179 } | |
| 2180 renderer = texture->renderer; | |
| 2181 if (!renderer->LockTexture) { | |
|
2810
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
2182 SDL_Unsupported(); |
| 2753 | 2183 return -1; |
| 2184 } | |
| 2185 if (!rect) { | |
| 2186 full_rect.x = 0; | |
| 2187 full_rect.y = 0; | |
| 2188 full_rect.w = texture->w; | |
| 2189 full_rect.h = texture->h; | |
| 2190 rect = &full_rect; | |
| 2191 } | |
| 2192 return renderer->LockTexture(renderer, texture, rect, markDirty, pixels, | |
| 2193 pitch); | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2194 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2195 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2196 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2197 SDL_UnlockTexture(SDL_TextureID textureID) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2198 { |
| 2753 | 2199 SDL_Texture *texture = SDL_GetTextureFromID(textureID); |
| 2200 SDL_Renderer *renderer; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2201 |
| 2753 | 2202 if (!texture) { |
| 2203 return; | |
| 2204 } | |
| 2205 if (texture->access != SDL_TEXTUREACCESS_STREAMING) { | |
| 2206 return; | |
| 2207 } | |
| 2208 renderer = texture->renderer; | |
| 2209 if (!renderer->UnlockTexture) { | |
| 2210 return; | |
| 2211 } | |
| 2212 renderer->UnlockTexture(renderer, texture); | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2213 } |
| 0 | 2214 |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2215 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2216 SDL_DirtyTexture(SDL_TextureID textureID, int numrects, |
| 2753 | 2217 const SDL_Rect * rects) |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2218 { |
| 2753 | 2219 SDL_Texture *texture = SDL_GetTextureFromID(textureID); |
| 2220 SDL_Renderer *renderer; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2221 |
| 2753 | 2222 if (!texture) { |
| 2223 return; | |
| 2224 } | |
| 2225 if (texture->access != SDL_TEXTUREACCESS_STREAMING) { | |
| 2226 return; | |
| 2227 } | |
| 2228 renderer = texture->renderer; | |
| 2229 if (!renderer->DirtyTexture) { | |
| 2230 return; | |
| 2231 } | |
| 2232 renderer->DirtyTexture(renderer, texture, numrects, rects); | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2233 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2234 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2235 int |
|
2884
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2236 SDL_SetRenderDrawColor(Uint8 r, Uint8 g, Uint8 b, Uint8 a) |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2237 { |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2238 SDL_Renderer *renderer; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2239 |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2240 if (!_this) { |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2241 SDL_UninitializedVideo(); |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2242 return -1; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2243 } |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2244 renderer = SDL_CurrentDisplay.current_renderer; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2245 if (!renderer) { |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2246 return -1; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2247 } |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2248 renderer->r = r; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2249 renderer->g = g; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2250 renderer->b = b; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2251 renderer->a = a; |
|
2927
2133d2d300fd
SetDrawColor() and SetDrawBlendMode() are optional
Sam Lantinga <slouken@libsdl.org>
parents:
2918
diff
changeset
|
2252 if (renderer->SetDrawColor) { |
|
2133d2d300fd
SetDrawColor() and SetDrawBlendMode() are optional
Sam Lantinga <slouken@libsdl.org>
parents:
2918
diff
changeset
|
2253 return renderer->SetDrawColor(renderer); |
|
2133d2d300fd
SetDrawColor() and SetDrawBlendMode() are optional
Sam Lantinga <slouken@libsdl.org>
parents:
2918
diff
changeset
|
2254 } else { |
|
2133d2d300fd
SetDrawColor() and SetDrawBlendMode() are optional
Sam Lantinga <slouken@libsdl.org>
parents:
2918
diff
changeset
|
2255 return 0; |
|
2133d2d300fd
SetDrawColor() and SetDrawBlendMode() are optional
Sam Lantinga <slouken@libsdl.org>
parents:
2918
diff
changeset
|
2256 } |
|
2884
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2257 } |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2258 |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2259 int |
| 2885 | 2260 SDL_GetRenderDrawColor(Uint8 * r, Uint8 * g, Uint8 * b, Uint8 * a) |
|
2884
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2261 { |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2262 SDL_Renderer *renderer; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2263 |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2264 if (!_this) { |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2265 SDL_UninitializedVideo(); |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2266 return -1; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2267 } |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2268 renderer = SDL_CurrentDisplay.current_renderer; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2269 if (!renderer) { |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2270 return -1; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2271 } |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2272 if (r) { |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2273 *r = renderer->r; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2274 } |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2275 if (g) { |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2276 *g = renderer->g; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2277 } |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2278 if (b) { |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2279 *b = renderer->b; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2280 } |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2281 if (a) { |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2282 *a = renderer->a; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2283 } |
|
2928
e171ce9bdbad
Fixed missing return value
Sam Lantinga <slouken@libsdl.org>
parents:
2927
diff
changeset
|
2284 return 0; |
|
2884
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2285 } |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2286 |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2287 int |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2288 SDL_SetRenderDrawBlendMode(int blendMode) |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2289 { |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2290 SDL_Renderer *renderer; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2291 |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2292 if (!_this) { |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2293 SDL_UninitializedVideo(); |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2294 return -1; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2295 } |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2296 renderer = SDL_CurrentDisplay.current_renderer; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2297 if (!renderer) { |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2298 return -1; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2299 } |
|
2927
2133d2d300fd
SetDrawColor() and SetDrawBlendMode() are optional
Sam Lantinga <slouken@libsdl.org>
parents:
2918
diff
changeset
|
2300 renderer->blendMode = blendMode; |
|
2133d2d300fd
SetDrawColor() and SetDrawBlendMode() are optional
Sam Lantinga <slouken@libsdl.org>
parents:
2918
diff
changeset
|
2301 if (renderer->SetDrawBlendMode) { |
|
2133d2d300fd
SetDrawColor() and SetDrawBlendMode() are optional
Sam Lantinga <slouken@libsdl.org>
parents:
2918
diff
changeset
|
2302 return renderer->SetDrawBlendMode(renderer); |
|
2133d2d300fd
SetDrawColor() and SetDrawBlendMode() are optional
Sam Lantinga <slouken@libsdl.org>
parents:
2918
diff
changeset
|
2303 } else { |
|
2133d2d300fd
SetDrawColor() and SetDrawBlendMode() are optional
Sam Lantinga <slouken@libsdl.org>
parents:
2918
diff
changeset
|
2304 return 0; |
|
2884
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2305 } |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2306 } |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2307 |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2308 int |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2309 SDL_GetRenderDrawBlendMode(int *blendMode) |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2310 { |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2311 SDL_Renderer *renderer; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2312 |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2313 if (!_this) { |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2314 SDL_UninitializedVideo(); |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2315 return -1; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2316 } |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2317 renderer = SDL_CurrentDisplay.current_renderer; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2318 if (!renderer) { |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2319 return -1; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2320 } |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2321 *blendMode = renderer->blendMode; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2322 return 0; |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2323 } |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2324 |
| 2901 | 2325 int |
| 2326 SDL_RenderPoint(int x, int y) | |
| 2327 { | |
| 2328 SDL_Renderer *renderer; | |
| 2329 SDL_Window *window; | |
| 2330 | |
| 2331 if (!_this) { | |
| 2332 SDL_UninitializedVideo(); | |
| 2333 return -1; | |
| 2334 } | |
| 2335 renderer = SDL_CurrentDisplay.current_renderer; | |
| 2336 if (!renderer) { | |
| 2337 return -1; | |
| 2338 } | |
| 2339 if (!renderer->RenderPoint) { | |
| 2340 SDL_Unsupported(); | |
| 2341 return -1; | |
| 2342 } | |
| 2343 window = SDL_GetWindowFromID(renderer->window); | |
| 2344 if (x < 0 || y < 0 || x >= window->w || y >= window->h) { | |
| 2345 return 0; | |
| 2346 } | |
| 2347 return renderer->RenderPoint(renderer, x, y); | |
| 2348 } | |
| 2349 | |
| 2350 int | |
| 2351 SDL_RenderLine(int x1, int y1, int x2, int y2) | |
| 2352 { | |
| 2353 SDL_Renderer *renderer; | |
| 2354 SDL_Window *window; | |
| 2355 SDL_Rect real_rect; | |
| 2356 | |
| 2357 if (x1 == x2 && y1 == y2) { | |
| 2358 return SDL_RenderPoint(x1, y1); | |
| 2359 } | |
| 2360 | |
| 2361 if (!_this) { | |
| 2362 SDL_UninitializedVideo(); | |
| 2363 return -1; | |
| 2364 } | |
| 2365 renderer = SDL_CurrentDisplay.current_renderer; | |
| 2366 if (!renderer) { | |
| 2367 return -1; | |
| 2368 } | |
| 2369 if (!renderer->RenderLine) { | |
| 2370 SDL_Unsupported(); | |
| 2371 return -1; | |
| 2372 } | |
| 2373 window = SDL_GetWindowFromID(renderer->window); | |
| 2909 | 2374 |
| 2901 | 2375 real_rect.x = 0; |
| 2376 real_rect.y = 0; | |
| 2377 real_rect.w = window->w; | |
| 2378 real_rect.h = window->h; | |
|
2910
27d8b12e0e8e
Fixed argument order to the line clipping routine
Sam Lantinga <slouken@libsdl.org>
parents:
2909
diff
changeset
|
2379 if (!SDL_IntersectRectAndLine(&real_rect, &x1, &y1, &x2, &y2)) { |
| 2909 | 2380 return (0); |
| 2901 | 2381 } |
| 2382 return renderer->RenderLine(renderer, x1, y1, x2, y2); | |
| 2383 } | |
|
2884
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2384 |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2385 int |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2386 SDL_RenderFill(const SDL_Rect * rect) |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2387 { |
| 2753 | 2388 SDL_Renderer *renderer; |
| 2389 SDL_Window *window; | |
| 2390 SDL_Rect real_rect; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2391 |
| 2753 | 2392 if (!_this) { |
| 2393 SDL_UninitializedVideo(); | |
| 2394 return -1; | |
| 2395 } | |
| 2396 renderer = SDL_CurrentDisplay.current_renderer; | |
|
2810
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
2397 if (!renderer) { |
|
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
2398 return -1; |
|
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
2399 } |
| 2814 | 2400 if (!renderer->RenderFill) { |
|
2810
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
2401 SDL_Unsupported(); |
| 2753 | 2402 return -1; |
| 2403 } | |
| 2404 window = SDL_GetWindowFromID(renderer->window); | |
|
2908
aa6ba38c1714
Added clipping for render copy
Sam Lantinga <slouken@libsdl.org>
parents:
2901
diff
changeset
|
2405 |
| 2753 | 2406 real_rect.x = 0; |
| 2407 real_rect.y = 0; | |
| 2408 real_rect.w = window->w; | |
| 2409 real_rect.h = window->h; | |
| 2410 if (rect) { | |
| 2411 if (!SDL_IntersectRect(rect, &real_rect, &real_rect)) { | |
| 2412 return 0; | |
| 2413 } | |
| 2414 } | |
|
2884
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2415 return renderer->RenderFill(renderer, &real_rect); |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2416 } |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2417 |
|
9dde605c7540
Date: Fri, 19 Dec 2008 20:17:35 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
2876
diff
changeset
|
2418 int |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2419 SDL_RenderCopy(SDL_TextureID textureID, const SDL_Rect * srcrect, |
| 2753 | 2420 const SDL_Rect * dstrect) |
| 0 | 2421 { |
| 2753 | 2422 SDL_Texture *texture = SDL_GetTextureFromID(textureID); |
| 2423 SDL_Renderer *renderer; | |
| 2424 SDL_Window *window; | |
| 2425 SDL_Rect real_srcrect; | |
| 2426 SDL_Rect real_dstrect; | |
| 0 | 2427 |
| 2753 | 2428 if (!texture || texture->renderer != SDL_CurrentDisplay.current_renderer) { |
| 2429 return -1; | |
| 2430 } | |
| 2431 renderer = SDL_CurrentDisplay.current_renderer; | |
|
2810
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
2432 if (!renderer) { |
|
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
2433 return -1; |
|
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
2434 } |
|
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
2435 if (!renderer->RenderCopy) { |
|
27cb878a278e
Implemented the X11 (non-OpenGL) renderer, no alpha or scaling available.
Sam Lantinga <slouken@libsdl.org>
parents:
2789
diff
changeset
|
2436 SDL_Unsupported(); |
| 2753 | 2437 return -1; |
| 2438 } | |
| 2439 window = SDL_GetWindowFromID(renderer->window); | |
|
2908
aa6ba38c1714
Added clipping for render copy
Sam Lantinga <slouken@libsdl.org>
parents:
2901
diff
changeset
|
2440 |
|
aa6ba38c1714
Added clipping for render copy
Sam Lantinga <slouken@libsdl.org>
parents:
2901
diff
changeset
|
2441 real_srcrect.x = 0; |
|
aa6ba38c1714
Added clipping for render copy
Sam Lantinga <slouken@libsdl.org>
parents:
2901
diff
changeset
|
2442 real_srcrect.y = 0; |
|
aa6ba38c1714
Added clipping for render copy
Sam Lantinga <slouken@libsdl.org>
parents:
2901
diff
changeset
|
2443 real_srcrect.w = texture->w; |
|
aa6ba38c1714
Added clipping for render copy
Sam Lantinga <slouken@libsdl.org>
parents:
2901
diff
changeset
|
2444 real_srcrect.h = texture->h; |
| 2753 | 2445 if (srcrect) { |
|
2908
aa6ba38c1714
Added clipping for render copy
Sam Lantinga <slouken@libsdl.org>
parents:
2901
diff
changeset
|
2446 if (!SDL_IntersectRect(srcrect, &real_srcrect, &real_srcrect)) { |
|
aa6ba38c1714
Added clipping for render copy
Sam Lantinga <slouken@libsdl.org>
parents:
2901
diff
changeset
|
2447 return 0; |
|
aa6ba38c1714
Added clipping for render copy
Sam Lantinga <slouken@libsdl.org>
parents:
2901
diff
changeset
|
2448 } |
| 2753 | 2449 } |
|
2908
aa6ba38c1714
Added clipping for render copy
Sam Lantinga <slouken@libsdl.org>
parents:
2901
diff
changeset
|
2450 |
|
aa6ba38c1714
Added clipping for render copy
Sam Lantinga <slouken@libsdl.org>
parents:
2901
diff
changeset
|
2451 real_dstrect.x = 0; |
|
aa6ba38c1714
Added clipping for render copy
Sam Lantinga <slouken@libsdl.org>
parents:
2901
diff
changeset
|
2452 real_dstrect.y = 0; |
|
aa6ba38c1714
Added clipping for render copy
Sam Lantinga <slouken@libsdl.org>
parents:
2901
diff
changeset
|
2453 real_dstrect.w = window->w; |
|
aa6ba38c1714
Added clipping for render copy
Sam Lantinga <slouken@libsdl.org>
parents:
2901
diff
changeset
|
2454 real_dstrect.h = window->h; |
| 2753 | 2455 if (dstrect) { |
|
2908
aa6ba38c1714
Added clipping for render copy
Sam Lantinga <slouken@libsdl.org>
parents:
2901
diff
changeset
|
2456 if (!SDL_IntersectRect(dstrect, &real_dstrect, &real_dstrect)) { |
|
aa6ba38c1714
Added clipping for render copy
Sam Lantinga <slouken@libsdl.org>
parents:
2901
diff
changeset
|
2457 return 0; |
|
aa6ba38c1714
Added clipping for render copy
Sam Lantinga <slouken@libsdl.org>
parents:
2901
diff
changeset
|
2458 } |
|
2912
1d50666ed3d5
Fixed clipping source rect to match destination rect clipping
Sam Lantinga <slouken@libsdl.org>
parents:
2910
diff
changeset
|
2459 /* Clip srcrect by the same amount as dstrect was clipped */ |
|
1d50666ed3d5
Fixed clipping source rect to match destination rect clipping
Sam Lantinga <slouken@libsdl.org>
parents:
2910
diff
changeset
|
2460 if (dstrect->w != real_dstrect.w) { |
|
1d50666ed3d5
Fixed clipping source rect to match destination rect clipping
Sam Lantinga <slouken@libsdl.org>
parents:
2910
diff
changeset
|
2461 int deltax = (real_dstrect.x - dstrect->x); |
|
1d50666ed3d5
Fixed clipping source rect to match destination rect clipping
Sam Lantinga <slouken@libsdl.org>
parents:
2910
diff
changeset
|
2462 int deltaw = (real_dstrect.w - dstrect->w); |
|
1d50666ed3d5
Fixed clipping source rect to match destination rect clipping
Sam Lantinga <slouken@libsdl.org>
parents:
2910
diff
changeset
|
2463 real_srcrect.x += (deltax * dstrect->w) / real_srcrect.w; |
|
1d50666ed3d5
Fixed clipping source rect to match destination rect clipping
Sam Lantinga <slouken@libsdl.org>
parents:
2910
diff
changeset
|
2464 real_srcrect.w += (deltaw * dstrect->w) / real_srcrect.w; |
|
1d50666ed3d5
Fixed clipping source rect to match destination rect clipping
Sam Lantinga <slouken@libsdl.org>
parents:
2910
diff
changeset
|
2465 } |
|
1d50666ed3d5
Fixed clipping source rect to match destination rect clipping
Sam Lantinga <slouken@libsdl.org>
parents:
2910
diff
changeset
|
2466 if (dstrect->h != real_dstrect.h) { |
|
1d50666ed3d5
Fixed clipping source rect to match destination rect clipping
Sam Lantinga <slouken@libsdl.org>
parents:
2910
diff
changeset
|
2467 int deltay = (real_dstrect.y - dstrect->y); |
|
1d50666ed3d5
Fixed clipping source rect to match destination rect clipping
Sam Lantinga <slouken@libsdl.org>
parents:
2910
diff
changeset
|
2468 int deltah = (real_dstrect.h - dstrect->h); |
|
1d50666ed3d5
Fixed clipping source rect to match destination rect clipping
Sam Lantinga <slouken@libsdl.org>
parents:
2910
diff
changeset
|
2469 real_srcrect.y += (deltay * dstrect->h) / real_srcrect.h; |
|
1d50666ed3d5
Fixed clipping source rect to match destination rect clipping
Sam Lantinga <slouken@libsdl.org>
parents:
2910
diff
changeset
|
2470 real_srcrect.h += (deltah * dstrect->h) / real_srcrect.h; |
|
1d50666ed3d5
Fixed clipping source rect to match destination rect clipping
Sam Lantinga <slouken@libsdl.org>
parents:
2910
diff
changeset
|
2471 } |
| 2753 | 2472 } |
| 0 | 2473 |
| 2753 | 2474 return renderer->RenderCopy(renderer, texture, &real_srcrect, |
| 2475 &real_dstrect); | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2476 } |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2477 |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2478 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2479 SDL_RenderPresent(void) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2480 { |
| 2753 | 2481 SDL_Renderer *renderer; |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2482 |
| 2753 | 2483 if (!_this) { |
| 2484 SDL_UninitializedVideo(); | |
| 2485 return; | |
| 2486 } | |
| 2487 renderer = SDL_CurrentDisplay.current_renderer; | |
| 2488 if (!renderer || !renderer->RenderPresent) { | |
| 2489 return; | |
| 2490 } | |
| 2491 renderer->RenderPresent(renderer); | |
| 0 | 2492 } |
| 2493 | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2494 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2495 SDL_DestroyTexture(SDL_TextureID textureID) |
| 0 | 2496 { |
| 2753 | 2497 int hash; |
| 2498 SDL_Texture *prev, *texture; | |
| 2499 SDL_Renderer *renderer; | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2500 |
| 2753 | 2501 if (!_this) { |
| 2502 SDL_UninitializedVideo(); | |
| 2503 return; | |
| 2504 } | |
| 2505 /* Look up the texture in the hash table */ | |
| 2506 hash = (textureID % SDL_arraysize(SDL_CurrentDisplay.textures)); | |
| 2507 prev = NULL; | |
| 2508 for (texture = SDL_CurrentDisplay.textures[hash]; texture; | |
| 2509 prev = texture, texture = texture->next) { | |
| 2510 if (texture->id == textureID) { | |
| 2511 break; | |
| 2512 } | |
| 2513 } | |
| 2514 if (!texture) { | |
| 2515 return; | |
| 2516 } | |
| 2517 /* Unlink the texture from the list */ | |
| 2518 if (prev) { | |
| 2519 prev->next = texture->next; | |
| 2520 } else { | |
| 2521 SDL_CurrentDisplay.textures[hash] = texture->next; | |
| 2522 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2523 |
| 2753 | 2524 /* Free the texture */ |
| 2525 renderer = texture->renderer; | |
| 2526 renderer->DestroyTexture(renderer, texture); | |
| 2527 SDL_free(texture); | |
| 0 | 2528 } |
| 2529 | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2530 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2531 SDL_DestroyRenderer(SDL_WindowID windowID) |
| 0 | 2532 { |
| 2753 | 2533 SDL_Window *window = SDL_GetWindowFromID(windowID); |
| 2534 SDL_Renderer *renderer; | |
| 2535 int i; | |
| 0 | 2536 |
| 2753 | 2537 if (!window) { |
| 2538 return; | |
| 2539 } | |
| 2540 renderer = window->renderer; | |
| 2541 if (!renderer) { | |
| 2542 return; | |
| 2543 } | |
| 2544 /* Free existing textures for this renderer */ | |
| 2545 for (i = 0; i < SDL_arraysize(SDL_CurrentDisplay.textures); ++i) { | |
| 2546 SDL_Texture *texture; | |
| 2547 SDL_Texture *prev = NULL; | |
| 2548 SDL_Texture *next; | |
| 2549 for (texture = SDL_CurrentDisplay.textures[i]; texture; | |
| 2550 texture = next) { | |
| 2551 next = texture->next; | |
| 2552 if (texture->renderer == renderer) { | |
| 2553 if (prev) { | |
| 2554 prev->next = next; | |
| 2555 } else { | |
| 2556 SDL_CurrentDisplay.textures[i] = next; | |
| 2557 } | |
| 2558 renderer->DestroyTexture(renderer, texture); | |
| 2559 SDL_free(texture); | |
| 2560 } else { | |
| 2561 prev = texture; | |
| 2562 } | |
| 2563 } | |
| 2564 } | |
| 0 | 2565 |
| 2753 | 2566 /* Free the renderer instance */ |
| 2567 renderer->DestroyRenderer(renderer); | |
| 0 | 2568 |
| 2753 | 2569 /* Clear references */ |
| 2570 window->renderer = NULL; | |
| 2571 if (SDL_CurrentDisplay.current_renderer == renderer) { | |
| 2572 SDL_CurrentDisplay.current_renderer = NULL; | |
| 2573 } | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2574 } |
| 0 | 2575 |
|
3025
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2576 SDL_bool |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2577 SDL_IsScreenSaverEnabled() |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2578 { |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2579 if (!_this) { |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2580 return SDL_TRUE; |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2581 } |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2582 return _this->suspend_screensaver ? SDL_FALSE : SDL_TRUE; |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2583 } |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2584 |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2585 void |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2586 SDL_EnableScreenSaver() |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2587 { |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2588 if (!_this) { |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2589 return; |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2590 } |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2591 if (!_this->suspend_screensaver) { |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2592 return; |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2593 } |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2594 _this->suspend_screensaver = SDL_FALSE; |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2595 if (_this->SuspendScreenSaver) { |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2596 _this->SuspendScreenSaver(_this); |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2597 } |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2598 } |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2599 |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2600 void |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2601 SDL_DisableScreenSaver() |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2602 { |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2603 if (!_this) { |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2604 return; |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2605 } |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2606 if (_this->suspend_screensaver) { |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2607 return; |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2608 } |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2609 _this->suspend_screensaver = SDL_TRUE; |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2610 if (_this->SuspendScreenSaver) { |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2611 _this->SuspendScreenSaver(_this); |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2612 } |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2613 } |
|
54fac87e1f34
Added an API to enable/disable the screen saver.
Sam Lantinga <slouken@libsdl.org>
parents:
2999
diff
changeset
|
2614 |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2615 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2616 SDL_VideoQuit(void) |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2617 { |
| 2753 | 2618 int i, j; |
| 0 | 2619 |
| 2753 | 2620 if (!_this) { |
| 2621 return; | |
| 2622 } | |
| 2623 /* Halt event processing before doing anything else */ | |
| 2624 SDL_StopEventLoop(); | |
|
3029
89f8a72e1ee9
Re-enable the screensaver at exit, just in case it's needed...
Sam Lantinga <slouken@libsdl.org>
parents:
3025
diff
changeset
|
2625 SDL_EnableScreenSaver(); |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2626 |
| 2753 | 2627 /* Clean up the system video */ |
| 2628 for (i = _this->num_displays; i--;) { | |
| 2629 SDL_VideoDisplay *display = &_this->displays[i]; | |
| 2630 for (j = display->num_windows; j--;) { | |
| 2631 SDL_DestroyWindow(display->windows[i].id); | |
| 2632 } | |
| 2633 if (display->windows) { | |
| 2634 SDL_free(display->windows); | |
| 2635 display->windows = NULL; | |
| 2636 } | |
| 2637 display->num_windows = 0; | |
| 2638 if (display->render_drivers) { | |
| 2639 SDL_free(display->render_drivers); | |
| 2640 display->render_drivers = NULL; | |
| 2641 } | |
| 2642 display->num_render_drivers = 0; | |
| 2643 } | |
| 2644 _this->VideoQuit(_this); | |
| 0 | 2645 |
| 2753 | 2646 for (i = _this->num_displays; i--;) { |
| 2647 SDL_VideoDisplay *display = &_this->displays[i]; | |
| 2648 for (j = display->num_display_modes; j--;) { | |
| 2649 if (display->display_modes[j].driverdata) { | |
| 2650 SDL_free(display->display_modes[j].driverdata); | |
| 2651 display->display_modes[j].driverdata = NULL; | |
| 2652 } | |
| 2653 } | |
| 2654 if (display->display_modes) { | |
| 2655 SDL_free(display->display_modes); | |
| 2656 display->display_modes = NULL; | |
| 2657 } | |
| 2658 if (display->desktop_mode.driverdata) { | |
| 2659 SDL_free(display->desktop_mode.driverdata); | |
| 2660 display->desktop_mode.driverdata = NULL; | |
| 2661 } | |
| 2662 if (display->palette) { | |
| 2663 SDL_FreePalette(display->palette); | |
| 2664 display->palette = NULL; | |
| 2665 } | |
| 2666 if (display->gamma) { | |
| 2667 SDL_free(display->gamma); | |
| 2668 display->gamma = NULL; | |
| 2669 } | |
| 2670 if (display->driverdata) { | |
| 2671 SDL_free(display->driverdata); | |
| 2672 display->driverdata = NULL; | |
| 2673 } | |
| 2674 } | |
| 2675 if (_this->displays) { | |
| 2676 SDL_free(_this->displays); | |
| 2677 _this->displays = NULL; | |
| 2678 } | |
| 2679 _this->free(_this); | |
| 2680 _this = NULL; | |
| 0 | 2681 } |
| 2682 | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2683 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2684 SDL_GL_LoadLibrary(const char *path) |
| 0 | 2685 { |
| 2753 | 2686 int retval; |
|
1912
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
2687 |
| 2753 | 2688 if (!_this) { |
| 2689 SDL_UninitializedVideo(); | |
| 2690 return -1; | |
| 2691 } | |
|
3057
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2692 if (_this->gl_config.driver_loaded) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2693 if (path && SDL_strcmp(path, _this->gl_config.driver_path) != 0) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2694 SDL_SetError("OpenGL library already loaded"); |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2695 return -1; |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2696 } |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2697 retval = 0; |
| 2753 | 2698 } else { |
|
3057
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2699 if (!_this->GL_LoadLibrary) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2700 SDL_SetError("No dynamic GL support in video driver"); |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2701 return -1; |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2702 } |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2703 retval = _this->GL_LoadLibrary(_this, path); |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2704 } |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2705 if (retval == 0) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2706 ++_this->gl_config.driver_loaded; |
| 2753 | 2707 } |
| 2708 return (retval); | |
| 0 | 2709 } |
| 2710 | |
| 2753 | 2711 void * |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2712 SDL_GL_GetProcAddress(const char *proc) |
| 0 | 2713 { |
| 2753 | 2714 void *func; |
|
1912
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
2715 |
| 2753 | 2716 if (!_this) { |
| 2717 SDL_UninitializedVideo(); | |
| 2718 return NULL; | |
| 2719 } | |
| 2720 func = NULL; | |
| 2721 if (_this->GL_GetProcAddress) { | |
| 2722 if (_this->gl_config.driver_loaded) { | |
| 2723 func = _this->GL_GetProcAddress(_this, proc); | |
| 2724 } else { | |
| 2725 SDL_SetError("No GL driver has been loaded"); | |
| 2726 } | |
| 2727 } else { | |
| 2728 SDL_SetError("No dynamic GL support in video driver"); | |
| 2729 } | |
| 2730 return func; | |
| 0 | 2731 } |
| 2732 | |
|
3057
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2733 void |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2734 SDL_GL_UnloadLibrary(void) |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2735 { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2736 if (!_this) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2737 SDL_UninitializedVideo(); |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2738 return; |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2739 } |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2740 if (_this->gl_config.driver_loaded > 0) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2741 if (--_this->gl_config.driver_loaded > 0) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2742 return; |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2743 } |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2744 if (_this->GL_UnloadLibrary) { |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2745 _this->GL_UnloadLibrary(_this); |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2746 } |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2747 } |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2748 } |
|
089a77aebb7d
Added test program for SDL_CreateWindowFrom()
Sam Lantinga <slouken@libsdl.org>
parents:
3053
diff
changeset
|
2749 |
|
1926
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
2750 SDL_bool |
|
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
2751 SDL_GL_ExtensionSupported(const char *extension) |
|
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
2752 { |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
2753 #if SDL_VIDEO_OPENGL || SDL_VIDEO_OPENGL_ES |
| 2753 | 2754 const GLubyte *(APIENTRY * glGetStringFunc) (GLenum); |
| 2755 const char *extensions; | |
| 2756 const char *start; | |
| 2757 const char *where, *terminator; | |
|
1926
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
2758 |
| 2753 | 2759 /* Extension names should not have spaces. */ |
| 2760 where = SDL_strchr(extension, ' '); | |
| 2761 if (where || *extension == '\0') { | |
| 2762 return SDL_FALSE; | |
| 2763 } | |
| 2764 /* See if there's an environment variable override */ | |
| 2765 start = SDL_getenv(extension); | |
| 2766 if (start && *start == '0') { | |
| 2767 return SDL_FALSE; | |
| 2768 } | |
| 2769 /* Lookup the available extensions */ | |
| 2770 glGetStringFunc = SDL_GL_GetProcAddress("glGetString"); | |
| 2771 if (glGetStringFunc) { | |
| 2772 extensions = (const char *) glGetStringFunc(GL_EXTENSIONS); | |
| 2773 } else { | |
| 2774 extensions = NULL; | |
| 2775 } | |
| 2776 if (!extensions) { | |
| 2777 return SDL_FALSE; | |
| 2778 } | |
| 2779 /* | |
| 2780 * It takes a bit of care to be fool-proof about parsing the OpenGL | |
| 2781 * extensions string. Don't be fooled by sub-strings, etc. | |
| 2782 */ | |
|
1926
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
2783 |
| 2753 | 2784 start = extensions; |
|
1926
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
2785 |
| 2753 | 2786 for (;;) { |
| 2787 where = SDL_strstr(start, extension); | |
| 2788 if (!where) | |
| 2789 break; | |
|
1926
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
2790 |
| 2753 | 2791 terminator = where + SDL_strlen(extension); |
| 2792 if (where == start || *(where - 1) == ' ') | |
| 2793 if (*terminator == ' ' || *terminator == '\0') | |
| 2794 return SDL_TRUE; | |
|
1926
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
2795 |
| 2753 | 2796 start = terminator; |
| 2797 } | |
| 2798 return SDL_FALSE; | |
|
1926
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
2799 #else |
| 2753 | 2800 return SDL_FALSE; |
|
1926
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
2801 #endif |
|
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
2802 } |
|
307355678142
Added SDL_GL_ExtensionSupported()
Sam Lantinga <slouken@libsdl.org>
parents:
1924
diff
changeset
|
2803 |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2804 int |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2805 SDL_GL_SetAttribute(SDL_GLattr attr, int value) |
| 0 | 2806 { |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
2807 #if SDL_VIDEO_OPENGL || SDL_VIDEO_OPENGL_ES |
| 2753 | 2808 int retval; |
|
1912
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
2809 |
| 2753 | 2810 if (!_this) { |
| 2811 SDL_UninitializedVideo(); | |
| 2812 return -1; | |
| 2813 } | |
| 2814 retval = 0; | |
| 2815 switch (attr) { | |
| 2816 case SDL_GL_RED_SIZE: | |
| 2817 _this->gl_config.red_size = value; | |
| 2818 break; | |
| 2819 case SDL_GL_GREEN_SIZE: | |
| 2820 _this->gl_config.green_size = value; | |
| 2821 break; | |
| 2822 case SDL_GL_BLUE_SIZE: | |
| 2823 _this->gl_config.blue_size = value; | |
| 2824 break; | |
| 2825 case SDL_GL_ALPHA_SIZE: | |
| 2826 _this->gl_config.alpha_size = value; | |
| 2827 break; | |
| 2828 case SDL_GL_DOUBLEBUFFER: | |
| 2829 _this->gl_config.double_buffer = value; | |
| 2830 break; | |
| 2831 case SDL_GL_BUFFER_SIZE: | |
| 2832 _this->gl_config.buffer_size = value; | |
| 2833 break; | |
| 2834 case SDL_GL_DEPTH_SIZE: | |
| 2835 _this->gl_config.depth_size = value; | |
| 2836 break; | |
| 2837 case SDL_GL_STENCIL_SIZE: | |
| 2838 _this->gl_config.stencil_size = value; | |
| 2839 break; | |
| 2840 case SDL_GL_ACCUM_RED_SIZE: | |
| 2841 _this->gl_config.accum_red_size = value; | |
| 2842 break; | |
| 2843 case SDL_GL_ACCUM_GREEN_SIZE: | |
| 2844 _this->gl_config.accum_green_size = value; | |
| 2845 break; | |
| 2846 case SDL_GL_ACCUM_BLUE_SIZE: | |
| 2847 _this->gl_config.accum_blue_size = value; | |
| 2848 break; | |
| 2849 case SDL_GL_ACCUM_ALPHA_SIZE: | |
| 2850 _this->gl_config.accum_alpha_size = value; | |
| 2851 break; | |
| 2852 case SDL_GL_STEREO: | |
| 2853 _this->gl_config.stereo = value; | |
| 2854 break; | |
| 2855 case SDL_GL_MULTISAMPLEBUFFERS: | |
| 2856 _this->gl_config.multisamplebuffers = value; | |
| 2857 break; | |
| 2858 case SDL_GL_MULTISAMPLESAMPLES: | |
| 2859 _this->gl_config.multisamplesamples = value; | |
| 2860 break; | |
| 2861 case SDL_GL_ACCELERATED_VISUAL: | |
| 2862 _this->gl_config.accelerated = value; | |
| 2863 break; | |
| 2864 case SDL_GL_RETAINED_BACKING: | |
| 2865 _this->gl_config.retained_backing = value; | |
| 2866 break; | |
|
3100
7dc982143c06
Date: Sun, 22 Mar 2009 12:52:29 +0000
Sam Lantinga <slouken@libsdl.org>
parents:
3099
diff
changeset
|
2867 case SDL_GL_CONTEXT_MAJOR_VERSION: |
|
7dc982143c06
Date: Sun, 22 Mar 2009 12:52:29 +0000
Sam Lantinga <slouken@libsdl.org>
parents:
3099
diff
changeset
|
2868 _this->gl_config.major_version = value; |
|
7dc982143c06
Date: Sun, 22 Mar 2009 12:52:29 +0000
Sam Lantinga <slouken@libsdl.org>
parents:
3099
diff
changeset
|
2869 break; |
|
7dc982143c06
Date: Sun, 22 Mar 2009 12:52:29 +0000
Sam Lantinga <slouken@libsdl.org>
parents:
3099
diff
changeset
|
2870 case SDL_GL_CONTEXT_MINOR_VERSION: |
|
7dc982143c06
Date: Sun, 22 Mar 2009 12:52:29 +0000
Sam Lantinga <slouken@libsdl.org>
parents:
3099
diff
changeset
|
2871 _this->gl_config.minor_version = value; |
|
7dc982143c06
Date: Sun, 22 Mar 2009 12:52:29 +0000
Sam Lantinga <slouken@libsdl.org>
parents:
3099
diff
changeset
|
2872 break; |
| 2753 | 2873 default: |
| 2874 SDL_SetError("Unknown OpenGL attribute"); | |
| 2875 retval = -1; | |
| 2876 break; | |
| 2877 } | |
| 2878 return retval; | |
|
1936
83946ee0ff1f
Implemented OpenGL support on Mac OS X
Sam Lantinga <slouken@libsdl.org>
parents:
1933
diff
changeset
|
2879 #else |
| 2753 | 2880 SDL_Unsupported(); |
| 2881 return -1; | |
| 2882 #endif /* SDL_VIDEO_OPENGL */ | |
| 0 | 2883 } |
| 2884 | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
2885 int |
|
1936
83946ee0ff1f
Implemented OpenGL support on Mac OS X
Sam Lantinga <slouken@libsdl.org>
parents:
1933
diff
changeset
|
2886 SDL_GL_GetAttribute(SDL_GLattr attr, int *value) |
| 0 | 2887 { |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
2888 #if SDL_VIDEO_OPENGL || SDL_VIDEO_OPENGL_ES |
| 2753 | 2889 void (APIENTRY * glGetIntegervFunc) (GLenum pname, GLint * params); |
| 3139 | 2890 GLenum(APIENTRY * glGetErrorFunc) (void); |
| 2753 | 2891 GLenum attrib = 0; |
|
3099
82e60908fab1
Date: Mon, 23 Mar 2009 09:17:24 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3092
diff
changeset
|
2892 GLenum error = 0; |
|
1912
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
2893 |
| 2753 | 2894 glGetIntegervFunc = SDL_GL_GetProcAddress("glGetIntegerv"); |
| 2895 if (!glGetIntegervFunc) { | |
| 2896 return -1; | |
| 2897 } | |
|
3099
82e60908fab1
Date: Mon, 23 Mar 2009 09:17:24 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3092
diff
changeset
|
2898 |
|
82e60908fab1
Date: Mon, 23 Mar 2009 09:17:24 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3092
diff
changeset
|
2899 glGetErrorFunc = SDL_GL_GetProcAddress("glGetError"); |
|
82e60908fab1
Date: Mon, 23 Mar 2009 09:17:24 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3092
diff
changeset
|
2900 if (!glGetErrorFunc) { |
|
82e60908fab1
Date: Mon, 23 Mar 2009 09:17:24 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3092
diff
changeset
|
2901 return -1; |
|
82e60908fab1
Date: Mon, 23 Mar 2009 09:17:24 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3092
diff
changeset
|
2902 } |
|
82e60908fab1
Date: Mon, 23 Mar 2009 09:17:24 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3092
diff
changeset
|
2903 |
|
82e60908fab1
Date: Mon, 23 Mar 2009 09:17:24 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3092
diff
changeset
|
2904 /* Clear value in any case */ |
| 3139 | 2905 *value = 0; |
|
3099
82e60908fab1
Date: Mon, 23 Mar 2009 09:17:24 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3092
diff
changeset
|
2906 |
| 2753 | 2907 switch (attr) { |
| 2908 case SDL_GL_RETAINED_BACKING: | |
| 2909 *value = _this->gl_config.retained_backing; | |
| 2910 return 0; | |
| 2911 case SDL_GL_RED_SIZE: | |
| 2912 attrib = GL_RED_BITS; | |
| 2913 break; | |
| 2914 case SDL_GL_BLUE_SIZE: | |
| 2915 attrib = GL_BLUE_BITS; | |
| 2916 break; | |
| 2917 case SDL_GL_GREEN_SIZE: | |
| 2918 attrib = GL_GREEN_BITS; | |
| 2919 break; | |
| 2920 case SDL_GL_ALPHA_SIZE: | |
| 2921 attrib = GL_ALPHA_BITS; | |
| 2922 break; | |
| 2923 case SDL_GL_DOUBLEBUFFER: | |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
2924 #ifndef SDL_VIDEO_OPENGL_ES |
| 2753 | 2925 attrib = GL_DOUBLEBUFFER; |
| 2926 break; | |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
2927 #else |
|
3099
82e60908fab1
Date: Mon, 23 Mar 2009 09:17:24 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3092
diff
changeset
|
2928 /* OpenGL ES 1.0 and above specifications have EGL_SINGLE_BUFFER */ |
|
82e60908fab1
Date: Mon, 23 Mar 2009 09:17:24 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3092
diff
changeset
|
2929 /* parameter which switches double buffer to single buffer. OpenGL ES */ |
|
82e60908fab1
Date: Mon, 23 Mar 2009 09:17:24 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3092
diff
changeset
|
2930 /* SDL driver must set proper value after initialization */ |
|
82e60908fab1
Date: Mon, 23 Mar 2009 09:17:24 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3092
diff
changeset
|
2931 *value = _this->gl_config.double_buffer; |
| 2753 | 2932 return 0; |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
2933 #endif |
| 2753 | 2934 case SDL_GL_DEPTH_SIZE: |
| 2935 attrib = GL_DEPTH_BITS; | |
| 2936 break; | |
| 2937 case SDL_GL_STENCIL_SIZE: | |
| 2938 attrib = GL_STENCIL_BITS; | |
| 2939 break; | |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
2940 #ifndef SDL_VIDEO_OPENGL_ES |
| 2753 | 2941 case SDL_GL_ACCUM_RED_SIZE: |
| 2942 attrib = GL_ACCUM_RED_BITS; | |
| 2943 break; | |
| 2944 case SDL_GL_ACCUM_GREEN_SIZE: | |
| 2945 attrib = GL_ACCUM_GREEN_BITS; | |
| 2946 break; | |
| 2947 case SDL_GL_ACCUM_BLUE_SIZE: | |
| 2948 attrib = GL_ACCUM_BLUE_BITS; | |
| 2949 break; | |
| 2950 case SDL_GL_ACCUM_ALPHA_SIZE: | |
| 2951 attrib = GL_ACCUM_ALPHA_BITS; | |
| 2952 break; | |
| 2953 case SDL_GL_STEREO: | |
| 2954 attrib = GL_STEREO; | |
| 2955 break; | |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
2956 #else |
| 2753 | 2957 case SDL_GL_ACCUM_RED_SIZE: |
| 2958 case SDL_GL_ACCUM_GREEN_SIZE: | |
| 2959 case SDL_GL_ACCUM_BLUE_SIZE: | |
| 2960 case SDL_GL_ACCUM_ALPHA_SIZE: | |
| 2961 case SDL_GL_STEREO: | |
| 2962 /* none of these are supported in OpenGL ES */ | |
| 2963 *value = 0; | |
| 2964 return 0; | |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
2965 #endif |
| 2753 | 2966 case SDL_GL_MULTISAMPLEBUFFERS: |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
2967 #ifndef SDL_VIDEO_OPENGL_ES |
| 2753 | 2968 attrib = GL_SAMPLE_BUFFERS_ARB; |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
2969 #else |
| 2753 | 2970 attrib = GL_SAMPLE_BUFFERS; |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
2971 #endif |
| 2753 | 2972 break; |
| 2973 case SDL_GL_MULTISAMPLESAMPLES: | |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
2974 #ifndef SDL_VIDEO_OPENGL_ES |
| 2753 | 2975 attrib = GL_SAMPLES_ARB; |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
2976 #else |
| 2753 | 2977 attrib = GL_SAMPLES; |
|
2745
587d2b5fb805
Added support for OpenGL ES renderer
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2744
diff
changeset
|
2978 #endif |
| 2753 | 2979 break; |
| 2980 case SDL_GL_BUFFER_SIZE: | |
| 2981 { | |
| 2982 GLint bits = 0; | |
| 2983 GLint component; | |
|
1936
83946ee0ff1f
Implemented OpenGL support on Mac OS X
Sam Lantinga <slouken@libsdl.org>
parents:
1933
diff
changeset
|
2984 |
| 2753 | 2985 /* |
| 2986 * there doesn't seem to be a single flag in OpenGL | |
| 2987 * for this! | |
| 2988 */ | |
| 2989 glGetIntegervFunc(GL_RED_BITS, &component); | |
| 2990 bits += component; | |
| 2991 glGetIntegervFunc(GL_GREEN_BITS, &component); | |
| 2992 bits += component; | |
| 2993 glGetIntegervFunc(GL_BLUE_BITS, &component); | |
| 2994 bits += component; | |
| 2995 glGetIntegervFunc(GL_ALPHA_BITS, &component); | |
| 2996 bits += component; | |
|
1936
83946ee0ff1f
Implemented OpenGL support on Mac OS X
Sam Lantinga <slouken@libsdl.org>
parents:
1933
diff
changeset
|
2997 |
| 2753 | 2998 *value = bits; |
| 2999 return 0; | |
| 3000 } | |
| 3001 case SDL_GL_ACCELERATED_VISUAL: | |
| 3002 { | |
| 3003 /* FIXME: How do we get this information? */ | |
| 3004 *value = (_this->gl_config.accelerated != 0); | |
| 3005 return 0; | |
| 3006 } | |
| 3007 default: | |
| 3008 SDL_SetError("Unknown OpenGL attribute"); | |
| 3009 return -1; | |
| 3010 } | |
| 0 | 3011 |
| 2753 | 3012 glGetIntegervFunc(attrib, (GLint *) value); |
| 3139 | 3013 error = glGetErrorFunc(); |
| 3014 if (error != GL_NO_ERROR) { | |
| 3015 switch (error) { | |
| 3016 case GL_INVALID_ENUM: | |
| 3017 { | |
| 3018 SDL_SetError("OpenGL error: GL_INVALID_ENUM"); | |
| 3019 } | |
| 3020 break; | |
| 3021 case GL_INVALID_VALUE: | |
| 3022 { | |
| 3023 SDL_SetError("OpenGL error: GL_INVALID_VALUE"); | |
| 3024 } | |
| 3025 break; | |
| 3026 default: | |
| 3027 { | |
| 3028 SDL_SetError("OpenGL error: %08X", error); | |
| 3029 } | |
| 3030 break; | |
| 3031 } | |
| 3032 return -1; | |
|
3099
82e60908fab1
Date: Mon, 23 Mar 2009 09:17:24 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
3092
diff
changeset
|
3033 } |
| 2753 | 3034 return 0; |
|
1936
83946ee0ff1f
Implemented OpenGL support on Mac OS X
Sam Lantinga <slouken@libsdl.org>
parents:
1933
diff
changeset
|
3035 #else |
| 2753 | 3036 SDL_Unsupported(); |
| 3037 return -1; | |
| 3038 #endif /* SDL_VIDEO_OPENGL */ | |
| 0 | 3039 } |
| 3040 | |
|
1912
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3041 SDL_GLContext |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3042 SDL_GL_CreateContext(SDL_WindowID windowID) |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3043 { |
| 2753 | 3044 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1912
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3045 |
| 2753 | 3046 if (!window) { |
| 3047 return NULL; | |
| 3048 } | |
| 3049 if (!(window->flags & SDL_WINDOW_OPENGL)) { | |
| 3050 SDL_SetError("The specified window isn't an OpenGL window"); | |
| 3051 return NULL; | |
| 3052 } | |
| 3053 return _this->GL_CreateContext(_this, window); | |
|
1912
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3054 } |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3055 |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3056 int |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3057 SDL_GL_MakeCurrent(SDL_WindowID windowID, SDL_GLContext context) |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3058 { |
| 2753 | 3059 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1912
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3060 |
| 2753 | 3061 if (window && !(window->flags & SDL_WINDOW_OPENGL)) { |
| 3062 SDL_SetError("The specified window isn't an OpenGL window"); | |
| 3063 return -1; | |
| 3064 } | |
| 3065 if (!context) { | |
| 3066 window = NULL; | |
| 3067 } | |
| 3068 return _this->GL_MakeCurrent(_this, window, context); | |
|
1912
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3069 } |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3070 |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3071 int |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3072 SDL_GL_SetSwapInterval(int interval) |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3073 { |
| 2753 | 3074 if (!_this) { |
| 3075 SDL_UninitializedVideo(); | |
| 3076 return -1; | |
| 3077 } | |
| 3078 if (_this->GL_SetSwapInterval) { | |
| 3079 return _this->GL_SetSwapInterval(_this, interval); | |
| 3080 } else { | |
| 3081 SDL_SetError("Setting the swap interval is not supported"); | |
| 3082 return -1; | |
| 3083 } | |
|
1912
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3084 } |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3085 |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3086 int |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3087 SDL_GL_GetSwapInterval(void) |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3088 { |
| 2753 | 3089 if (!_this) { |
| 3090 SDL_UninitializedVideo(); | |
| 3091 return -1; | |
| 3092 } | |
| 3093 if (_this->GL_GetSwapInterval) { | |
| 3094 return _this->GL_GetSwapInterval(_this); | |
| 3095 } else { | |
| 3096 SDL_SetError("Getting the swap interval is not supported"); | |
| 3097 return -1; | |
| 3098 } | |
|
1912
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3099 } |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3100 |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
3101 void |
|
1912
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3102 SDL_GL_SwapWindow(SDL_WindowID windowID) |
| 0 | 3103 { |
| 2753 | 3104 SDL_Window *window = SDL_GetWindowFromID(windowID); |
|
1912
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3105 |
| 2753 | 3106 if (!window) { |
| 3107 return; | |
| 3108 } | |
| 3109 if (!(window->flags & SDL_WINDOW_OPENGL)) { | |
| 3110 SDL_SetError("The specified window isn't an OpenGL window"); | |
| 3111 return; | |
| 3112 } | |
| 3113 _this->GL_SwapWindow(_this, window); | |
|
1912
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3114 } |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3115 |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3116 void |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3117 SDL_GL_DeleteContext(SDL_GLContext context) |
|
8d384b647307
Setting up the OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
1909
diff
changeset
|
3118 { |
| 2753 | 3119 if (!_this || !context) { |
| 3120 return; | |
| 3121 } | |
| 3122 _this->GL_MakeCurrent(_this, NULL, NULL); | |
| 3123 _this->GL_DeleteContext(_this, context); | |
| 0 | 3124 } |
| 3125 | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
3126 #if 0 // FIXME |
|
2744
1aede15771d0
Ran GNU indent on file
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2743
diff
changeset
|
3127 /* |
|
1aede15771d0
Ran GNU indent on file
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2743
diff
changeset
|
3128 * Utility function used by SDL_WM_SetIcon(); flags & 1 for color key, flags |
|
1aede15771d0
Ran GNU indent on file
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2743
diff
changeset
|
3129 * & 2 for alpha channel. |
|
1aede15771d0
Ran GNU indent on file
Holmes Futrell <hfutrell@umail.ucsb.edu>
parents:
2743
diff
changeset
|
3130 */ |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
3131 static void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
3132 CreateMaskFromColorKeyOrAlpha(SDL_Surface * icon, Uint8 * mask, int flags) |
| 0 | 3133 { |
| 2753 | 3134 int x, y; |
| 3135 Uint32 colorkey; | |
| 0 | 3136 #define SET_MASKBIT(icon, x, y, mask) \ |
| 3137 mask[(y*((icon->w+7)/8))+(x/8)] &= ~(0x01<<(7-(x%8))) | |
| 3138 | |
| 2753 | 3139 colorkey = icon->format->colorkey; |
| 3140 switch (icon->format->BytesPerPixel) { | |
| 3141 case 1: | |
| 3142 { | |
| 3143 Uint8 *pixels; | |
| 3144 for (y = 0; y < icon->h; ++y) { | |
| 3145 pixels = (Uint8 *) icon->pixels + y * icon->pitch; | |
| 3146 for (x = 0; x < icon->w; ++x) { | |
| 3147 if (*pixels++ == colorkey) { | |
| 3148 SET_MASKBIT(icon, x, y, mask); | |
| 3149 } | |
| 3150 } | |
| 3151 } | |
| 3152 } | |
| 3153 break; | |
| 0 | 3154 |
| 2753 | 3155 case 2: |
| 3156 { | |
| 3157 Uint16 *pixels; | |
| 3158 for (y = 0; y < icon->h; ++y) { | |
| 3159 pixels = (Uint16 *) icon->pixels + y * icon->pitch / 2; | |
| 3160 for (x = 0; x < icon->w; ++x) { | |
| 3161 if ((flags & 1) && *pixels == colorkey) { | |
| 3162 SET_MASKBIT(icon, x, y, mask); | |
| 3163 } else if ((flags & 2) | |
| 3164 && (*pixels & icon->format->Amask) == 0) { | |
| 3165 SET_MASKBIT(icon, x, y, mask); | |
| 3166 } | |
| 3167 pixels++; | |
| 3168 } | |
| 3169 } | |
| 3170 } | |
| 3171 break; | |
| 0 | 3172 |
| 2753 | 3173 case 4: |
| 3174 { | |
| 3175 Uint32 *pixels; | |
| 3176 for (y = 0; y < icon->h; ++y) { | |
| 3177 pixels = (Uint32 *) icon->pixels + y * icon->pitch / 4; | |
| 3178 for (x = 0; x < icon->w; ++x) { | |
| 3179 if ((flags & 1) && *pixels == colorkey) { | |
| 3180 SET_MASKBIT(icon, x, y, mask); | |
| 3181 } else if ((flags & 2) | |
| 3182 && (*pixels & icon->format->Amask) == 0) { | |
| 3183 SET_MASKBIT(icon, x, y, mask); | |
| 3184 } | |
| 3185 pixels++; | |
| 3186 } | |
| 3187 } | |
| 3188 } | |
| 3189 break; | |
| 3190 } | |
| 0 | 3191 } |
| 3192 | |
| 3193 /* | |
| 3194 * Sets the window manager icon for the display window. | |
| 3195 */ | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
3196 void |
|
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
3197 SDL_WM_SetIcon(SDL_Surface * icon, Uint8 * mask) |
| 0 | 3198 { |
| 2753 | 3199 if (icon && _this->SetIcon) { |
| 3200 /* Generate a mask if necessary, and create the icon! */ | |
| 3201 if (mask == NULL) { | |
| 3202 int mask_len = icon->h * (icon->w + 7) / 8; | |
| 3203 int flags = 0; | |
| 3204 mask = (Uint8 *) SDL_malloc(mask_len); | |
| 3205 if (mask == NULL) { | |
| 3206 return; | |
| 3207 } | |
| 3208 SDL_memset(mask, ~0, mask_len); | |
| 3209 if (icon->flags & SDL_SRCCOLORKEY) | |
| 3210 flags |= 1; | |
| 3211 if (icon->flags & SDL_SRCALPHA) | |
| 3212 flags |= 2; | |
| 3213 if (flags) { | |
| 3214 CreateMaskFromColorKeyOrAlpha(icon, mask, flags); | |
| 3215 } | |
| 3216 _this->SetIcon(_this, icon, mask); | |
| 3217 SDL_free(mask); | |
| 3218 } else { | |
| 3219 _this->SetIcon(_this, icon, mask); | |
| 3220 } | |
| 3221 } | |
| 0 | 3222 } |
| 3223 #endif | |
| 3224 | |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
3225 SDL_bool |
| 2753 | 3226 SDL_GetWindowWMInfo(SDL_WindowID windowID, struct SDL_SysWMinfo *info) |
| 0 | 3227 { |
| 2753 | 3228 SDL_Window *window = SDL_GetWindowFromID(windowID); |
| 0 | 3229 |
| 2753 | 3230 if (!window || !_this->GetWindowWMInfo) { |
| 3231 return SDL_FALSE; | |
| 3232 } | |
| 3233 return (_this->GetWindowWMInfo(_this, window, info)); | |
| 0 | 3234 } |
| 3235 | |
|
3280
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3236 void |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3237 SDL_StartTextInput(void) |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3238 { |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3239 if (_this->StartTextInput) { |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3240 _this->StartTextInput(_this); |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3241 } |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3242 SDL_EventState(SDL_TEXTINPUT, SDL_ENABLE); |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3243 SDL_EventState(SDL_TEXTEDITING, SDL_ENABLE); |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3244 } |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3245 |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3246 void |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3247 SDL_StopTextInput(void) |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3248 { |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3249 if (_this->StopTextInput) { |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3250 _this->StopTextInput(_this); |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3251 } |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3252 SDL_EventState(SDL_TEXTINPUT, SDL_DISABLE); |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3253 SDL_EventState(SDL_TEXTEDITING, SDL_DISABLE); |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3254 } |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3255 |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3256 void |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3257 SDL_SetTextInputRect(SDL_Rect *rect) |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3258 { |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3259 if (_this->SetTextInputRect) { |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3260 _this->SetTextInputRect(_this, rect); |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3261 } |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3262 } |
|
00cace2d9080
Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009
Sam Lantinga <slouken@libsdl.org>
parents:
3276
diff
changeset
|
3263 |
|
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1737
diff
changeset
|
3264 /* vi: set ts=4 sw=4 expandtab: */ |