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