sdl-ios-xcode: src/video/SDL

annotate src/video/SDL_video.c @ 4897:c3eb55210a90

SDL_DestroyWindow is setting window->magic to NULL too early. - window->magic is also checked in SDL_DestroyRenderer. All cleanup code like freeing the renderer and textures is not executed. The patch moves window_magic = NULL behind the SDL_DestroyRenderer call. Kind regards, André

author	Sam Lantinga <slouken@libsdl.org>
date	Mon, 27 Sep 2010 00:49:34 -0700
parents	231f8a1c5edd
children	69d9db65f248

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

Mercurial > sdl-ios-xcode

annotate src/video/SDL_video.c @ 4897:c3eb55210a90