sdl-ios-xcode: src/SDL_compat.c annotate

annotate src/SDL_compat.c @ 5159:307ccc9c135e

Made it possible to create a texture of any format, even if not supported by the renderer. This allows me to reduce the set of formats supported by the renderers to the most optimal set, for a nice speed boost.

author	Sam Lantinga <slouken@libsdl.org>
date	Thu, 03 Feb 2011 00:19:40 -0800
parents	be02be2ea897
children	df758fce08e9

rev	line source
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
3697 f7b03b6838cb Fixed bug #926 Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	3 Copyright (C) 1997-2010 Sam Lantinga
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 Lesser General Public License for more details.
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 License along with this library; if not, write to the Free Software
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 Sam Lantinga
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 slouken@libsdl.org
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	22 #include "SDL_config.h"
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	24 /* This file contains functions for backwards compatibility with SDL 1.2 */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	25
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	26 #include "SDL.h"
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	27 #include "SDL_syswm.h"
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	28
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	29 #include "video/SDL_sysvideo.h"
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	30 #include "video/SDL_pixels_c.h"
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	31
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: 3592 diff changeset	32 static SDL_Window *SDL_VideoWindow = NULL;
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	33 static SDL_Renderer *SDL_VideoRenderer = 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: 3592 diff changeset	34 static SDL_Texture *SDL_VideoTexture = NULL;
2328 91e601d9df8b re: bug#563. checking in some commented out trace code and a fix so that the in testalpha.c the background only flashes when alpha == 255. The problem that is being Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	35 static SDL_Surface *SDL_VideoSurface = NULL;
91e601d9df8b re: bug#563. checking in some commented out trace code and a fix so that the in testalpha.c the background only flashes when alpha == 255. The problem that is being Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	36 static SDL_Surface *SDL_ShadowSurface = NULL;
91e601d9df8b re: bug#563. checking in some commented out trace code and a fix so that the in testalpha.c the background only flashes when alpha == 255. The problem that is being Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	37 static SDL_Surface *SDL_PublicSurface = NULL;
91e601d9df8b re: bug#563. checking in some commented out trace code and a fix so that the in testalpha.c the background only flashes when alpha == 255. The problem that is being Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	38 static SDL_GLContext *SDL_VideoContext = NULL;
2829 16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	39 static Uint32 SDL_VideoFlags = 0;
2328 91e601d9df8b re: bug#563. checking in some commented out trace code and a fix so that the in testalpha.c the background only flashes when alpha == 255. The problem that is being Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	40 static char *wm_title = NULL;
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2884 diff changeset	41 static SDL_Surface *SDL_VideoIcon;
3280 00cace2d9080 Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009 Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	42 static int SDL_enabled_UNICODE = 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: diff changeset	43
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	44 char *
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	45 SDL_AudioDriverName(char *namebuf, int maxlen)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	46 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	47 const char *name = SDL_GetCurrentAudioDriver();
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	48 if (name) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	49 SDL_strlcpy(namebuf, name, maxlen);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	50 return namebuf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	51 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	52 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	53 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	54
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	55 char *
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	56 SDL_VideoDriverName(char *namebuf, int maxlen)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	57 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	58 const char *name = 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: diff changeset	59 if (name) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	60 SDL_strlcpy(namebuf, name, maxlen);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	61 return namebuf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	62 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	63 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	64 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	65
3518 abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	66 static void
abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	67 SelectVideoDisplay()
abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	68 {
abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	69 const char *variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_DISPLAY");
abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	70 if ( !variable ) {
abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	71 variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_HEAD");
abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	72 }
abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	73 if ( variable ) {
abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	74 SDL_SelectVideoDisplay(SDL_atoi(variable));
abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	75 }
abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	76 }
abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	77
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	78 const SDL_VideoInfo *
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	79 SDL_GetVideoInfo(void)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	80 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	81 static SDL_VideoInfo info;
1967 01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	82 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: diff changeset	83
3518 abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	84 SelectVideoDisplay();
abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	85
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	86 /* Memory leak, compatibility code, who cares? */
1967 01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	87 if (!info.vfmt && SDL_GetDesktopDisplayMode(&mode) == 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: diff changeset	88 int bpp;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	89 Uint32 Rmask, Gmask, Bmask, Amask;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	90
1967 01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	91 SDL_PixelFormatEnumToMasks(mode.format, &bpp, &Rmask, &Gmask, &Bmask,
01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	92 &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: diff changeset	93 info.vfmt = SDL_AllocFormat(bpp, Rmask, Gmask, Bmask, Amask);
2862 929e7dd10031 Added current_w and current_h to SDL_VideoInfo for SDL 1.2 compatibility Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	94 info.current_w = mode.w;
929e7dd10031 Added current_w and current_h to SDL_VideoInfo for SDL 1.2 compatibility Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	95 info.current_h = mode.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: diff changeset	96 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	97 return &info;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	98 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	99
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	100 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	101 SDL_VideoModeOK(int width, int height, int bpp, 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: diff changeset	102 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	103 int i, actual_bpp = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	104
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	105 if (!SDL_GetVideoDevice()) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	106 return 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	107 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	108
3518 abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	109 SelectVideoDisplay();
abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	110
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	111 if (!(flags & SDL_FULLSCREEN)) {
1967 01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	112 SDL_DisplayMode mode;
01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	113 SDL_GetDesktopDisplayMode(&mode);
01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	114 return SDL_BITSPERPIXEL(mode.format);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	115 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	116
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	117 for (i = 0; i < SDL_GetNumDisplayModes(); ++i) {
1967 01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	118 SDL_DisplayMode mode;
01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	119 SDL_GetDisplayMode(i, &mode);
01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	120 if (!mode.w \|\| !mode.h \|\| (width == mode.w && height == mode.h)) {
01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	121 if (!mode.format) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	122 return bpp;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	123 }
1967 01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	124 if (SDL_BITSPERPIXEL(mode.format) >= (Uint32) bpp) {
01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	125 actual_bpp = SDL_BITSPERPIXEL(mode.format);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	126 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	127 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	128 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	129 return actual_bpp;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 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: diff changeset	131
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	132 SDL_Rect **
3034 0e821769fc51 Fixed NULL pointer dereference Sam Lantinga <slouken@libsdl.org> parents: 3032 diff changeset	133 SDL_ListModes(const SDL_PixelFormat * format, Uint32 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: diff changeset	134 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	135 int i, nmodes;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	136 SDL_Rect **modes;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	137
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	138 if (!SDL_GetVideoDevice()) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	139 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	140 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	141
3518 abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	142 SelectVideoDisplay();
abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	143
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	144 if (!(flags & SDL_FULLSCREEN)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	145 return (SDL_Rect **) (-1);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	146 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	147
3034 0e821769fc51 Fixed NULL pointer dereference Sam Lantinga <slouken@libsdl.org> parents: 3032 diff changeset	148 if (!format) {
0e821769fc51 Fixed NULL pointer dereference Sam Lantinga <slouken@libsdl.org> parents: 3032 diff changeset	149 format = SDL_GetVideoInfo()->vfmt;
0e821769fc51 Fixed NULL pointer dereference Sam Lantinga <slouken@libsdl.org> parents: 3032 diff changeset	150 }
0e821769fc51 Fixed NULL pointer dereference Sam Lantinga <slouken@libsdl.org> parents: 3032 diff changeset	151
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	152 /* Memory leak, but this is a compatibility function, who cares? */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	153 nmodes = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	154 modes = NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	155 for (i = 0; i < SDL_GetNumDisplayModes(); ++i) {
1967 01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	156 SDL_DisplayMode mode;
5043 da347bfed240 Florian Forster to sdl Sam Lantinga <slouken@libsdl.org> parents: 4901 diff changeset	157 int bpp;
da347bfed240 Florian Forster to sdl Sam Lantinga <slouken@libsdl.org> parents: 4901 diff changeset	158
1967 01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	159 SDL_GetDisplayMode(i, &mode);
01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	160 if (!mode.w \|\| !mode.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: diff changeset	161 return (SDL_Rect **) (-1);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	162 }
5043 da347bfed240 Florian Forster to sdl Sam Lantinga <slouken@libsdl.org> parents: 4901 diff changeset	163
da347bfed240 Florian Forster to sdl Sam Lantinga <slouken@libsdl.org> parents: 4901 diff changeset	164 /* Copied from src/video/SDL_pixels.c:SDL_PixelFormatEnumToMasks */
da347bfed240 Florian Forster to sdl Sam Lantinga <slouken@libsdl.org> parents: 4901 diff changeset	165 if (SDL_BYTESPERPIXEL(mode.format) <= 2) {
da347bfed240 Florian Forster to sdl Sam Lantinga <slouken@libsdl.org> parents: 4901 diff changeset	166 bpp = SDL_BITSPERPIXEL(mode.format);
da347bfed240 Florian Forster to sdl Sam Lantinga <slouken@libsdl.org> parents: 4901 diff changeset	167 } else {
da347bfed240 Florian Forster to sdl Sam Lantinga <slouken@libsdl.org> parents: 4901 diff changeset	168 bpp = SDL_BYTESPERPIXEL(mode.format) * 8;
da347bfed240 Florian Forster to sdl Sam Lantinga <slouken@libsdl.org> parents: 4901 diff changeset	169 }
da347bfed240 Florian Forster to sdl Sam Lantinga <slouken@libsdl.org> parents: 4901 diff changeset	170
da347bfed240 Florian Forster to sdl Sam Lantinga <slouken@libsdl.org> parents: 4901 diff changeset	171 if (bpp != format->BitsPerPixel) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	172 continue;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	173 }
1967 01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	174 if (nmodes > 0 && modes[nmodes - 1]->w == mode.w
01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	175 && modes[nmodes - 1]->h == mode.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: diff changeset	176 continue;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	177 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	178
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	179 modes = SDL_realloc(modes, (nmodes + 2) * sizeof(*modes));
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	180 if (!modes) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	181 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	182 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	183 modes[nmodes] = (SDL_Rect *) SDL_malloc(sizeof(SDL_Rect));
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	184 if (!modes[nmodes]) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	185 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	186 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	187 modes[nmodes]->x = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	188 modes[nmodes]->y = 0;
1967 01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	189 modes[nmodes]->w = mode.w;
01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	190 modes[nmodes]->h = mode.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: diff changeset	191 ++nmodes;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	192 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	193 if (modes) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	194 modes[nmodes] = NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	195 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	196 return modes;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	197 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	198
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	199 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: diff changeset	200 SDL_CompatEventFilter(void userdata, SDL_Event event)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	201 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	202 SDL_Event fake;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	203
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	204 switch (event->type) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	205 case SDL_WINDOWEVENT:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	206 switch (event->window.event) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	207 case SDL_WINDOWEVENT_EXPOSED:
4429 faa9fc8e7f67 General improvements for user custom event registration Sam Lantinga <slouken@libsdl.org> parents: 3697 diff changeset	208 if (!SDL_HasEvent(SDL_VIDEOEXPOSE)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	209 fake.type = SDL_VIDEOEXPOSE;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	210 SDL_PushEvent(&fake);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	211 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	212 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	213 case SDL_WINDOWEVENT_RESIZED:
4429 faa9fc8e7f67 General improvements for user custom event registration Sam Lantinga <slouken@libsdl.org> parents: 3697 diff changeset	214 SDL_FlushEvent(SDL_VIDEORESIZE);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	215 fake.type = SDL_VIDEORESIZE;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	216 fake.resize.w = event->window.data1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	217 fake.resize.h = event->window.data2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	218 SDL_PushEvent(&fake);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	219 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	220 case SDL_WINDOWEVENT_MINIMIZED:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	221 fake.type = SDL_ACTIVEEVENT;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	222 fake.active.gain = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	223 fake.active.state = SDL_APPACTIVE;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	224 SDL_PushEvent(&fake);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	225 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	226 case SDL_WINDOWEVENT_RESTORED:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	227 fake.type = SDL_ACTIVEEVENT;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	228 fake.active.gain = 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	229 fake.active.state = SDL_APPACTIVE;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	230 SDL_PushEvent(&fake);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	231 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	232 case SDL_WINDOWEVENT_ENTER:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	233 fake.type = SDL_ACTIVEEVENT;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	234 fake.active.gain = 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	235 fake.active.state = SDL_APPMOUSEFOCUS;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	236 SDL_PushEvent(&fake);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	237 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	238 case SDL_WINDOWEVENT_LEAVE:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	239 fake.type = SDL_ACTIVEEVENT;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	240 fake.active.gain = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	241 fake.active.state = SDL_APPMOUSEFOCUS;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	242 SDL_PushEvent(&fake);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	243 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	244 case SDL_WINDOWEVENT_FOCUS_GAINED:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	245 fake.type = SDL_ACTIVEEVENT;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	246 fake.active.gain = 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	247 fake.active.state = SDL_APPINPUTFOCUS;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	248 SDL_PushEvent(&fake);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	249 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	250 case SDL_WINDOWEVENT_FOCUS_LOST:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	251 fake.type = SDL_ACTIVEEVENT;
2058 38148947fdcf Fixed focus comptability bug Sam Lantinga <slouken@libsdl.org> parents: 2037 diff changeset	252 fake.active.gain = 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: diff changeset	253 fake.active.state = SDL_APPINPUTFOCUS;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	254 SDL_PushEvent(&fake);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	255 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	256 case SDL_WINDOWEVENT_CLOSE:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	257 fake.type = SDL_QUIT;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	258 SDL_PushEvent(&fake);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	259 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	260 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	261 case SDL_KEYDOWN:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	262 case SDL_KEYUP:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	263 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	264 Uint32 unicode = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	265 if (event->key.type == SDL_KEYDOWN && event->key.keysym.sym < 256) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	266 unicode = event->key.keysym.sym;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	267 if (unicode >= 'a' && unicode <= 'z') {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	268 int shifted = !!(event->key.keysym.mod & KMOD_SHIFT);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	269 int capslock = !!(event->key.keysym.mod & KMOD_CAPS);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	270 if ((shifted ^ capslock) != 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	271 unicode = SDL_toupper(unicode);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	272 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	273 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	274 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	275 if (unicode) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	276 event->key.keysym.unicode = unicode;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	277 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	278 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	279 }
2129 047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	280 case SDL_TEXTINPUT:
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	281 {
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	282 /* FIXME: Generate an old style key repeat event if needed */
2130 3ee59c43d784 Fixes for compiling with Visual C++ 8.0 Express Edition Sam Lantinga <slouken@libsdl.org> parents: 2129 diff changeset	283 //printf("TEXTINPUT: '%s'\n", event->text.text);
2129 047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	284 break;
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	285 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	286 case SDL_MOUSEWHEEL:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	287 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	288 Uint8 button;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	289 int x, y;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	290
2153 760c1bd2d625 Reverted mousewheel support in 1.2, since it breaks binary compatibility. Sam Lantinga <slouken@libsdl.org> parents: 2152 diff changeset	291 if (event->wheel.y == 0) {
760c1bd2d625 Reverted mousewheel support in 1.2, since it breaks binary compatibility. Sam Lantinga <slouken@libsdl.org> parents: 2152 diff changeset	292 break;
760c1bd2d625 Reverted mousewheel support in 1.2, since it breaks binary compatibility. Sam Lantinga <slouken@libsdl.org> parents: 2152 diff changeset	293 }
760c1bd2d625 Reverted mousewheel support in 1.2, since it breaks binary compatibility. Sam Lantinga <slouken@libsdl.org> parents: 2152 diff changeset	294
3585 f8816ffa210b Initial band-aids on SDL_GetMouseState() API breakage. More work to come. Ryan C. Gordon <icculus@icculus.org> parents: 3581 diff changeset	295 SDL_GetMouseState(&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: diff changeset	296
2153 760c1bd2d625 Reverted mousewheel support in 1.2, since it breaks binary compatibility. Sam Lantinga <slouken@libsdl.org> parents: 2152 diff changeset	297 if (event->wheel.y > 0) {
760c1bd2d625 Reverted mousewheel support in 1.2, since it breaks binary compatibility. Sam Lantinga <slouken@libsdl.org> parents: 2152 diff changeset	298 button = SDL_BUTTON_WHEELUP;
760c1bd2d625 Reverted mousewheel support in 1.2, since it breaks binary compatibility. Sam Lantinga <slouken@libsdl.org> parents: 2152 diff changeset	299 } else {
760c1bd2d625 Reverted mousewheel support in 1.2, since it breaks binary compatibility. Sam Lantinga <slouken@libsdl.org> parents: 2152 diff changeset	300 button = SDL_BUTTON_WHEELDOWN;
760c1bd2d625 Reverted mousewheel support in 1.2, since it breaks binary compatibility. Sam Lantinga <slouken@libsdl.org> parents: 2152 diff changeset	301 }
760c1bd2d625 Reverted mousewheel support in 1.2, since it breaks binary compatibility. Sam Lantinga <slouken@libsdl.org> parents: 2152 diff changeset	302
760c1bd2d625 Reverted mousewheel support in 1.2, since it breaks binary compatibility. Sam Lantinga <slouken@libsdl.org> parents: 2152 diff changeset	303 fake.button.button = button;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	304 fake.button.x = x;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	305 fake.button.y = y;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	306 fake.button.windowID = event->wheel.windowID;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	307
2153 760c1bd2d625 Reverted mousewheel support in 1.2, since it breaks binary compatibility. Sam Lantinga <slouken@libsdl.org> parents: 2152 diff changeset	308 fake.type = SDL_MOUSEBUTTONDOWN;
760c1bd2d625 Reverted mousewheel support in 1.2, since it breaks binary compatibility. Sam Lantinga <slouken@libsdl.org> parents: 2152 diff changeset	309 fake.button.state = SDL_PRESSED;
760c1bd2d625 Reverted mousewheel support in 1.2, since it breaks binary compatibility. Sam Lantinga <slouken@libsdl.org> parents: 2152 diff changeset	310 SDL_PushEvent(&fake);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	311
2153 760c1bd2d625 Reverted mousewheel support in 1.2, since it breaks binary compatibility. Sam Lantinga <slouken@libsdl.org> parents: 2152 diff changeset	312 fake.type = SDL_MOUSEBUTTONUP;
760c1bd2d625 Reverted mousewheel support in 1.2, since it breaks binary compatibility. Sam Lantinga <slouken@libsdl.org> parents: 2152 diff changeset	313 fake.button.state = SDL_RELEASED;
760c1bd2d625 Reverted mousewheel support in 1.2, since it breaks binary compatibility. Sam Lantinga <slouken@libsdl.org> parents: 2152 diff changeset	314 SDL_PushEvent(&fake);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	315 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	316 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	317
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	318 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	319 return 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	320 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	321
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	322 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: diff changeset	323 GetEnvironmentWindowPosition(int w, int h, int x, int y)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	324 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	325 const char *window = SDL_getenv("SDL_VIDEO_WINDOW_POS");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	326 const char *center = SDL_getenv("SDL_VIDEO_CENTERED");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	327 if (window) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	328 if (SDL_sscanf(window, "%d,%d", x, y) == 2) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	329 return;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	330 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	331 if (SDL_strcmp(window, "center") == 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	332 center = window;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	333 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	334 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	335 if (center) {
1967 01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	336 SDL_DisplayMode mode;
01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	337 SDL_GetDesktopDisplayMode(&mode);
01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	338 *x = (mode.w - w) / 2;
01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	339 *y = (mode.h - h) / 2;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	340 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	341 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	342
2222 926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	343 static SDL_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: 3592 diff changeset	344 CreateVideoSurface(SDL_Texture * texture)
2222 926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	345 {
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	346 Uint32 format;
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	347 int w, h;
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	348 int bpp;
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	349 Uint32 Rmask, Gmask, Bmask, Amask;
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	350
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: 3592 diff changeset	351 if (SDL_QueryTexture(texture, &format, NULL, &w, &h) < 0) {
2222 926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	352 return NULL;
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	353 }
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	354
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	355 if (!SDL_PixelFormatEnumToMasks
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	356 (format, &bpp, &Rmask, &Gmask, &Bmask, &Amask)) {
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	357 SDL_SetError("Unknown texture format");
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	358 return NULL;
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	359 }
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	360
5159 307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5152 diff changeset	361 return SDL_CreateRGBSurface(0, w, h, bpp, Rmask, Gmask, Bmask, Amask);
2222 926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	362 }
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	363
2829 16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	364 static void
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	365 ClearVideoSurface()
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	366 {
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	367 Uint32 black;
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	368
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	369 /* Clear the surface for display */
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	370 black = SDL_MapRGB(SDL_PublicSurface->format, 0, 0, 0);
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	371 SDL_FillRect(SDL_PublicSurface, NULL, black);
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	372 SDL_UpdateRect(SDL_PublicSurface, 0, 0, 0, 0);
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	373 }
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	374
3025 54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	375 static void
3028 1c4a059966bd Don't disable the screen saver by default for windows applications Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	376 SetupScreenSaver(int flags)
3025 54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	377 {
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	378 const char *env;
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	379 SDL_bool allow_screensaver;
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	380
3028 1c4a059966bd Don't disable the screen saver by default for windows applications Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	381 /* Allow environment override of screensaver disable */
1c4a059966bd Don't disable the screen saver by default for windows applications Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	382 env = SDL_getenv("SDL_VIDEO_ALLOW_SCREENSAVER");
1c4a059966bd Don't disable the screen saver by default for windows applications Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	383 if (env) {
1c4a059966bd Don't disable the screen saver by default for windows applications Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	384 allow_screensaver = SDL_atoi(env) ? SDL_TRUE : SDL_FALSE;
1c4a059966bd Don't disable the screen saver by default for windows applications Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	385 } else if (flags & SDL_FULLSCREEN) {
1c4a059966bd Don't disable the screen saver by default for windows applications Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	386 allow_screensaver = SDL_FALSE;
1c4a059966bd Don't disable the screen saver by default for windows applications Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	387 } else {
1c4a059966bd Don't disable the screen saver by default for windows applications Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	388 allow_screensaver = SDL_TRUE;
1c4a059966bd Don't disable the screen saver by default for windows applications Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	389 }
3025 54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	390 if (allow_screensaver) {
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	391 SDL_EnableScreenSaver();
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	392 } else {
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	393 SDL_DisableScreenSaver();
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	394 }
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	395 }
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	396
4472 791b3256fb22 Mostly cleaned up warnings with -Wmissing-prototypes Sam Lantinga <slouken@libsdl.org> parents: 4468 diff changeset	397 static int
2829 16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	398 SDL_ResizeVideoMode(int width, int height, int bpp, Uint32 flags)
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	399 {
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	400 int w, h;
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	401 Uint32 format;
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	402 int access;
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	403
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	404 /* We can't resize something we don't have... */
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	405 if (!SDL_VideoWindow) {
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	406 return -1;
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	407 }
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	408
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	409 /* We probably have to recreate the window in fullscreen mode */
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	410 if (flags & SDL_FULLSCREEN) {
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	411 return -1;
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	412 }
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	413
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	414 /* I don't think there's any change we can gracefully make in flags */
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	415 if (flags != SDL_VideoFlags) {
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	416 return -1;
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	417 }
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	418
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	419 /* Resize the window */
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	420 SDL_GetWindowSize(SDL_VideoWindow, &w, &h);
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	421 if (w != width \|\| h != height) {
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	422 SDL_SetWindowSize(SDL_VideoWindow, width, height);
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	423 }
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	424
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	425 /* If we're in OpenGL mode, just resize the stub surface and we're done! */
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	426 if (flags & SDL_OPENGL) {
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	427 SDL_VideoSurface->w = width;
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	428 SDL_VideoSurface->h = height;
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	429 return 0;
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	430 }
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	431
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	432 /* Destroy the screen texture and recreate it */
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	433 SDL_QueryTexture(SDL_VideoTexture, &format, &access, &w, &h);
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	434 SDL_DestroyTexture(SDL_VideoTexture);
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	435 SDL_VideoTexture = SDL_CreateTexture(SDL_VideoRenderer, format,
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	436 access, width, height);
2829 16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	437 if (!SDL_VideoTexture) {
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	438 return -1;
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	439 }
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	440
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	441 SDL_VideoSurface->w = width;
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	442 SDL_VideoSurface->h = height;
5159 307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5152 diff changeset	443 SDL_CalculatePitch(SDL_VideoSurface);
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5152 diff changeset	444 SDL_VideoSurface->pixels =
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5152 diff changeset	445 SDL_realloc(SDL_VideoSurface->pixels,
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5152 diff changeset	446 SDL_VideoSurface->h * SDL_VideoSurface->pitch);
2829 16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	447 SDL_SetClipRect(SDL_VideoSurface, NULL);
2831 7173fc5c7ef6 Fixed crashes when resizing video modes Sam Lantinga <slouken@libsdl.org> parents: 2829 diff changeset	448 SDL_InvalidateMap(SDL_VideoSurface->map);
2829 16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	449
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	450 if (SDL_ShadowSurface) {
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	451 SDL_ShadowSurface->w = width;
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	452 SDL_ShadowSurface->h = height;
2831 7173fc5c7ef6 Fixed crashes when resizing video modes Sam Lantinga <slouken@libsdl.org> parents: 2829 diff changeset	453 SDL_ShadowSurface->pitch = SDL_CalculatePitch(SDL_ShadowSurface);
2829 16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	454 SDL_ShadowSurface->pixels =
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	455 SDL_realloc(SDL_ShadowSurface->pixels,
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	456 SDL_ShadowSurface->h * SDL_ShadowSurface->pitch);
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	457 SDL_SetClipRect(SDL_ShadowSurface, NULL);
2831 7173fc5c7ef6 Fixed crashes when resizing video modes Sam Lantinga <slouken@libsdl.org> parents: 2829 diff changeset	458 SDL_InvalidateMap(SDL_ShadowSurface->map);
2829 16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	459 }
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	460
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	461 ClearVideoSurface();
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	462
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	463 return 0;
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	464 }
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	465
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	466 SDL_Surface *
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	467 SDL_SetVideoMode(int width, int height, int bpp, 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: diff changeset	468 {
1967 01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	469 SDL_DisplayMode 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: diff changeset	470 int window_x = SDL_WINDOWPOS_UNDEFINED;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	471 int window_y = SDL_WINDOWPOS_UNDEFINED;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	472 Uint32 window_flags;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	473 Uint32 desktop_format;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	474 Uint32 desired_format;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	475 Uint32 surface_flags;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	476
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	477 if (!SDL_GetVideoDevice()) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	478 if (SDL_Init(SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE) < 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	479 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	480 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	481 }
3139 7f684f249ec9 indent Sam Lantinga <slouken@libsdl.org> parents: 3098 diff changeset	482
3518 abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	483 SelectVideoDisplay();
abefdc334970 Added support for SDL 1.2 environment variables: Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	484
3098 5f372cef955d Date: Thu, 05 Feb 2009 17:27:54 +0100 Sam Lantinga <slouken@libsdl.org> parents: 3034 diff changeset	485 SDL_GetDesktopDisplayMode(&desktop_mode);
5f372cef955d Date: Thu, 05 Feb 2009 17:27:54 +0100 Sam Lantinga <slouken@libsdl.org> parents: 3034 diff changeset	486
5f372cef955d Date: Thu, 05 Feb 2009 17:27:54 +0100 Sam Lantinga <slouken@libsdl.org> parents: 3034 diff changeset	487 if (width == 0) {
5f372cef955d Date: Thu, 05 Feb 2009 17:27:54 +0100 Sam Lantinga <slouken@libsdl.org> parents: 3034 diff changeset	488 width = desktop_mode.w;
5f372cef955d Date: Thu, 05 Feb 2009 17:27:54 +0100 Sam Lantinga <slouken@libsdl.org> parents: 3034 diff changeset	489 }
5f372cef955d Date: Thu, 05 Feb 2009 17:27:54 +0100 Sam Lantinga <slouken@libsdl.org> parents: 3034 diff changeset	490 if (height == 0) {
5f372cef955d Date: Thu, 05 Feb 2009 17:27:54 +0100 Sam Lantinga <slouken@libsdl.org> parents: 3034 diff changeset	491 height = desktop_mode.h;
5f372cef955d Date: Thu, 05 Feb 2009 17:27:54 +0100 Sam Lantinga <slouken@libsdl.org> parents: 3034 diff changeset	492 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	493
2829 16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	494 /* See if we can simply resize the existing window and surface */
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	495 if (SDL_ResizeVideoMode(width, height, bpp, flags) == 0) {
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	496 return SDL_PublicSurface;
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	497 }
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	498
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	499 /* Destroy existing window */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	500 SDL_PublicSurface = NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	501 if (SDL_ShadowSurface) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	502 SDL_FreeSurface(SDL_ShadowSurface);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	503 SDL_ShadowSurface = NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	504 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	505 if (SDL_VideoSurface) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	506 SDL_FreeSurface(SDL_VideoSurface);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	507 SDL_VideoSurface = NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	508 }
1912 8d384b647307 Setting up the OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1907 diff changeset	509 if (SDL_VideoContext) {
2328 91e601d9df8b re: bug#563. checking in some commented out trace code and a fix so that the in testalpha.c the background only flashes when alpha == 255. The problem that is being Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	510 /* SDL_GL_MakeCurrent(0, NULL); // Doesn't do anything */
1912 8d384b647307 Setting up the OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1907 diff changeset	511 SDL_GL_DeleteContext(SDL_VideoContext);
8d384b647307 Setting up the OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1907 diff changeset	512 SDL_VideoContext = NULL;
8d384b647307 Setting up the OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1907 diff changeset	513 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	514 if (SDL_VideoWindow) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	515 SDL_GetWindowPosition(SDL_VideoWindow, &window_x, &window_y);
2322 c25d45b7add3 Fixing valgrind errors. Bob Pendleton <bob@pendleton.com> parents: 2303 diff changeset	516 SDL_DestroyWindow(SDL_VideoWindow);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	517 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	518
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	519 /* Set up the event filter */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	520 if (!SDL_GetEventFilter(NULL, NULL)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	521 SDL_SetEventFilter(SDL_CompatEventFilter, NULL);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	522 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	523
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	524 /* Create a new window */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	525 window_flags = SDL_WINDOW_SHOWN;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	526 if (flags & SDL_FULLSCREEN) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	527 window_flags \|= SDL_WINDOW_FULLSCREEN;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	528 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	529 if (flags & SDL_OPENGL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	530 window_flags \|= SDL_WINDOW_OPENGL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	531 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	532 if (flags & SDL_RESIZABLE) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	533 window_flags \|= SDL_WINDOW_RESIZABLE;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	534 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	535 if (flags & SDL_NOFRAME) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	536 window_flags \|= SDL_WINDOW_BORDERLESS;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	537 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	538 GetEnvironmentWindowPosition(width, height, &window_x, &window_y);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	539 SDL_VideoWindow =
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	540 SDL_CreateWindow(wm_title, window_x, window_y, width, height,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	541 window_flags);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	542 if (!SDL_VideoWindow) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	543 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	544 }
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2884 diff changeset	545 SDL_SetWindowIcon(SDL_VideoWindow, SDL_VideoIcon);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	546
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	547 window_flags = SDL_GetWindowFlags(SDL_VideoWindow);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	548 surface_flags = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	549 if (window_flags & SDL_WINDOW_FULLSCREEN) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	550 surface_flags \|= SDL_FULLSCREEN;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	551 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	552 if (window_flags & SDL_WINDOW_OPENGL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	553 surface_flags \|= SDL_OPENGL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	554 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	555 if (window_flags & SDL_WINDOW_RESIZABLE) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	556 surface_flags \|= SDL_RESIZABLE;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	557 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	558 if (window_flags & SDL_WINDOW_BORDERLESS) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	559 surface_flags \|= SDL_NOFRAME;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	560 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	561
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	562 /* Set up the desired display mode */
1967 01e29c3e9a29 In general, fill in pointers to structures, rather than return them. Sam Lantinga <slouken@libsdl.org> parents: 1965 diff changeset	563 desktop_format = desktop_mode.format;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	564 if (desktop_format && ((flags & SDL_ANYFORMAT)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	565 \|\| (bpp == SDL_BITSPERPIXEL(desktop_format)))) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	566 desired_format = desktop_format;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	567 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	568 switch (bpp) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	569 case 0:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	570 if (desktop_format) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	571 desired_format = desktop_format;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	572 } else {
1965 a788656ca29a SDL constants are all uppercase. Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	573 desired_format = SDL_PIXELFORMAT_RGB888;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	574 }
2240 eebaa05f8bd9 Fixed crash setting 0 bpp video mode. Sam Lantinga <slouken@libsdl.org> parents: 2228 diff changeset	575 bpp = SDL_BITSPERPIXEL(desired_format);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	576 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	577 case 8:
1965 a788656ca29a SDL constants are all uppercase. Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	578 desired_format = SDL_PIXELFORMAT_INDEX8;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	579 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	580 case 15:
1965 a788656ca29a SDL constants are all uppercase. Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	581 desired_format = SDL_PIXELFORMAT_RGB555;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	582 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	583 case 16:
1965 a788656ca29a SDL constants are all uppercase. Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	584 desired_format = SDL_PIXELFORMAT_RGB565;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	585 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	586 case 24:
1965 a788656ca29a SDL constants are all uppercase. Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	587 desired_format = SDL_PIXELFORMAT_RGB24;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	588 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	589 case 32:
1965 a788656ca29a SDL constants are all uppercase. Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	590 desired_format = SDL_PIXELFORMAT_RGB888;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	591 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	592 default:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	593 SDL_SetError("Unsupported bpp in SDL_SetVideoMode()");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	594 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	595 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	596 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	597
3500 4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	598 /* Set up the desired 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: diff changeset	599 if (flags & SDL_FULLSCREEN) {
3500 4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	600 SDL_DisplayMode mode;
4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	601
4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	602 SDL_zero(mode);
4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	603 mode.format = desired_format;
4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 3280 diff changeset	604 if (SDL_SetWindowDisplayMode(SDL_VideoWindow, &mode) < 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: diff changeset	605 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	606 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	607 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	608
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	609 /* If we're in OpenGL mode, just create a stub surface and we're done! */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	610 if (flags & SDL_OPENGL) {
1912 8d384b647307 Setting up the OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1907 diff changeset	611 SDL_VideoContext = SDL_GL_CreateContext(SDL_VideoWindow);
8d384b647307 Setting up the OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1907 diff changeset	612 if (!SDL_VideoContext) {
8d384b647307 Setting up the OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1907 diff changeset	613 return NULL;
8d384b647307 Setting up the OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1907 diff changeset	614 }
8d384b647307 Setting up the OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1907 diff changeset	615 if (SDL_GL_MakeCurrent(SDL_VideoWindow, SDL_VideoContext) < 0) {
8d384b647307 Setting up the OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1907 diff changeset	616 return NULL;
8d384b647307 Setting up the OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1907 diff changeset	617 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	618 SDL_VideoSurface =
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	619 SDL_CreateRGBSurfaceFrom(NULL, width, height, bpp, 0, 0, 0, 0, 0);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	620 if (!SDL_VideoSurface) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	621 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	622 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	623 SDL_VideoSurface->flags \|= surface_flags;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	624 SDL_PublicSurface = SDL_VideoSurface;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	625 return SDL_PublicSurface;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	626 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	627
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	628 /* Create a renderer for the window */
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	629 SDL_VideoRenderer = SDL_CreateRenderer(SDL_VideoWindow, -1, 0);
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	630 if (!SDL_VideoRenderer) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	631 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	632 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	633
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	634 /* Create a texture for the screen surface */
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	635 SDL_VideoTexture = SDL_CreateTexture(SDL_VideoRenderer, desired_format,
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	636 SDL_TEXTUREACCESS_STREAMING,
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	637 width, height);
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	638
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	639 if (!SDL_VideoTexture) {
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	640 SDL_VideoTexture = SDL_CreateTexture(SDL_VideoRenderer, desktop_format,
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	641 SDL_TEXTUREACCESS_STREAMING,
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	642 width, height);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	643 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	644 if (!SDL_VideoTexture) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	645 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	646 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	647
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	648 /* Create the screen surface */
2222 926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	649 SDL_VideoSurface = CreateVideoSurface(SDL_VideoTexture);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	650 if (!SDL_VideoSurface) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	651 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	652 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	653 SDL_VideoSurface->flags \|= surface_flags;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	654
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	655 /* Create a shadow surface if necessary */
2222 926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	656 if ((bpp != SDL_VideoSurface->format->BitsPerPixel)
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	657 && !(flags & SDL_ANYFORMAT)) {
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	658 SDL_ShadowSurface =
926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	659 SDL_CreateRGBSurface(0, width, height, bpp, 0, 0, 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: diff changeset	660 if (!SDL_ShadowSurface) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	661 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	662 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	663 SDL_ShadowSurface->flags \|= surface_flags;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	664
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	665 /* 8-bit SDL_ShadowSurface surfaces report that they have exclusive palette */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	666 if (SDL_ShadowSurface->format->palette) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	667 SDL_ShadowSurface->flags \|= SDL_HWPALETTE;
5152 be02be2ea897 Making the API simpler, removed support for palettized video modes and textures. Sam Lantinga <slouken@libsdl.org> parents: 5150 diff changeset	668 SDL_DitherColors(SDL_ShadowSurface->format->palette->colors,
be02be2ea897 Making the API simpler, removed support for palettized video modes and textures. Sam Lantinga <slouken@libsdl.org> parents: 5150 diff changeset	669 SDL_ShadowSurface->format->BitsPerPixel);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	670 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	671 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	672 SDL_PublicSurface =
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	673 (SDL_ShadowSurface ? SDL_ShadowSurface : SDL_VideoSurface);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	674
2829 16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	675 SDL_VideoFlags = flags;
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	676
16fe3b867887 Allow resizing of SDL 1.2 compatibility video mode Sam Lantinga <slouken@libsdl.org> parents: 2807 diff changeset	677 ClearVideoSurface();
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	678
3028 1c4a059966bd Don't disable the screen saver by default for windows applications Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	679 SetupScreenSaver(flags);
3025 54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	680
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	681 /* We're finally done! */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	682 return SDL_PublicSurface;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	683 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	684
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	685 SDL_Surface *
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	686 SDL_GetVideoSurface(void)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	687 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	688 return SDL_PublicSurface;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	689 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	690
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2240 diff changeset	691 int
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2240 diff changeset	692 SDL_SetAlpha(SDL_Surface * surface, Uint32 flag, Uint8 value)
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2240 diff changeset	693 {
2838 00356f22195a Fixed SDL_SetAlpha compatibility function to match the documentation Sam Lantinga <slouken@libsdl.org> parents: 2831 diff changeset	694 if (flag & SDL_SRCALPHA) {
00356f22195a Fixed SDL_SetAlpha compatibility function to match the documentation Sam Lantinga <slouken@libsdl.org> parents: 2831 diff changeset	695 /* According to the docs, value is ignored for alpha surfaces */
00356f22195a Fixed SDL_SetAlpha compatibility function to match the documentation Sam Lantinga <slouken@libsdl.org> parents: 2831 diff changeset	696 if (surface->format->Amask) {
00356f22195a Fixed SDL_SetAlpha compatibility function to match the documentation Sam Lantinga <slouken@libsdl.org> parents: 2831 diff changeset	697 value = 0xFF;
00356f22195a Fixed SDL_SetAlpha compatibility function to match the documentation Sam Lantinga <slouken@libsdl.org> parents: 2831 diff changeset	698 }
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2240 diff changeset	699 SDL_SetSurfaceAlphaMod(surface, value);
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2872 diff changeset	700 SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_BLEND);
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2240 diff changeset	701 } else {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2240 diff changeset	702 SDL_SetSurfaceAlphaMod(surface, 0xFF);
2884 9dde605c7540 Date: Fri, 19 Dec 2008 20:17:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2872 diff changeset	703 SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_NONE);
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2240 diff changeset	704 }
2838 00356f22195a Fixed SDL_SetAlpha compatibility function to match the documentation Sam Lantinga <slouken@libsdl.org> parents: 2831 diff changeset	705 SDL_SetSurfaceRLE(surface, (flag & SDL_RLEACCEL));
00356f22195a Fixed SDL_SetAlpha compatibility function to match the documentation Sam Lantinga <slouken@libsdl.org> parents: 2831 diff changeset	706
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2240 diff changeset	707 return 0;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2240 diff changeset	708 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2240 diff changeset	709
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	710 SDL_Surface *
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	711 SDL_DisplayFormat(SDL_Surface * surface)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	712 {
2807 365fe1a2aad5 The SDL_RLEACCEL flag is respected in SDL_ConvertSurface(), per the docs. Sam Lantinga <slouken@libsdl.org> parents: 2803 diff changeset	713 SDL_PixelFormat *format;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	714
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	715 if (!SDL_PublicSurface) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	716 SDL_SetError("No video mode has been set");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	717 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	718 }
2807 365fe1a2aad5 The SDL_RLEACCEL flag is respected in SDL_ConvertSurface(), per the docs. Sam Lantinga <slouken@libsdl.org> parents: 2803 diff changeset	719 format = SDL_PublicSurface->format;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	720
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	721 /* Set the flags appropriate for copying to display surface */
2807 365fe1a2aad5 The SDL_RLEACCEL flag is respected in SDL_ConvertSurface(), per the docs. Sam Lantinga <slouken@libsdl.org> parents: 2803 diff changeset	722 return SDL_ConvertSurface(surface, format, SDL_RLEACCEL);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	723 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	724
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	725 SDL_Surface *
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	726 SDL_DisplayFormatAlpha(SDL_Surface * surface)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	727 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	728 SDL_PixelFormat *vf;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	729 SDL_PixelFormat *format;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	730 SDL_Surface *converted;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	731 /* default to ARGB8888 */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	732 Uint32 amask = 0xff000000;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	733 Uint32 rmask = 0x00ff0000;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	734 Uint32 gmask = 0x0000ff00;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	735 Uint32 bmask = 0x000000ff;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	736
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	737 if (!SDL_PublicSurface) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	738 SDL_SetError("No video mode has been set");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	739 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	740 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	741 vf = SDL_PublicSurface->format;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	742
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	743 switch (vf->BytesPerPixel) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	744 case 2:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	745 /* For XGY5[56]5, use, AXGY8888, where {X, Y} = {R, B}.
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	746 For anything else (like ARGB4444) it doesn't matter
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	747 since we have no special code for it anyway */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	748 if ((vf->Rmask == 0x1f) &&
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	749 (vf->Bmask == 0xf800 \|\| vf->Bmask == 0x7c00)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	750 rmask = 0xff;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	751 bmask = 0xff0000;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	752 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	753 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	754
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	755 case 3:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	756 case 4:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	757 /* Keep the video format, as long as the high 8 bits are
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	758 unused or alpha */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	759 if ((vf->Rmask == 0xff) && (vf->Bmask == 0xff0000)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	760 rmask = 0xff;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	761 bmask = 0xff0000;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	762 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	763 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	764
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	765 default:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	766 /* We have no other optimised formats right now. When/if a new
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	767 optimised alpha format is written, add the converter here */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	768 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	769 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	770 format = SDL_AllocFormat(32, rmask, gmask, bmask, amask);
2807 365fe1a2aad5 The SDL_RLEACCEL flag is respected in SDL_ConvertSurface(), per the docs. Sam Lantinga <slouken@libsdl.org> parents: 2803 diff changeset	771 converted = SDL_ConvertSurface(surface, format, SDL_RLEACCEL);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	772 SDL_FreeFormat(format);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	773 return converted;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	774 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	775
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	776 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	777 SDL_Flip(SDL_Surface * screen)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	778 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	779 SDL_UpdateRect(screen, 0, 0, 0, 0);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	780 return 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	781 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	782
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	783 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	784 SDL_UpdateRect(SDL_Surface * screen, Sint32 x, Sint32 y, Uint32 w, Uint32 h)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	785 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	786 if (screen) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	787 SDL_Rect rect;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	788
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	789 /* Fill the rectangle */
1897 c2a27da60b18 Solved the performance problems by introducing the concept of a single-buffered Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	790 rect.x = (int) x;
c2a27da60b18 Solved the performance problems by introducing the concept of a single-buffered Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	791 rect.y = (int) y;
c2a27da60b18 Solved the performance problems by introducing the concept of a single-buffered Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	792 rect.w = (int) (w ? w : screen->w);
c2a27da60b18 Solved the performance problems by introducing the concept of a single-buffered Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	793 rect.h = (int) (h ? h : screen->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: diff changeset	794 SDL_UpdateRects(screen, 1, &rect);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	795 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	796 }
2735 204be4fc2726 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	797
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	798 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	799 SDL_UpdateRects(SDL_Surface * screen, int numrects, SDL_Rect * rects)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	800 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	801 int i;
5145 c8e049de174c Making the API simpler, the renderer present semantics are always having a backbuffer and then discarding it. This is best for hardware accelerated rendering. Sam Lantinga <slouken@libsdl.org> parents: 5113 diff changeset	802 SDL_Rect rect;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	803
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	804 if (screen == SDL_ShadowSurface) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	805 for (i = 0; i < numrects; ++i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	806 SDL_LowerBlit(SDL_ShadowSurface, &rects[i], SDL_VideoSurface,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	807 &rects[i]);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	808 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	809
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	810 /* Fall through to video surface update */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	811 screen = SDL_VideoSurface;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	812 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	813 if (screen == SDL_VideoSurface) {
5159 307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5152 diff changeset	814 /* The surface memory needs to be copied to texture */
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5152 diff changeset	815 int pitch = screen->pitch;
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5152 diff changeset	816 int psize = screen->format->BytesPerPixel;
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5152 diff changeset	817 for (i = 0; i < numrects; ++i) {
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5152 diff changeset	818 const SDL_Rect *rect = &rects[i];
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5152 diff changeset	819 void *pixels =
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5152 diff changeset	820 (Uint8 ) screen->pixels + rect->y pitch +
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5152 diff changeset	821 rect->x * psize;
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5152 diff changeset	822 SDL_UpdateTexture(SDL_VideoTexture, rect, pixels, pitch);
2222 926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	823 }
5145 c8e049de174c Making the API simpler, the renderer present semantics are always having a backbuffer and then discarding it. This is best for hardware accelerated rendering. Sam Lantinga <slouken@libsdl.org> parents: 5113 diff changeset	824 rect.x = 0;
c8e049de174c Making the API simpler, the renderer present semantics are always having a backbuffer and then discarding it. This is best for hardware accelerated rendering. Sam Lantinga <slouken@libsdl.org> parents: 5113 diff changeset	825 rect.y = 0;
c8e049de174c Making the API simpler, the renderer present semantics are always having a backbuffer and then discarding it. This is best for hardware accelerated rendering. Sam Lantinga <slouken@libsdl.org> parents: 5113 diff changeset	826 rect.w = screen->w;
c8e049de174c Making the API simpler, the renderer present semantics are always having a backbuffer and then discarding it. This is best for hardware accelerated rendering. Sam Lantinga <slouken@libsdl.org> parents: 5113 diff changeset	827 rect.h = screen->h;
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	828 SDL_RenderCopy(SDL_VideoRenderer, SDL_VideoTexture, &rect, &rect);
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	829 SDL_RenderPresent(SDL_VideoRenderer);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	830 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	831 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	832
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	833 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	834 SDL_WM_SetCaption(const char title, const char icon)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	835 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	836 if (wm_title) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	837 SDL_free(wm_title);
2037 6bb97f41ab4b Fixed bug #329 Sam Lantinga <slouken@libsdl.org> parents: 1985 diff changeset	838 }
6bb97f41ab4b Fixed bug #329 Sam Lantinga <slouken@libsdl.org> parents: 1985 diff changeset	839 if (title) {
6bb97f41ab4b Fixed bug #329 Sam Lantinga <slouken@libsdl.org> parents: 1985 diff changeset	840 wm_title = SDL_strdup(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: diff changeset	841 } else {
2037 6bb97f41ab4b Fixed bug #329 Sam Lantinga <slouken@libsdl.org> parents: 1985 diff changeset	842 wm_title = 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: diff changeset	843 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	844 SDL_SetWindowTitle(SDL_VideoWindow, wm_title);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	845 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	846
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	847 void
2037 6bb97f41ab4b Fixed bug #329 Sam Lantinga <slouken@libsdl.org> parents: 1985 diff changeset	848 SDL_WM_GetCaption(const char title, const char icon)
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	849 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	850 if (title) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	851 *title = wm_title;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	852 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	853 if (icon) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	854 *icon = "";
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	855 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	856 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	857
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	858 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	859 SDL_WM_SetIcon(SDL_Surface * icon, Uint8 * mask)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	860 {
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2884 diff changeset	861 SDL_VideoIcon = icon;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	862 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	863
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	864 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	865 SDL_WM_IconifyWindow(void)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	866 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	867 SDL_MinimizeWindow(SDL_VideoWindow);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	868 return 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	869 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	870
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	871 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	872 SDL_WM_ToggleFullScreen(SDL_Surface * surface)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	873 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	874 if (SDL_GetWindowFlags(SDL_VideoWindow) & SDL_WINDOW_FULLSCREEN) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	875 if (SDL_SetWindowFullscreen(SDL_VideoWindow, 0) < 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	876 return 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	877 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	878 SDL_PublicSurface->flags &= ~SDL_FULLSCREEN;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	879 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	880 if (SDL_SetWindowFullscreen(SDL_VideoWindow, 1) < 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	881 return 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	882 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	883 SDL_PublicSurface->flags \|= SDL_FULLSCREEN;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	884 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	885 return 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	886 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	887
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	888 SDL_GrabMode
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	889 SDL_WM_GrabInput(SDL_GrabMode mode)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	890 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	891 if (mode != SDL_GRAB_QUERY) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	892 SDL_SetWindowGrab(SDL_VideoWindow, mode);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	893 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	894 return (SDL_GrabMode) SDL_GetWindowGrab(SDL_VideoWindow);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	895 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	896
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	897 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	898 SDL_WarpMouse(Uint16 x, Uint16 y)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	899 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	900 SDL_WarpMouseInWindow(SDL_VideoWindow, x, y);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	901 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	902
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	903 Uint8
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	904 SDL_GetAppState(void)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	905 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	906 Uint8 state = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	907 Uint32 flags = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	908
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	909 flags = SDL_GetWindowFlags(SDL_VideoWindow);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	910 if ((flags & SDL_WINDOW_SHOWN) && !(flags & SDL_WINDOW_MINIMIZED)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	911 state \|= SDL_APPACTIVE;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	912 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	913 if (flags & SDL_WINDOW_INPUT_FOCUS) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	914 state \|= SDL_APPINPUTFOCUS;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	915 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	916 if (flags & SDL_WINDOW_MOUSE_FOCUS) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	917 state \|= SDL_APPMOUSEFOCUS;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	918 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	919 return state;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	920 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	921
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	922 const SDL_version *
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	923 SDL_Linked_Version(void)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	924 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	925 static SDL_version version;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	926 SDL_VERSION(&version);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	927 return &version;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	928 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	929
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	930 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	931 SDL_SetPalette(SDL_Surface * surface, int flags, const SDL_Color * colors,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	932 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: diff changeset	933 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	934 return SDL_SetColors(surface, colors, firstcolor, ncolors);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	935 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	936
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	937 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	938 SDL_SetColors(SDL_Surface * surface, const SDL_Color * colors, int firstcolor,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	939 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: diff changeset	940 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	941 if (SDL_SetPaletteColors
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	942 (surface->format->palette, colors, firstcolor, ncolors) == 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	943 return 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	944 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	945 return 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	946 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	947 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	948
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	949 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	950 SDL_GetWMInfo(SDL_SysWMinfo * info)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	951 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	952 return SDL_GetWindowWMInfo(SDL_VideoWindow, info);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	953 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	954
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	955 #if 0
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	956 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	957 SDL_MoveCursor(int x, int y)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	958 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	959 SDL_VideoDevice *_this = SDL_GetVideoDevice();
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	960
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	961 /* Erase and update the current mouse position */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	962 if (SHOULD_DRAWCURSOR(SDL_cursorstate)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	963 /* Erase and redraw mouse cursor in new position */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	964 SDL_LockCursor();
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	965 SDL_EraseCursor(SDL_VideoSurface);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	966 SDL_cursor->area.x = (x - SDL_cursor->hot_x);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	967 SDL_cursor->area.y = (y - SDL_cursor->hot_y);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	968 SDL_DrawCursor(SDL_VideoSurface);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	969 SDL_UnlockCursor();
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	970 } else if (_this->MoveWMCursor) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	971 _this->MoveWMCursor(_this, x, y);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	972 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	973 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	974
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	975 /* Keep track of the current cursor colors */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	976 static int palette_changed = 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	977 static Uint8 pixels8[2];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	978
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	979 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	980 SDL_CursorPaletteChanged(void)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	981 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	982 palette_changed = 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	983 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	984
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	985 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	986 SDL_MouseRect(SDL_Rect * area)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	987 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	988 SDL_VideoDevice *_this = SDL_GetVideoDevice();
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	989 int clip_diff;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	990
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	991 *area = SDL_cursor->area;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	992 if (area->x < 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	993 area->w += area->x;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	994 area->x = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	995 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	996 if (area->y < 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	997 area->h += area->y;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	998 area->y = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	999 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1000 clip_diff = (area->x + area->w) - SDL_VideoSurface->w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1001 if (clip_diff > 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1002 area->w = area->w < clip_diff ? 0 : area->w - clip_diff;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1003 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1004 clip_diff = (area->y + area->h) - SDL_VideoSurface->h;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1005 if (clip_diff > 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1006 area->h = area->h < clip_diff ? 0 : area->h - clip_diff;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1007 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1008 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1009
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1010 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: diff changeset	1011 SDL_DrawCursorFast(SDL_Surface * screen, SDL_Rect * area)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1012 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1013 const Uint32 pixels[2] = { 0xFFFFFFFF, 0x00000000 };
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1014 int i, w, h;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1015 Uint8 *data, datab;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1016 Uint8 *mask, maskb;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1017
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1018 data = SDL_cursor->data + area->y * SDL_cursor->area.w / 8;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1019 mask = SDL_cursor->mask + area->y * SDL_cursor->area.w / 8;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1020 switch (screen->format->BytesPerPixel) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1021
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1022 case 1:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1023 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1024 Uint8 *dst;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1025 int dstskip;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1026
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1027 if (palette_changed) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1028 pixels8[0] =
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1029 (Uint8) SDL_MapRGB(screen->format, 255, 255, 255);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1030 pixels8[1] = (Uint8) SDL_MapRGB(screen->format, 0, 0, 0);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1031 palette_changed = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1032 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1033 dst = (Uint8 *) screen->pixels +
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1034 (SDL_cursor->area.y + area->y) * screen->pitch +
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1035 SDL_cursor->area.x;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1036 dstskip = screen->pitch - area->w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1037
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1038 for (h = area->h; h; h--) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1039 for (w = area->w / 8; w; w--) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1040 maskb = *mask++;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1041 datab = *data++;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1042 for (i = 0; i < 8; ++i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1043 if (maskb & 0x80) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1044 *dst = pixels8[datab >> 7];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1045 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1046 maskb <<= 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1047 datab <<= 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1048 dst++;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1049 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1050 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1051 dst += dstskip;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1052 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1053 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1054 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1055
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1056 case 2:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1057 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1058 Uint16 *dst;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1059 int dstskip;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1060
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1061 dst = (Uint16 *) screen->pixels +
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1062 (SDL_cursor->area.y + area->y) * screen->pitch / 2 +
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1063 SDL_cursor->area.x;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1064 dstskip = (screen->pitch / 2) - area->w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1065
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1066 for (h = area->h; h; h--) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1067 for (w = area->w / 8; w; w--) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1068 maskb = *mask++;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1069 datab = *data++;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1070 for (i = 0; i < 8; ++i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1071 if (maskb & 0x80) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1072 *dst = (Uint16) pixels[datab >> 7];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1073 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1074 maskb <<= 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1075 datab <<= 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1076 dst++;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1077 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1078 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1079 dst += dstskip;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1080 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1081 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1082 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1083
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1084 case 3:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1085 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1086 Uint8 *dst;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1087 int dstskip;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 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: diff changeset	1089 dst = (Uint8 *) screen->pixels +
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1090 (SDL_cursor->area.y + area->y) * screen->pitch +
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1091 SDL_cursor->area.x * 3;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1092 dstskip = screen->pitch - area->w * 3;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1093
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1094 for (h = area->h; h; h--) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1095 for (w = area->w / 8; w; w--) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1096 maskb = *mask++;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1097 datab = *data++;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1098 for (i = 0; i < 8; ++i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1099 if (maskb & 0x80) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1100 SDL_memset(dst, pixels[datab >> 7], 3);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1101 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1102 maskb <<= 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1103 datab <<= 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1104 dst += 3;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1105 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1106 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1107 dst += dstskip;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1108 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1109 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1110 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1111
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1112 case 4:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1113 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1114 Uint32 *dst;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1115 int dstskip;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1116
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1117 dst = (Uint32 *) screen->pixels +
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1118 (SDL_cursor->area.y + area->y) * screen->pitch / 4 +
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1119 SDL_cursor->area.x;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1120 dstskip = (screen->pitch / 4) - area->w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1121
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1122 for (h = area->h; h; h--) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1123 for (w = area->w / 8; w; w--) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1124 maskb = *mask++;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1125 datab = *data++;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1126 for (i = 0; i < 8; ++i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1127 if (maskb & 0x80) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1128 *dst = pixels[datab >> 7];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1129 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1130 maskb <<= 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1131 datab <<= 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1132 dst++;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1133 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1134 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1135 dst += dstskip;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 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: diff changeset	1137 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1138 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1139 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1140 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1141
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1142 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: diff changeset	1143 SDL_DrawCursorSlow(SDL_Surface * screen, SDL_Rect * area)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 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: diff changeset	1145 const Uint32 pixels[2] = { 0xFFFFFF, 0x000000 };
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1146 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: diff changeset	1147 int x, minx, maxx;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1148 Uint8 *data, datab = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1149 Uint8 *mask, maskb = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1150 Uint8 *dst;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1151 int dstbpp, dstskip;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1152
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1153 data = SDL_cursor->data + area->y * SDL_cursor->area.w / 8;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1154 mask = SDL_cursor->mask + area->y * SDL_cursor->area.w / 8;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1155 dstbpp = screen->format->BytesPerPixel;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1156 dst = (Uint8 *) screen->pixels +
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1157 (SDL_cursor->area.y + area->y) * screen->pitch +
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1158 SDL_cursor->area.x * dstbpp;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1159 dstskip = screen->pitch - SDL_cursor->area.w * dstbpp;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1160
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1161 minx = area->x;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1162 maxx = area->x + area->w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1163 if (screen->format->BytesPerPixel == 1) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1164 if (palette_changed) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1165 pixels8[0] = (Uint8) SDL_MapRGB(screen->format, 255, 255, 255);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1166 pixels8[1] = (Uint8) SDL_MapRGB(screen->format, 0, 0, 0);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1167 palette_changed = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1168 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1169 for (h = area->h; h; h--) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1170 for (x = 0; x < SDL_cursor->area.w; ++x) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1171 if ((x % 8) == 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1172 maskb = *mask++;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1173 datab = *data++;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 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: diff changeset	1175 if ((x >= minx) && (x < maxx)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1176 if (maskb & 0x80) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1177 SDL_memset(dst, pixels8[datab >> 7], dstbpp);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1178 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1179 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1180 maskb <<= 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1181 datab <<= 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1182 dst += dstbpp;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1183 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1184 dst += dstskip;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1185 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1186 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1187 for (h = area->h; h; h--) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1188 for (x = 0; x < SDL_cursor->area.w; ++x) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1189 if ((x % 8) == 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1190 maskb = *mask++;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1191 datab = *data++;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1192 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1193 if ((x >= minx) && (x < maxx)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1194 if (maskb & 0x80) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1195 SDL_memset(dst, pixels[datab >> 7], dstbpp);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1196 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1197 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1198 maskb <<= 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1199 datab <<= 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1200 dst += dstbpp;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1201 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1202 dst += dstskip;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1203 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1204 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1205 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1206
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1207 /* This handles the ugly work of converting the saved cursor background from
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1208 the pixel format of the shadow surface to that of the video surface.
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1209 This is only necessary when blitting from a shadow surface of a different
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1210 pixel format than the video surface, and using a software rendered cursor.
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1211 */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1212 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: diff changeset	1213 SDL_ConvertCursorSave(SDL_Surface * screen, 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: diff changeset	1214 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1215 SDL_VideoDevice *_this = SDL_GetVideoDevice();
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1216 SDL_BlitInfo info;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1217 SDL_loblit RunBlit;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1218
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1219 /* Make sure we can steal the blit mapping */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1220 if (screen->map->dst != SDL_VideoSurface) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1221 return;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1222 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 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: diff changeset	1224 /* Set up the blit information */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1225 info.s_pixels = SDL_cursor->save[1];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1226 info.s_width = w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1227 info.s_height = h;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1228 info.s_skip = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1229 info.d_pixels = SDL_cursor->save[0];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1230 info.d_width = w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1231 info.d_height = h;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1232 info.d_skip = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1233 info.aux_data = screen->map->sw_data->aux_data;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1234 info.src = screen->format;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1235 info.table = screen->map->table;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1236 info.dst = SDL_VideoSurface->format;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1237 RunBlit = screen->map->sw_data->blit;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1238
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1239 /* Run the actual software blit */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1240 RunBlit(&info);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1241 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1242
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1243 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1244 SDL_DrawCursorNoLock(SDL_Surface * screen)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1245 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1246 SDL_VideoDevice *_this = SDL_GetVideoDevice();
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1247 SDL_Rect area;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1248
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1249 /* Get the mouse rectangle, clipped to the screen */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1250 SDL_MouseRect(&area);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1251 if ((area.w == 0) \|\| (area.h == 0)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1252 return;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1253 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 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: diff changeset	1255 /* Copy mouse background */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1256 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1257 int w, h, screenbpp;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1258 Uint8 src, dst;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1259
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1260 /* Set up the copy pointers */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1261 screenbpp = screen->format->BytesPerPixel;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1262 if ((screen == SDL_VideoSurface) \|\|
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1263 FORMAT_EQUAL(screen->format, SDL_VideoSurface->format)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1264 dst = SDL_cursor->save[0];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1265 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1266 dst = SDL_cursor->save[1];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1267 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1268 src = (Uint8 ) screen->pixels + area.y screen->pitch +
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1269 area.x * screenbpp;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1270
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1271 /* Perform the copy */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1272 w = area.w * screenbpp;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1273 h = area.h;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1274 while (h--) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1275 SDL_memcpy(dst, src, w);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1276 dst += w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1277 src += screen->pitch;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1278 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1279 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1280
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1281 /* Draw the mouse cursor */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1282 area.x -= SDL_cursor->area.x;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1283 area.y -= SDL_cursor->area.y;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1284 if ((area.x == 0) && (area.w == SDL_cursor->area.w)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1285 SDL_DrawCursorFast(screen, &area);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1286 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1287 SDL_DrawCursorSlow(screen, &area);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1288 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1289 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1290
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1291 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1292 SDL_DrawCursor(SDL_Surface * screen)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1293 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1294 /* Lock the screen if necessary */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1295 if (screen == NULL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1296 return;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1297 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1298 if (SDL_MUSTLOCK(screen)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1299 if (SDL_LockSurface(screen) < 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1300 return;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1301 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1302 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1303
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1304 SDL_DrawCursorNoLock(screen);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1305
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1306 /* Unlock the screen and update if necessary */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1307 if (SDL_MUSTLOCK(screen)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1308 SDL_UnlockSurface(screen);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1309 }
2222 926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	1310 if (screen->flags & SDL_SCREEN_SURFACE) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1311 SDL_VideoDevice *_this = SDL_GetVideoDevice();
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1312 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: diff changeset	1313 SDL_Rect area;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1314
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1315 window = SDL_GetWindowFromSurface(screen);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1316 if (!window) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1317 return;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1318 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1319
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1320 SDL_MouseRect(&area);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1321
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1322 if (_this->UpdateWindowSurface) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1323 _this->UpdateWindowSurface(_this, window, 1, &area);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1324 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1325 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1326 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1327
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1328 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1329 SDL_EraseCursorNoLock(SDL_Surface * screen)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1330 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1331 SDL_VideoDevice *_this = SDL_GetVideoDevice();
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1332 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: diff changeset	1333 SDL_Rect area;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1334
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1335 /* Get the window associated with the surface */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1336 window = SDL_GetWindowFromSurface(screen);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1337 if (!window \|\| !window->surface) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1338 return;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1339 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1340
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1341 /* Get the mouse rectangle, clipped to the screen */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1342 SDL_MouseRect(&area);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1343 if ((area.w == 0) \|\| (area.h == 0)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1344 return;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1345 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 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: diff changeset	1347 /* Copy mouse background */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1348 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1349 int w, h, screenbpp;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1350 Uint8 src, dst;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1351
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1352 /* Set up the copy pointers */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1353 screenbpp = screen->format->BytesPerPixel;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1354 if ((screen->flags & SDL_SCREEN_SURFACE) \|\|
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1355 FORMAT_EQUAL(screen->format, window->surface->format)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1356 src = SDL_cursor->save[0];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1357 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1358 src = SDL_cursor->save[1];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1359 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1360 dst = (Uint8 ) screen->pixels + area.y screen->pitch +
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1361 area.x * screenbpp;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 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: diff changeset	1363 /* Perform the copy */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1364 w = area.w * screenbpp;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1365 h = area.h;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1366 while (h--) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1367 SDL_memcpy(dst, src, w);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1368 src += w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1369 dst += screen->pitch;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1370 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1371
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1372 /* Perform pixel conversion on cursor background */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1373 if (src > SDL_cursor->save[1]) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1374 SDL_ConvertCursorSave(screen, area.w, area.h);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1375 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1376 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1377 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1378
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1379 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1380 SDL_EraseCursor(SDL_Surface * screen)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1381 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1382 /* Lock the screen if necessary */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1383 if (screen == NULL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1384 return;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1385 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1386 if (SDL_MUSTLOCK(screen)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1387 if (SDL_LockSurface(screen) < 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1388 return;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1389 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1390 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1391
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1392 SDL_EraseCursorNoLock(screen);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1393
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1394 /* Unlock the screen and update if necessary */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1395 if (SDL_MUSTLOCK(screen)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1396 SDL_UnlockSurface(screen);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1397 }
2222 926294b2bb4e Emphasized the separation between SDL_Surface and SDL_Texture Sam Lantinga <slouken@libsdl.org> parents: 2202 diff changeset	1398 if (screen->flags & SDL_SCREEN_SURFACE) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1399 SDL_VideoDevice *_this = SDL_GetVideoDevice();
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1400 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: diff changeset	1401 SDL_Rect area;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1402
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1403 window = SDL_GetWindowFromSurface(screen);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1404 if (!window) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1405 return;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1406 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1407
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1408 SDL_MouseRect(&area);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1409
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1410 if (_this->UpdateWindowSurface) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1411 _this->UpdateWindowSurface(_this, window, 1, &area);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1412 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1413 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1414 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1415
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1416 /* Reset the cursor on video mode change
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1417 FIXME: Keep track of all cursors, and reset them all.
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1418 */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1419 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1420 SDL_ResetCursor(void)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1421 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1422 int savelen;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1423
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1424 if (SDL_cursor) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1425 savelen = SDL_cursor->area.w * 4 * SDL_cursor->area.h;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1426 SDL_cursor->area.x = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1427 SDL_cursor->area.y = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1428 SDL_memset(SDL_cursor->save[0], 0, savelen);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1429 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1430 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1431 #endif
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1432
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1433 struct private_yuvhwdata
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1434 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1435 Uint16 pitches[3];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1436 Uint8 *planes[3];
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1437
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: 3592 diff changeset	1438 SDL_Texture *texture;
2803 8fe261aae1bb Fixed the texture format for the software fallback Sam Lantinga <slouken@libsdl.org> parents: 2796 diff changeset	1439 Uint32 texture_format;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1440 };
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1441
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1442 SDL_Overlay *
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1443 SDL_CreateYUVOverlay(int w, int h, Uint32 format, SDL_Surface * display)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1444 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1445 SDL_Overlay *overlay;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1446 Uint32 texture_format;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1447
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1448 if ((display->flags & SDL_OPENGL) == SDL_OPENGL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1449 SDL_SetError("YUV overlays are not supported in OpenGL mode");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1450 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1451 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1452
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1453 if (display != SDL_PublicSurface) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1454 SDL_SetError("YUV display is only supported on the screen surface");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1455 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1456 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1457
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1458 switch (format) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1459 case SDL_YV12_OVERLAY:
1965 a788656ca29a SDL constants are all uppercase. Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	1460 texture_format = SDL_PIXELFORMAT_YV12;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1461 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1462 case SDL_IYUV_OVERLAY:
1965 a788656ca29a SDL constants are all uppercase. Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	1463 texture_format = SDL_PIXELFORMAT_IYUV;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1464 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1465 case SDL_YUY2_OVERLAY:
1965 a788656ca29a SDL constants are all uppercase. Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	1466 texture_format = SDL_PIXELFORMAT_YUY2;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1467 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1468 case SDL_UYVY_OVERLAY:
1965 a788656ca29a SDL constants are all uppercase. Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	1469 texture_format = SDL_PIXELFORMAT_UYVY;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1470 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1471 case SDL_YVYU_OVERLAY:
1965 a788656ca29a SDL constants are all uppercase. Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	1472 texture_format = SDL_PIXELFORMAT_YVYU;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1473 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1474 default:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1475 SDL_SetError("Unknown YUV format");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1476 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1477 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1478
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1479 overlay = (SDL_Overlay ) SDL_malloc(sizeof(overlay));
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1480 if (!overlay) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1481 SDL_OutOfMemory();
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1482 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 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: diff changeset	1484 SDL_zerop(overlay);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1485
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1486 overlay->hwdata =
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1487 (struct private_yuvhwdata ) SDL_malloc(sizeof(overlay->hwdata));
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1488 if (!overlay->hwdata) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1489 SDL_free(overlay);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1490 SDL_OutOfMemory();
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1491 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1492 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1493
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1494 overlay->format = format;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1495 overlay->w = w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1496 overlay->h = h;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1497 if (format == SDL_YV12_OVERLAY \|\| format == SDL_IYUV_OVERLAY) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1498 overlay->planes = 3;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1499 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1500 overlay->planes = 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1501 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1502 overlay->pitches = overlay->hwdata->pitches;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1503 overlay->pixels = overlay->hwdata->planes;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1504
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1505 switch (format) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1506 case SDL_YV12_OVERLAY:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1507 case SDL_IYUV_OVERLAY:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1508 overlay->pitches[0] = overlay->w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1509 overlay->pitches[1] = overlay->w / 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1510 overlay->pitches[2] = overlay->w / 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1511 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1512 case SDL_YUY2_OVERLAY:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1513 case SDL_UYVY_OVERLAY:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1514 case SDL_YVYU_OVERLAY:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1515 overlay->pitches[0] = overlay->w * 2;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1516 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1517 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1518
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: 3592 diff changeset	1519 overlay->hwdata->texture =
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	1520 SDL_CreateTexture(SDL_VideoRenderer, texture_format,
ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	1521 SDL_TEXTUREACCESS_STREAMING, w, 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: 3592 diff changeset	1522 if (!overlay->hwdata->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: diff changeset	1523 SDL_FreeYUVOverlay(overlay);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1524 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1525 }
2803 8fe261aae1bb Fixed the texture format for the software fallback Sam Lantinga <slouken@libsdl.org> parents: 2796 diff changeset	1526 overlay->hwdata->texture_format = texture_format;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1527
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1528 return overlay;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1529 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1530
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1531 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1532 SDL_LockYUVOverlay(SDL_Overlay * overlay)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1533 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1534 void *pixels;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1535 int pitch;
2202 98e76ba7d5a4 Merged fix for bug #457 from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 2153 diff changeset	1536
98e76ba7d5a4 Merged fix for bug #457 from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 2153 diff changeset	1537 if (!overlay) {
98e76ba7d5a4 Merged fix for bug #457 from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 2153 diff changeset	1538 SDL_SetError("Passed a NULL overlay");
98e76ba7d5a4 Merged fix for bug #457 from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 2153 diff changeset	1539 return -1;
98e76ba7d5a4 Merged fix for bug #457 from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 2153 diff changeset	1540 }
5159 307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5152 diff changeset	1541 if (SDL_LockTexture(overlay->hwdata->texture, NULL, &pixels, &pitch) < 0) {
307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5152 diff changeset	1542 return -1;
2786 6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2781 diff changeset	1543 }
2226 0e70b4b8cf84 Date: Sat, 11 Aug 2007 02:03:16 +0200 (CEST) Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	1544 overlay->pixels[0] = (Uint8 *) pixels;
0e70b4b8cf84 Date: Sat, 11 Aug 2007 02:03:16 +0200 (CEST) Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	1545 overlay->pitches[0] = 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: diff changeset	1546 switch (overlay->format) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1547 case SDL_YV12_OVERLAY:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1548 case SDL_IYUV_OVERLAY:
2226 0e70b4b8cf84 Date: Sat, 11 Aug 2007 02:03:16 +0200 (CEST) Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	1549 overlay->pitches[1] = pitch / 2;
0e70b4b8cf84 Date: Sat, 11 Aug 2007 02:03:16 +0200 (CEST) Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	1550 overlay->pitches[2] = pitch / 2;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1551 overlay->pixels[1] =
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1552 overlay->pixels[0] + overlay->pitches[0] * overlay->h;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1553 overlay->pixels[2] =
2226 0e70b4b8cf84 Date: Sat, 11 Aug 2007 02:03:16 +0200 (CEST) Sam Lantinga <slouken@libsdl.org> parents: 2222 diff changeset	1554 overlay->pixels[1] + overlay->pitches[1] * overlay->h / 2;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1555 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1556 case SDL_YUY2_OVERLAY:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1557 case SDL_UYVY_OVERLAY:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1558 case SDL_YVYU_OVERLAY:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1559 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1560 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1561 return 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1562 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1563
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1564 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1565 SDL_UnlockYUVOverlay(SDL_Overlay * overlay)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1566 {
2202 98e76ba7d5a4 Merged fix for bug #457 from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 2153 diff changeset	1567 if (!overlay) {
98e76ba7d5a4 Merged fix for bug #457 from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 2153 diff changeset	1568 return;
98e76ba7d5a4 Merged fix for bug #457 from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 2153 diff changeset	1569 }
5159 307ccc9c135e Made it possible to create a texture of any format, even if not supported by the renderer. Sam Lantinga <slouken@libsdl.org> parents: 5152 diff changeset	1570 SDL_UnlockTexture(overlay->hwdata->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: diff changeset	1571 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1572
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1573 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1574 SDL_DisplayYUVOverlay(SDL_Overlay * overlay, SDL_Rect * dstrect)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1575 {
2202 98e76ba7d5a4 Merged fix for bug #457 from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 2153 diff changeset	1576 if (!overlay \|\| !dstrect) {
98e76ba7d5a4 Merged fix for bug #457 from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 2153 diff changeset	1577 SDL_SetError("Passed a NULL overlay or dstrect");
98e76ba7d5a4 Merged fix for bug #457 from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 2153 diff changeset	1578 return -1;
98e76ba7d5a4 Merged fix for bug #457 from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 2153 diff changeset	1579 }
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	1580 if (SDL_RenderCopy(SDL_VideoRenderer, overlay->hwdata->texture, NULL, dstrect) < 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: diff changeset	1581 return -1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1582 }
5150 ad50b3db78bd The rendering functions take a context so it's clear what window they're drawing to. This also potentially opens to the door to multi-threaded rendering in the future. Sam Lantinga <slouken@libsdl.org> parents: 5145 diff changeset	1583 SDL_RenderPresent(SDL_VideoRenderer);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1584 return 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1585 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1586
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1587 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1588 SDL_FreeYUVOverlay(SDL_Overlay * overlay)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1589 {
2202 98e76ba7d5a4 Merged fix for bug #457 from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 2153 diff changeset	1590 if (!overlay) {
98e76ba7d5a4 Merged fix for bug #457 from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 2153 diff changeset	1591 return;
98e76ba7d5a4 Merged fix for bug #457 from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 2153 diff changeset	1592 }
98e76ba7d5a4 Merged fix for bug #457 from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 2153 diff changeset	1593 if (overlay->hwdata) {
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: 3592 diff changeset	1594 if (overlay->hwdata->texture) {
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: 3592 diff changeset	1595 SDL_DestroyTexture(overlay->hwdata->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: diff changeset	1596 }
2202 98e76ba7d5a4 Merged fix for bug #457 from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 2153 diff changeset	1597 SDL_free(overlay->hwdata);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1598 }
2202 98e76ba7d5a4 Merged fix for bug #457 from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 2153 diff changeset	1599 SDL_free(overlay);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1600 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1601
1912 8d384b647307 Setting up the OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1907 diff changeset	1602 void
8d384b647307 Setting up the OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1907 diff changeset	1603 SDL_GL_SwapBuffers(void)
8d384b647307 Setting up the OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1907 diff changeset	1604 {
8d384b647307 Setting up the OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1907 diff changeset	1605 SDL_GL_SwapWindow(SDL_VideoWindow);
8d384b647307 Setting up the OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1907 diff changeset	1606 }
8d384b647307 Setting up the OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1907 diff changeset	1607
2129 047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	1608
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	1609 int
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	1610 SDL_EnableKeyRepeat(int delay, int interval)
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	1611 {
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	1612 return 0;
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	1613 }
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	1614
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	1615 void
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	1616 SDL_GetKeyRepeat(int delay, int interval)
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	1617 {
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	1618 if (delay) {
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	1619 *delay = SDL_DEFAULT_REPEAT_DELAY;
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	1620 }
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	1621 if (interval) {
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	1622 *interval = SDL_DEFAULT_REPEAT_INTERVAL;
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	1623 }
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	1624 }
047245361002 Key repeat is handled by the OS, since text input is now decoupled from physical key events. Sam Lantinga <slouken@libsdl.org> parents: 2058 diff changeset	1625
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2267 diff changeset	1626 int
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2267 diff changeset	1627 SDL_EnableUNICODE(int enable)
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2267 diff changeset	1628 {
3280 00cace2d9080 Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009 Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	1629 int previous = SDL_enabled_UNICODE;
00cace2d9080 Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009 Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	1630
00cace2d9080 Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009 Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	1631 switch (enable) {
00cace2d9080 Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009 Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	1632 case 1:
00cace2d9080 Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009 Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	1633 SDL_enabled_UNICODE = 1;
4753 11b0a6a3eb4d Changed Start/StopTextInput back to not take any parameters. dewyatt parents: 4751 diff changeset	1634 SDL_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: 3139 diff changeset	1635 break;
00cace2d9080 Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009 Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	1636 case 0:
00cace2d9080 Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009 Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	1637 SDL_enabled_UNICODE = 0;
4753 11b0a6a3eb4d Changed Start/StopTextInput back to not take any parameters. dewyatt parents: 4751 diff changeset	1638 SDL_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: 3139 diff changeset	1639 break;
00cace2d9080 Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009 Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	1640 }
00cace2d9080 Merged a cleaned up version of Jiang's code changes from Google Summer of Code 2009 Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	1641 return previous;
2303 d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2267 diff changeset	1642 }
d87417504c75 First pass implementation of new SDL scancode concept, as discussed with Sam Lantinga <slouken@libsdl.org> parents: 2267 diff changeset	1643
5113 481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1644 static Uint32
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1645 SDL_SetTimerCallback(Uint32 interval, void* param)
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1646 {
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1647 return ((SDL_OldTimerCallback)param)(interval);
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1648 }
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1649
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1650 int
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1651 SDL_SetTimer(Uint32 interval, SDL_OldTimerCallback callback)
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1652 {
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1653 static SDL_TimerID compat_timer;
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1654
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1655 if (compat_timer) {
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1656 SDL_RemoveTimer(compat_timer);
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1657 compat_timer = 0;
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1658 }
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1659
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1660 if (interval && callback) {
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1661 compat_timer = SDL_AddTimer(interval, SDL_SetTimerCallback, callback);
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1662 if (!compat_timer) {
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1663 return -1;
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1664 }
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1665 }
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1666 return 0;
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1667 }
481dabb098ef Improved timer implementation Sam Lantinga <slouken@libsdl.org> parents: 5043 diff changeset	1668
3581 15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1669 int
15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1670 SDL_putenv(const char *_var)
15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1671 {
15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1672 char *ptr = NULL;
15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1673 char *var = SDL_strdup(_var);
15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1674 if (var == NULL) {
15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1675 return -1; /* we don't set errno. */
15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1676 }
15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1677
3592 25dc4a86132c Fixed compile error on Windows. Sam Lantinga <slouken@libsdl.org> parents: 3585 diff changeset	1678 ptr = SDL_strchr(var, '=');
3581 15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1679 if (ptr == NULL) {
15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1680 SDL_free(var);
15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1681 return -1;
15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1682 }
15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1683
15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1684 ptr = '\0'; / split the string into name and value. */
15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1685 SDL_setenv(var, ptr + 1, 1);
15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1686 SDL_free(var);
15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1687 return 0;
15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1688 }
15eea7a1fa97 Implemented SDL_setenv(), moved SDL_putenv() to compat. Ryan C. Gordon <icculus@icculus.org> parents: 3518 diff changeset	1689
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1690 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/SDL_compat.c @ 5159:307ccc9c135e