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

annotate src/SDL_compat.c @ 1722:5daa04d862f1 SDL-1.3

Added a userdata parameter for event filters. Added a function to filter the existing queued events. Added explicit support for relative mouse mode to the API.

author	Sam Lantinga <slouken@libsdl.org>
date	Fri, 30 Jun 2006 08:18:44 +0000
parents	a1ebb17f9c52
children	6c63fc2bd986

rev	line source
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	3 Copyright (C) 1997-2006 Sam Lantinga
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 Lesser General Public License for more details.
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 License along with this library; if not, write to the Free Software
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 Sam Lantinga
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 slouken@libsdl.org
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 */
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	22 #include "SDL_config.h"
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	24 /* This file contains functions for backwards compatibility with SDL 1.2 */
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	25
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	26 #include "SDL.h"
1712 931d111e737a Started framework for Windows video driver Sam Lantinga <slouken@libsdl.org> parents: 1691 diff changeset	27 #include "SDL_syswm.h"
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	28
1720 a1ebb17f9c52 Cleaned up a bunch of warnings, started adding Win32 event support Sam Lantinga <slouken@libsdl.org> parents: 1716 diff changeset	29 #include "video/SDL_sysvideo.h"
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	30 #include "video/SDL_pixels_c.h"
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	31
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	32
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	33 static SDL_WindowID SDL_VideoWindow;
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	34 static SDL_TextureID SDL_VideoTexture;
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	35 static SDL_Surface *SDL_VideoSurface;
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	36 static SDL_Surface *SDL_ShadowSurface;
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	37 static SDL_Surface *SDL_PublicSurface;
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	38 static char *wm_title;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	39
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	40 char *
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	41 SDL_AudioDriverName(char *namebuf, int maxlen)
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	42 {
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	43 const char *name = SDL_GetCurrentAudioDriver();
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	44 if (name) {
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	45 SDL_strlcpy(namebuf, name, maxlen);
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	46 return namebuf;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	47 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	48 return NULL;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	49 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	50
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	51 char *
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	52 SDL_VideoDriverName(char *namebuf, int maxlen)
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	53 {
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	54 const char *name = SDL_GetCurrentVideoDriver();
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	55 if (name) {
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	56 SDL_strlcpy(namebuf, name, maxlen);
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	57 return namebuf;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	58 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	59 return NULL;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	60 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	61
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	62 const SDL_VideoInfo *
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	63 SDL_GetVideoInfo(void)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	64 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	65 static SDL_VideoInfo info;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	66
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	67 /* Memory leak, compatibility code, who cares? */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	68 if (!info.vfmt && SDL_GetDesktopDisplayMode()) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	69 int bpp;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	70 Uint32 Rmask, Gmask, Bmask, Amask;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	71
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	72 SDL_PixelFormatEnumToMasks(SDL_GetDesktopDisplayMode()->format, &bpp,
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	73 &Rmask, &Gmask, &Bmask, &Amask);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	74 info.vfmt = SDL_AllocFormat(bpp, Rmask, Gmask, Bmask, Amask);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	75 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	76 return &info;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	77 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	78
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	79 int
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	80 SDL_VideoModeOK(int width, int height, int bpp, Uint32 flags)
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	81 {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	82 int i, actual_bpp = 0;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	83
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	84 if (!SDL_GetVideoDevice()) {
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	85 return 0;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	86 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	87
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	88 if (!(flags & SDL_FULLSCREEN)) {
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	89 return SDL_BITSPERPIXEL(SDL_GetDesktopDisplayMode()->format);
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	90 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	91
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	92 for (i = 0; i < SDL_GetNumDisplayModes(); ++i) {
4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	93 const SDL_DisplayMode *mode = SDL_GetDisplayMode(i);
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	94 if (!mode->w \|\| !mode->h \|\| (width == mode->w && height == mode->h)) {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	95 if (!mode->format) {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	96 return bpp;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	97 }
1720 a1ebb17f9c52 Cleaned up a bunch of warnings, started adding Win32 event support Sam Lantinga <slouken@libsdl.org> parents: 1716 diff changeset	98 if (SDL_BITSPERPIXEL(mode->format) >= (Uint32) bpp) {
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	99 actual_bpp = SDL_BITSPERPIXEL(mode->format);
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	100 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	101 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	102 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	103 return actual_bpp;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	104 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	105
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	106 SDL_Rect **
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	107 SDL_ListModes(SDL_PixelFormat * format, Uint32 flags)
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	108 {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	109 int i, nmodes;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	110 SDL_Rect **modes;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	111
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	112 if (!SDL_GetVideoDevice()) {
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	113 return NULL;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	114 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	115
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	116 if (!(flags & SDL_FULLSCREEN)) {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	117 return (SDL_Rect **) (-1);
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	118 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	119
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	120 /* Memory leak, but this is a compatibility function, who cares? */
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	121 nmodes = 0;
1720 a1ebb17f9c52 Cleaned up a bunch of warnings, started adding Win32 event support Sam Lantinga <slouken@libsdl.org> parents: 1716 diff changeset	122 modes = NULL;
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	123 for (i = 0; i < SDL_GetNumDisplayModes(); ++i) {
4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	124 const SDL_DisplayMode *mode = SDL_GetDisplayMode(i);
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	125 if (!mode->w \|\| !mode->h) {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	126 return (SDL_Rect **) (-1);
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	127 }
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	128 if (SDL_BITSPERPIXEL(mode->format) != format->BitsPerPixel) {
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	129 continue;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	130 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	131 if (nmodes > 0 && modes[nmodes - 1]->w == mode->w
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	132 && modes[nmodes - 1]->h == mode->h) {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	133 continue;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	134 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	135
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	136 modes = SDL_realloc(modes, (nmodes + 2) * sizeof(*modes));
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	137 if (!modes) {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	138 return NULL;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	139 }
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	140 modes[nmodes] = (SDL_Rect *) SDL_malloc(sizeof(SDL_Rect));
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	141 if (!modes[nmodes]) {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	142 return NULL;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	143 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	144 modes[nmodes]->x = 0;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	145 modes[nmodes]->y = 0;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	146 modes[nmodes]->w = mode->w;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	147 modes[nmodes]->h = mode->h;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	148 ++nmodes;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	149 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	150 if (modes) {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	151 modes[nmodes] = NULL;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	152 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	153 return modes;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	154 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	155
1722 5daa04d862f1 Added a userdata parameter for event filters. Sam Lantinga <slouken@libsdl.org> parents: 1720 diff changeset	156 static SDL_EventFilter orig_eventfilter;
5daa04d862f1 Added a userdata parameter for event filters. Sam Lantinga <slouken@libsdl.org> parents: 1720 diff changeset	157 static void *orig_eventfilterparam;
1669 9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	158
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	159 static int
1722 5daa04d862f1 Added a userdata parameter for event filters. Sam Lantinga <slouken@libsdl.org> parents: 1720 diff changeset	160 SDL_CompatEventFilter(void userdata, SDL_Event event)
1669 9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	161 {
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	162 SDL_Event fake;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	163
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	164 switch (event->type) {
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	165 case SDL_WINDOWEVENT:
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	166 switch (event->window.event) {
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	167 case SDL_WINDOWEVENT_RESIZED:
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	168 fake.type = SDL_VIDEORESIZE;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	169 fake.resize.w = event->window.data1;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	170 fake.resize.h = event->window.data2;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	171 SDL_PushEvent(&fake);
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	172 break;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	173 case SDL_WINDOWEVENT_MINIMIZED:
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	174 fake.type = SDL_ACTIVEEVENT;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	175 fake.active.gain = 0;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	176 fake.active.state = SDL_APPACTIVE;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	177 SDL_PushEvent(&fake);
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	178 break;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	179 case SDL_WINDOWEVENT_RESTORED:
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	180 fake.type = SDL_ACTIVEEVENT;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	181 fake.active.gain = 1;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	182 fake.active.state = SDL_APPACTIVE;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	183 SDL_PushEvent(&fake);
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	184 break;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	185 case SDL_WINDOWEVENT_ENTER:
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	186 fake.type = SDL_ACTIVEEVENT;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	187 fake.active.gain = 1;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	188 fake.active.state = SDL_APPMOUSEFOCUS;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	189 SDL_PushEvent(&fake);
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	190 break;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	191 case SDL_WINDOWEVENT_LEAVE:
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	192 fake.type = SDL_ACTIVEEVENT;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	193 fake.active.gain = 0;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	194 fake.active.state = SDL_APPMOUSEFOCUS;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	195 SDL_PushEvent(&fake);
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	196 break;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	197 case SDL_WINDOWEVENT_FOCUS_GAINED:
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	198 fake.type = SDL_ACTIVEEVENT;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	199 fake.active.gain = 1;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	200 fake.active.state = SDL_APPINPUTFOCUS;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	201 SDL_PushEvent(&fake);
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	202 break;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	203 case SDL_WINDOWEVENT_FOCUS_LOST:
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	204 fake.type = SDL_ACTIVEEVENT;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	205 fake.active.gain = 1;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	206 fake.active.state = SDL_APPINPUTFOCUS;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	207 SDL_PushEvent(&fake);
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	208 break;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	209 }
1686 8d7fecceb9ef Added the unicode keysym memory again for backwards compatibility. Sam Lantinga <slouken@libsdl.org> parents: 1685 diff changeset	210 case SDL_KEYDOWN:
8d7fecceb9ef Added the unicode keysym memory again for backwards compatibility. Sam Lantinga <slouken@libsdl.org> parents: 1685 diff changeset	211 case SDL_KEYUP:
8d7fecceb9ef Added the unicode keysym memory again for backwards compatibility. Sam Lantinga <slouken@libsdl.org> parents: 1685 diff changeset	212 {
8d7fecceb9ef Added the unicode keysym memory again for backwards compatibility. Sam Lantinga <slouken@libsdl.org> parents: 1685 diff changeset	213 Uint32 unicode = 0;
8d7fecceb9ef Added the unicode keysym memory again for backwards compatibility. Sam Lantinga <slouken@libsdl.org> parents: 1685 diff changeset	214 if (event->key.type == SDL_KEYDOWN && event->key.keysym.sym < 256) {
1687 d36048e8e302 This trick only works for English Sam Lantinga <slouken@libsdl.org> parents: 1686 diff changeset	215 unicode = event->key.keysym.sym;
1691 c901fd2a42da I think this fixes bug #244 Sam Lantinga <slouken@libsdl.org> parents: 1687 diff changeset	216 if (unicode >= 'a' && unicode <= 'z') {
1687 d36048e8e302 This trick only works for English Sam Lantinga <slouken@libsdl.org> parents: 1686 diff changeset	217 int shifted = !!(event->key.keysym.mod & KMOD_SHIFT);
d36048e8e302 This trick only works for English Sam Lantinga <slouken@libsdl.org> parents: 1686 diff changeset	218 int capslock = !!(event->key.keysym.mod & KMOD_CAPS);
d36048e8e302 This trick only works for English Sam Lantinga <slouken@libsdl.org> parents: 1686 diff changeset	219 if ((shifted ^ capslock) != 0) {
d36048e8e302 This trick only works for English Sam Lantinga <slouken@libsdl.org> parents: 1686 diff changeset	220 unicode = SDL_toupper(unicode);
d36048e8e302 This trick only works for English Sam Lantinga <slouken@libsdl.org> parents: 1686 diff changeset	221 }
1686 8d7fecceb9ef Added the unicode keysym memory again for backwards compatibility. Sam Lantinga <slouken@libsdl.org> parents: 1685 diff changeset	222 }
8d7fecceb9ef Added the unicode keysym memory again for backwards compatibility. Sam Lantinga <slouken@libsdl.org> parents: 1685 diff changeset	223 }
8d7fecceb9ef Added the unicode keysym memory again for backwards compatibility. Sam Lantinga <slouken@libsdl.org> parents: 1685 diff changeset	224 if (unicode) {
8d7fecceb9ef Added the unicode keysym memory again for backwards compatibility. Sam Lantinga <slouken@libsdl.org> parents: 1685 diff changeset	225 event->key.keysym.unicode = unicode;
8d7fecceb9ef Added the unicode keysym memory again for backwards compatibility. Sam Lantinga <slouken@libsdl.org> parents: 1685 diff changeset	226 }
8d7fecceb9ef Added the unicode keysym memory again for backwards compatibility. Sam Lantinga <slouken@libsdl.org> parents: 1685 diff changeset	227 break;
8d7fecceb9ef Added the unicode keysym memory again for backwards compatibility. Sam Lantinga <slouken@libsdl.org> parents: 1685 diff changeset	228 }
1669 9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	229 }
1683 396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	230 if (orig_eventfilter) {
1722 5daa04d862f1 Added a userdata parameter for event filters. Sam Lantinga <slouken@libsdl.org> parents: 1720 diff changeset	231 return orig_eventfilter(orig_eventfilterparam, event);
1683 396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	232 } else {
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	233 return 1;
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	234 }
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	235 }
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	236
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	237 static int
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	238 SDL_VideoPaletteChanged(void userdata, SDL_Palette palette)
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	239 {
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	240 if (userdata == SDL_ShadowSurface) {
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	241 /* If the shadow palette changed, make the changes visible */
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	242 if (!SDL_VideoSurface->format->palette) {
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	243 SDL_UpdateRect(SDL_ShadowSurface, 0, 0, 0, 0);
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	244 }
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	245 }
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	246 if (userdata == SDL_VideoSurface) {
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	247 return SDL_SetDisplayPalette(palette->colors, 0, palette->ncolors);
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	248 }
1720 a1ebb17f9c52 Cleaned up a bunch of warnings, started adding Win32 event support Sam Lantinga <slouken@libsdl.org> parents: 1716 diff changeset	249 return 0;
1669 9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	250 }
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	251
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	252 SDL_Surface *
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	253 SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags)
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	254 {
1722 5daa04d862f1 Added a userdata parameter for event filters. Sam Lantinga <slouken@libsdl.org> parents: 1720 diff changeset	255 SDL_EventFilter filter;
5daa04d862f1 Added a userdata parameter for event filters. Sam Lantinga <slouken@libsdl.org> parents: 1720 diff changeset	256 void *filterparam;
1669 9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	257 const SDL_DisplayMode *desktop_mode;
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	258 SDL_DisplayMode mode;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	259 Uint32 window_flags;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	260 Uint32 desktop_format;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	261 Uint32 desired_format;
1682 7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	262 Uint32 surface_flags;
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	263
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	264 if (!SDL_GetVideoDevice()) {
4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	265 if (SDL_Init(SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE) < 0) {
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	266 return NULL;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	267 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	268 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	269
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	270 /* Destroy existing window */
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	271 SDL_PublicSurface = NULL;
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	272 if (SDL_ShadowSurface) {
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	273 SDL_FreeSurface(SDL_ShadowSurface);
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	274 SDL_ShadowSurface = NULL;
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	275 }
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	276 if (SDL_VideoSurface) {
1683 396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	277 SDL_DelPaletteWatch(SDL_VideoSurface->format->palette,
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	278 SDL_VideoPaletteChanged, NULL);
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	279 SDL_FreeSurface(SDL_VideoSurface);
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	280 SDL_VideoSurface = NULL;
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	281 }
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	282 SDL_DestroyWindow(SDL_VideoWindow);
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	283
1669 9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	284 /* Set up the event filter */
1722 5daa04d862f1 Added a userdata parameter for event filters. Sam Lantinga <slouken@libsdl.org> parents: 1720 diff changeset	285 filter = SDL_GetEventFilter(&filterparam);
1669 9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	286 if (filter != SDL_CompatEventFilter) {
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	287 orig_eventfilter = filter;
1722 5daa04d862f1 Added a userdata parameter for event filters. Sam Lantinga <slouken@libsdl.org> parents: 1720 diff changeset	288 orig_eventfilterparam = filterparam;
1669 9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	289 }
1722 5daa04d862f1 Added a userdata parameter for event filters. Sam Lantinga <slouken@libsdl.org> parents: 1720 diff changeset	290 SDL_SetEventFilter(SDL_CompatEventFilter, NULL);
1669 9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	291
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	292 /* Create a new window */
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	293 window_flags = SDL_WINDOW_SHOWN;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	294 if (flags & SDL_FULLSCREEN) {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	295 window_flags \|= SDL_WINDOW_FULLSCREEN;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	296 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	297 if (flags & SDL_OPENGL) {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	298 window_flags \|= SDL_WINDOW_OPENGL;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	299 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	300 if (flags & SDL_RESIZABLE) {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	301 window_flags \|= SDL_WINDOW_RESIZABLE;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	302 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	303 if (flags & SDL_NOFRAME) {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	304 window_flags \|= SDL_WINDOW_BORDERLESS;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	305 }
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	306 SDL_VideoWindow =
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	307 SDL_CreateWindow(wm_title, 0, 0, width, height, window_flags);
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	308 if (!SDL_VideoWindow) {
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	309 return NULL;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	310 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	311
1682 7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	312 window_flags = SDL_GetWindowFlags(SDL_VideoWindow);
1716 6ab5e712e642 The screen/shadow surface flags are no longer needed Sam Lantinga <slouken@libsdl.org> parents: 1712 diff changeset	313 surface_flags = 0;
1682 7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	314 if (window_flags & SDL_WINDOW_FULLSCREEN) {
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	315 surface_flags \|= SDL_FULLSCREEN;
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	316 }
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	317 if (window_flags & SDL_WINDOW_OPENGL) {
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	318 surface_flags \|= SDL_OPENGL;
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	319 }
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	320 if (window_flags & SDL_WINDOW_RESIZABLE) {
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	321 surface_flags \|= SDL_RESIZABLE;
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	322 }
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	323 if (window_flags & SDL_WINDOW_BORDERLESS) {
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	324 surface_flags \|= SDL_NOFRAME;
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	325 }
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	326
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	327 /* Set up the desired display mode */
1669 9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	328 desktop_mode = SDL_GetDesktopDisplayMode();
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	329 desktop_format = desktop_mode->format;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	330 if (desktop_format && ((flags & SDL_ANYFORMAT)
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	331 \|\| (bpp == SDL_BITSPERPIXEL(desktop_format)))) {
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	332 desired_format = desktop_format;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	333 } else {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	334 switch (bpp) {
1669 9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	335 case 0:
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	336 if (desktop_format) {
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	337 desired_format = desktop_format;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	338 } else {
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	339 desired_format = SDL_PixelFormat_RGB888;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	340 }
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	341 break;
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	342 case 8:
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	343 desired_format = SDL_PixelFormat_Index8;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	344 break;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	345 case 15:
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	346 desired_format = SDL_PixelFormat_RGB555;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	347 break;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	348 case 16:
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	349 desired_format = SDL_PixelFormat_RGB565;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	350 break;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	351 case 24:
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	352 desired_format = SDL_PixelFormat_RGB24;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	353 break;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	354 case 32:
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	355 desired_format = SDL_PixelFormat_RGB888;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	356 break;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	357 default:
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	358 SDL_SetError("Unsupported bpp in SDL_SetVideoMode()");
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	359 return NULL;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	360 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	361 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	362 mode.format = desired_format;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	363 mode.w = width;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	364 mode.h = height;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	365 mode.refresh_rate = 0;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	366
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	367 /* Set the desired display mode */
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	368 if (flags & SDL_FULLSCREEN) {
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	369 if (!SDL_GetClosestDisplayMode(&mode, &mode)) {
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	370 return NULL;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	371 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	372 } else {
1669 9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	373 if (desktop_format) {
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	374 mode.format = desktop_format;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	375 }
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	376 if (desktop_mode->w && desktop_mode->h) {
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	377 mode.w = desktop_mode->w;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	378 mode.h = desktop_mode->h;
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	379 }
9857d21967bb The test programs compile again. Sam Lantinga <slouken@libsdl.org> parents: 1668 diff changeset	380 mode.refresh_rate = desktop_mode->refresh_rate;
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	381 }
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	382 if (SDL_SetDisplayMode(&mode) < 0) {
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	383 return NULL;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	384 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	385
1682 7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	386 /* If we're in OpenGL mode, just create a stub surface and we're done! */
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	387 if (flags & SDL_OPENGL) {
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	388 SDL_VideoSurface =
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	389 SDL_CreateRGBSurfaceFrom(NULL, width, height, bpp, 0, 0, 0, 0, 0);
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	390 if (!SDL_VideoSurface) {
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	391 return NULL;
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	392 }
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	393 SDL_VideoSurface->flags \|= surface_flags;
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	394 SDL_PublicSurface = SDL_VideoSurface;
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	395 return SDL_PublicSurface;
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	396 }
7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	397
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	398 /* Create a renderer for the window */
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	399 if (SDL_CreateRenderer(SDL_VideoWindow, -1, 0) < 0) {
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	400 return NULL;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	401 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	402
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	403 /* Create a texture for the screen surface */
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	404 SDL_VideoTexture =
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	405 SDL_CreateTexture(desired_format, SDL_TextureAccess_Local, width,
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	406 height);
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	407 if (!SDL_VideoTexture) {
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	408 SDL_VideoTexture =
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	409 SDL_CreateTexture(0, SDL_TextureAccess_Local, width, height);
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	410 }
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	411 if (!SDL_VideoTexture) {
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	412 return NULL;
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	413 }
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	414
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	415 /* Create the screen surface */
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	416 SDL_VideoSurface = SDL_CreateRGBSurfaceFromTexture(SDL_VideoTexture);
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	417 if (!SDL_VideoSurface) {
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	418 return NULL;
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	419 }
1682 7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	420 SDL_VideoSurface->flags \|= surface_flags;
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	421
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	422 /* Set a default screen palette */
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	423 if (SDL_VideoSurface->format->palette) {
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	424 SDL_VideoSurface->flags \|= SDL_HWPALETTE;
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	425 SDL_DitherColors(SDL_VideoSurface->format->palette->colors,
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	426 SDL_VideoSurface->format->BitsPerPixel);
1683 396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	427 SDL_AddPaletteWatch(SDL_VideoSurface->format->palette,
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	428 SDL_VideoPaletteChanged, NULL);
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	429 SDL_SetPaletteColors(SDL_VideoSurface->format->palette,
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	430 SDL_VideoSurface->format->palette->colors, 0,
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	431 SDL_VideoSurface->format->palette->ncolors);
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	432 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	433
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	434 /* Create a shadow surface if necessary */
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	435 if (((bpp != SDL_VideoSurface->format->BitsPerPixel)
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	436 && !(flags & SDL_ANYFORMAT))
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	437 \|\| ((SDL_VideoSurface->flags & SDL_HWSURFACE)
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	438 && !(flags & SDL_HWSURFACE))) {
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	439 if ((bpp == SDL_VideoSurface->format->BitsPerPixel)
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	440 \|\| (flags & SDL_ANYFORMAT)) {
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	441 SDL_ShadowSurface =
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	442 SDL_CreateRGBSurface(0, width, height,
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	443 SDL_VideoSurface->format->BitsPerPixel,
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	444 SDL_VideoSurface->format->Rmask,
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	445 SDL_VideoSurface->format->Gmask,
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	446 SDL_VideoSurface->format->Bmask,
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	447 SDL_VideoSurface->format->Amask);
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	448 } else {
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	449 SDL_ShadowSurface =
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	450 SDL_CreateRGBSurface(0, width, height, bpp, 0, 0, 0, 0);
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	451 }
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	452 if (!SDL_ShadowSurface) {
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	453 return NULL;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	454 }
1682 7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	455 SDL_ShadowSurface->flags \|= surface_flags;
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	456
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	457 /* 8-bit SDL_ShadowSurface surfaces report that they have exclusive palette */
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	458 if (SDL_ShadowSurface->format->palette) {
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	459 SDL_ShadowSurface->flags \|= SDL_HWPALETTE;
1683 396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	460 if (SDL_VideoSurface->format->palette) {
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	461 SDL_SetSurfacePalette(SDL_ShadowSurface,
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	462 SDL_VideoSurface->format->palette);
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	463 } else {
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	464 SDL_DitherColors(SDL_ShadowSurface->format->palette->colors,
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	465 SDL_ShadowSurface->format->BitsPerPixel);
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	466 }
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	467 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	468 }
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	469 SDL_PublicSurface =
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	470 (SDL_ShadowSurface ? SDL_ShadowSurface : SDL_VideoSurface);
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	471
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	472 /* Clear the surface for display */
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	473 SDL_FillRect(SDL_PublicSurface, NULL, 0);
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	474
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	475 /* We're finally done! */
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	476 return SDL_PublicSurface;
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	477 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	478
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	479 SDL_Surface *
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	480 SDL_GetVideoSurface(void)
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	481 {
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	482 return SDL_PublicSurface;
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	483 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	484
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	485 SDL_Surface *
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	486 SDL_DisplayFormat(SDL_Surface * surface)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	487 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	488 Uint32 flags;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	489
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	490 if (!SDL_PublicSurface) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	491 SDL_SetError("No video mode has been set");
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	492 return NULL;
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	493 }
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	494
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	495 /* Set the flags appropriate for copying to display surface */
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	496 flags = SDL_SWSURFACE;
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	497 #ifdef AUTORLE_DISPLAYFORMAT
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	498 flags \|= (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA));
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	499 flags \|= SDL_RLEACCELOK;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	500 #else
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	501 flags \|=
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	502 surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA \| SDL_RLEACCELOK);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	503 #endif
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	504 return SDL_ConvertSurface(surface, SDL_PublicSurface->format, flags);
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	505 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	506
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	507 SDL_Surface *
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	508 SDL_DisplayFormatAlpha(SDL_Surface * surface)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	509 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	510 SDL_PixelFormat *vf;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	511 SDL_PixelFormat *format;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	512 SDL_Surface *converted;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	513 Uint32 flags;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	514 /* default to ARGB8888 */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	515 Uint32 amask = 0xff000000;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	516 Uint32 rmask = 0x00ff0000;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	517 Uint32 gmask = 0x0000ff00;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	518 Uint32 bmask = 0x000000ff;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	519
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	520 if (!SDL_PublicSurface) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	521 SDL_SetError("No video mode has been set");
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	522 return NULL;
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	523 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	524 vf = SDL_PublicSurface->format;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	525
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	526 switch (vf->BytesPerPixel) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	527 case 2:
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	528 /* For XGY5[56]5, use, AXGY8888, where {X, Y} = {R, B}.
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	529 For anything else (like ARGB4444) it doesn't matter
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	530 since we have no special code for it anyway */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	531 if ((vf->Rmask == 0x1f) &&
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	532 (vf->Bmask == 0xf800 \|\| vf->Bmask == 0x7c00)) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	533 rmask = 0xff;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	534 bmask = 0xff0000;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	535 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	536 break;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	537
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	538 case 3:
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	539 case 4:
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	540 /* Keep the video format, as long as the high 8 bits are
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	541 unused or alpha */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	542 if ((vf->Rmask == 0xff) && (vf->Bmask == 0xff0000)) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	543 rmask = 0xff;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	544 bmask = 0xff0000;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	545 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	546 break;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	547
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	548 default:
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	549 /* We have no other optimised formats right now. When/if a new
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	550 optimised alpha format is written, add the converter here */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	551 break;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	552 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	553 format = SDL_AllocFormat(32, rmask, gmask, bmask, amask);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	554 flags = SDL_PublicSurface->flags & SDL_HWSURFACE;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	555 flags \|= surface->flags & (SDL_SRCALPHA \| SDL_RLEACCELOK);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	556 converted = SDL_ConvertSurface(surface, format, flags);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	557 SDL_FreeFormat(format);
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	558 return converted;
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	559 }
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	560
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	561 int
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	562 SDL_Flip(SDL_Surface * screen)
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	563 {
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	564 SDL_UpdateRect(screen, 0, 0, 0, 0);
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	565 return 0;
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	566 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	567
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	568 void
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	569 SDL_UpdateRect(SDL_Surface * screen, Sint32 x, Sint32 y, Uint32 w, Uint32 h)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	570 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	571 if (screen) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	572 SDL_Rect rect;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	573
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	574 /* Perform some checking */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	575 if (w == 0)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	576 w = screen->w;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	577 if (h == 0)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	578 h = screen->h;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	579 if ((int) (x + w) > screen->w)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	580 return;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	581 if ((int) (y + h) > screen->h)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	582 return;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	583
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	584 /* Fill the rectangle */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	585 rect.x = (Sint16) x;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	586 rect.y = (Sint16) y;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	587 rect.w = (Uint16) w;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	588 rect.h = (Uint16) h;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	589 SDL_UpdateRects(screen, 1, &rect);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	590 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	591 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	592 void
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	593 SDL_UpdateRects(SDL_Surface * screen, int numrects, SDL_Rect * rects)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	594 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	595 int i;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	596
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	597 if (screen == SDL_ShadowSurface) {
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	598 for (i = 0; i < numrects; ++i) {
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	599 SDL_LowerBlit(SDL_ShadowSurface, &rects[i], SDL_VideoSurface,
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	600 &rects[i]);
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	601 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	602
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	603 /* Fall through to video surface update */
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	604 screen = SDL_VideoSurface;
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	605 }
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	606 if (screen == SDL_VideoSurface) {
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	607 for (i = 0; i < numrects; ++i) {
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	608 SDL_RenderCopy(SDL_VideoTexture, &rects[i], &rects[i],
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	609 SDL_TextureBlendMode_None,
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	610 SDL_TextureScaleMode_None);
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	611 }
90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	612 SDL_RenderPresent();
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	613 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	614 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	615
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	616 void
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	617 SDL_WM_SetCaption(const char title, const char icon)
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	618 {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	619 if (wm_title) {
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	620 SDL_free(wm_title);
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	621 } else {
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	622 wm_title = SDL_strdup(title);
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	623 }
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	624 SDL_SetWindowTitle(SDL_VideoWindow, wm_title);
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	625 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	626
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	627 void
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	628 SDL_WM_GetCaption(char title, char icon)
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	629 {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	630 if (title) {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	631 *title = wm_title;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	632 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	633 if (icon) {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	634 *icon = "";
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	635 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	636 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	637
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	638 void
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	639 SDL_WM_SetIcon(SDL_Surface * icon, Uint8 * mask)
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	640 {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	641 /* FIXME */
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	642 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	643
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	644 int
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	645 SDL_WM_IconifyWindow(void)
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	646 {
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	647 SDL_MinimizeWindow(SDL_VideoWindow);
1720 a1ebb17f9c52 Cleaned up a bunch of warnings, started adding Win32 event support Sam Lantinga <slouken@libsdl.org> parents: 1716 diff changeset	648 return 0;
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	649 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	650
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	651 int
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	652 SDL_WM_ToggleFullScreen(SDL_Surface * surface)
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	653 {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	654 return 0;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	655 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	656
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	657 SDL_GrabMode
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	658 SDL_WM_GrabInput(SDL_GrabMode mode)
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	659 {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	660 if (mode != SDL_GRAB_QUERY) {
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	661 SDL_SetWindowGrab(SDL_VideoWindow, mode);
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	662 }
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	663 return (SDL_GrabMode) SDL_GetWindowGrab(SDL_VideoWindow);
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	664 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	665
1680 9488fca10677 Dummy video driver works again in high color video modes. Yay! Sam Lantinga <slouken@libsdl.org> parents: 1678 diff changeset	666 void
9488fca10677 Dummy video driver works again in high color video modes. Yay! Sam Lantinga <slouken@libsdl.org> parents: 1678 diff changeset	667 SDL_WarpMouse(Uint16 x, Uint16 y)
9488fca10677 Dummy video driver works again in high color video modes. Yay! Sam Lantinga <slouken@libsdl.org> parents: 1678 diff changeset	668 {
9488fca10677 Dummy video driver works again in high color video modes. Yay! Sam Lantinga <slouken@libsdl.org> parents: 1678 diff changeset	669 SDL_WarpMouseInWindow(SDL_VideoWindow, x, y);
9488fca10677 Dummy video driver works again in high color video modes. Yay! Sam Lantinga <slouken@libsdl.org> parents: 1678 diff changeset	670 }
9488fca10677 Dummy video driver works again in high color video modes. Yay! Sam Lantinga <slouken@libsdl.org> parents: 1678 diff changeset	671
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	672 Uint8
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	673 SDL_GetAppState(void)
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	674 {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	675 Uint8 state = 0;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	676 Uint32 flags = 0;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	677
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	678 flags = SDL_GetWindowFlags(SDL_VideoWindow);
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	679 if ((flags & SDL_WINDOW_SHOWN) && !(flags & SDL_WINDOW_MINIMIZED)) {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	680 state \|= SDL_APPACTIVE;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	681 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	682 if (flags & SDL_WINDOW_KEYBOARD_FOCUS) {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	683 state \|= SDL_APPINPUTFOCUS;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	684 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	685 if (flags & SDL_WINDOW_MOUSE_FOCUS) {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	686 state \|= SDL_APPMOUSEFOCUS;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	687 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	688 return state;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	689 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	690
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	691 const SDL_version *
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	692 SDL_Linked_Version(void)
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	693 {
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	694 static SDL_version version;
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	695 SDL_VERSION(&version);
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	696 return &version;
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	697 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	698
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	699 int
1682 7ae8018b2e5d Default palette entries to white, instead of black. Sam Lantinga <slouken@libsdl.org> parents: 1681 diff changeset	700 SDL_SetPalette(SDL_Surface * surface, int flags, const SDL_Color * colors,
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	701 int firstcolor, int ncolors)
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	702 {
1720 a1ebb17f9c52 Cleaned up a bunch of warnings, started adding Win32 event support Sam Lantinga <slouken@libsdl.org> parents: 1716 diff changeset	703 return SDL_SetColors(surface, colors, firstcolor, ncolors);
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	704 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	705
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	706 int
1683 396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	707 SDL_SetColors(SDL_Surface * surface, const SDL_Color * colors, int firstcolor,
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	708 int ncolors)
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	709 {
1683 396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	710 if (SDL_SetPaletteColors
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	711 (surface->format->palette, colors, firstcolor, ncolors) == 0) {
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	712 return 1;
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	713 } else {
396a35389351 Finished palettized display handling. Sam Lantinga <slouken@libsdl.org> parents: 1682 diff changeset	714 return 0;
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	715 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	716 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	717
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	718 int
1668 4da1ee79c9af more tweaking indent options Sam Lantinga <slouken@libsdl.org> parents: 1667 diff changeset	719 SDL_GetWMInfo(SDL_SysWMinfo * info)
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	720 {
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	721 return SDL_GetWindowWMInfo(SDL_VideoWindow, info);
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	722 }
1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	723
1678 90bf530ced8e SDL_SetVideoMode() compiles now... Sam Lantinga <slouken@libsdl.org> parents: 1675 diff changeset	724 #if 0
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	725 void
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	726 SDL_MoveCursor(int x, int y)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	727 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	728 SDL_VideoDevice *_this = SDL_GetVideoDevice();
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	729
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	730 /* Erase and update the current mouse position */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	731 if (SHOULD_DRAWCURSOR(SDL_cursorstate)) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	732 /* Erase and redraw mouse cursor in new position */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	733 SDL_LockCursor();
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	734 SDL_EraseCursor(SDL_VideoSurface);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	735 SDL_cursor->area.x = (x - SDL_cursor->hot_x);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	736 SDL_cursor->area.y = (y - SDL_cursor->hot_y);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	737 SDL_DrawCursor(SDL_VideoSurface);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	738 SDL_UnlockCursor();
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	739 } else if (_this->MoveWMCursor) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	740 _this->MoveWMCursor(_this, x, y);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	741 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	742 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	743
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	744 /* Keep track of the current cursor colors */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	745 static int palette_changed = 1;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	746 static Uint8 pixels8[2];
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	747
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	748 void
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	749 SDL_CursorPaletteChanged(void)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	750 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	751 palette_changed = 1;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	752 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	753
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	754 void
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	755 SDL_MouseRect(SDL_Rect * area)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	756 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	757 SDL_VideoDevice *_this = SDL_GetVideoDevice();
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	758 int clip_diff;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	759
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	760 *area = SDL_cursor->area;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	761 if (area->x < 0) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	762 area->w += area->x;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	763 area->x = 0;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	764 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	765 if (area->y < 0) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	766 area->h += area->y;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	767 area->y = 0;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	768 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	769 clip_diff = (area->x + area->w) - SDL_VideoSurface->w;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	770 if (clip_diff > 0) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	771 area->w = area->w < clip_diff ? 0 : area->w - clip_diff;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	772 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	773 clip_diff = (area->y + area->h) - SDL_VideoSurface->h;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	774 if (clip_diff > 0) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	775 area->h = area->h < clip_diff ? 0 : area->h - clip_diff;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	776 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	777 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	778
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	779 static void
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	780 SDL_DrawCursorFast(SDL_Surface * screen, SDL_Rect * area)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	781 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	782 const Uint32 pixels[2] = { 0xFFFFFFFF, 0x00000000 };
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	783 int i, w, h;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	784 Uint8 *data, datab;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	785 Uint8 *mask, maskb;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	786
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	787 data = SDL_cursor->data + area->y * SDL_cursor->area.w / 8;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	788 mask = SDL_cursor->mask + area->y * SDL_cursor->area.w / 8;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	789 switch (screen->format->BytesPerPixel) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	790
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	791 case 1:
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	792 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	793 Uint8 *dst;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	794 int dstskip;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	795
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	796 if (palette_changed) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	797 pixels8[0] =
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	798 (Uint8) SDL_MapRGB(screen->format, 255, 255, 255);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	799 pixels8[1] = (Uint8) SDL_MapRGB(screen->format, 0, 0, 0);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	800 palette_changed = 0;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	801 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	802 dst = (Uint8 *) screen->pixels +
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	803 (SDL_cursor->area.y + area->y) * screen->pitch +
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	804 SDL_cursor->area.x;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	805 dstskip = screen->pitch - area->w;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	806
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	807 for (h = area->h; h; h--) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	808 for (w = area->w / 8; w; w--) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	809 maskb = *mask++;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	810 datab = *data++;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	811 for (i = 0; i < 8; ++i) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	812 if (maskb & 0x80) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	813 *dst = pixels8[datab >> 7];
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	814 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	815 maskb <<= 1;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	816 datab <<= 1;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	817 dst++;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	818 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	819 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	820 dst += dstskip;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	821 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	822 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	823 break;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	824
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	825 case 2:
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	826 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	827 Uint16 *dst;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	828 int dstskip;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	829
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	830 dst = (Uint16 *) screen->pixels +
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	831 (SDL_cursor->area.y + area->y) * screen->pitch / 2 +
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	832 SDL_cursor->area.x;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	833 dstskip = (screen->pitch / 2) - area->w;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	834
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	835 for (h = area->h; h; h--) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	836 for (w = area->w / 8; w; w--) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	837 maskb = *mask++;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	838 datab = *data++;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	839 for (i = 0; i < 8; ++i) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	840 if (maskb & 0x80) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	841 *dst = (Uint16) pixels[datab >> 7];
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	842 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	843 maskb <<= 1;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	844 datab <<= 1;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	845 dst++;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	846 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	847 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	848 dst += dstskip;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	849 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	850 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	851 break;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	852
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	853 case 3:
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	854 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	855 Uint8 *dst;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	856 int dstskip;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	857
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	858 dst = (Uint8 *) screen->pixels +
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	859 (SDL_cursor->area.y + area->y) * screen->pitch +
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	860 SDL_cursor->area.x * 3;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	861 dstskip = screen->pitch - area->w * 3;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	862
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	863 for (h = area->h; h; h--) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	864 for (w = area->w / 8; w; w--) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	865 maskb = *mask++;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	866 datab = *data++;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	867 for (i = 0; i < 8; ++i) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	868 if (maskb & 0x80) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	869 SDL_memset(dst, pixels[datab >> 7], 3);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	870 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	871 maskb <<= 1;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	872 datab <<= 1;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	873 dst += 3;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	874 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	875 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	876 dst += dstskip;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	877 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	878 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	879 break;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	880
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	881 case 4:
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	882 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	883 Uint32 *dst;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	884 int dstskip;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	885
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	886 dst = (Uint32 *) screen->pixels +
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	887 (SDL_cursor->area.y + area->y) * screen->pitch / 4 +
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	888 SDL_cursor->area.x;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	889 dstskip = (screen->pitch / 4) - area->w;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	890
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	891 for (h = area->h; h; h--) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	892 for (w = area->w / 8; w; w--) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	893 maskb = *mask++;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	894 datab = *data++;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	895 for (i = 0; i < 8; ++i) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	896 if (maskb & 0x80) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	897 *dst = pixels[datab >> 7];
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	898 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	899 maskb <<= 1;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	900 datab <<= 1;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	901 dst++;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	902 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	903 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	904 dst += dstskip;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	905 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	906 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	907 break;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	908 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	909 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	910
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	911 static void
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	912 SDL_DrawCursorSlow(SDL_Surface * screen, SDL_Rect * area)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	913 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	914 const Uint32 pixels[2] = { 0xFFFFFF, 0x000000 };
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	915 int h;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	916 int x, minx, maxx;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	917 Uint8 *data, datab = 0;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	918 Uint8 *mask, maskb = 0;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	919 Uint8 *dst;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	920 int dstbpp, dstskip;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	921
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	922 data = SDL_cursor->data + area->y * SDL_cursor->area.w / 8;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	923 mask = SDL_cursor->mask + area->y * SDL_cursor->area.w / 8;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	924 dstbpp = screen->format->BytesPerPixel;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	925 dst = (Uint8 *) screen->pixels +
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	926 (SDL_cursor->area.y + area->y) * screen->pitch +
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	927 SDL_cursor->area.x * dstbpp;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	928 dstskip = screen->pitch - SDL_cursor->area.w * dstbpp;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	929
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	930 minx = area->x;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	931 maxx = area->x + area->w;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	932 if (screen->format->BytesPerPixel == 1) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	933 if (palette_changed) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	934 pixels8[0] = (Uint8) SDL_MapRGB(screen->format, 255, 255, 255);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	935 pixels8[1] = (Uint8) SDL_MapRGB(screen->format, 0, 0, 0);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	936 palette_changed = 0;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	937 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	938 for (h = area->h; h; h--) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	939 for (x = 0; x < SDL_cursor->area.w; ++x) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	940 if ((x % 8) == 0) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	941 maskb = *mask++;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	942 datab = *data++;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	943 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	944 if ((x >= minx) && (x < maxx)) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	945 if (maskb & 0x80) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	946 SDL_memset(dst, pixels8[datab >> 7], dstbpp);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	947 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	948 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	949 maskb <<= 1;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	950 datab <<= 1;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	951 dst += dstbpp;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	952 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	953 dst += dstskip;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	954 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	955 } else {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	956 for (h = area->h; h; h--) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	957 for (x = 0; x < SDL_cursor->area.w; ++x) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	958 if ((x % 8) == 0) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	959 maskb = *mask++;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	960 datab = *data++;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	961 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	962 if ((x >= minx) && (x < maxx)) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	963 if (maskb & 0x80) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	964 SDL_memset(dst, pixels[datab >> 7], dstbpp);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	965 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	966 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	967 maskb <<= 1;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	968 datab <<= 1;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	969 dst += dstbpp;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	970 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	971 dst += dstskip;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	972 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	973 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	974 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	975
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	976 /* This handles the ugly work of converting the saved cursor background from
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	977 the pixel format of the shadow surface to that of the video surface.
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	978 This is only necessary when blitting from a shadow surface of a different
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	979 pixel format than the video surface, and using a software rendered cursor.
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	980 */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	981 static void
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	982 SDL_ConvertCursorSave(SDL_Surface * screen, int w, int h)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	983 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	984 SDL_VideoDevice *_this = SDL_GetVideoDevice();
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	985 SDL_BlitInfo info;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	986 SDL_loblit RunBlit;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	987
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	988 /* Make sure we can steal the blit mapping */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	989 if (screen->map->dst != SDL_VideoSurface) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	990 return;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	991 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	992
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	993 /* Set up the blit information */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	994 info.s_pixels = SDL_cursor->save[1];
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	995 info.s_width = w;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	996 info.s_height = h;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	997 info.s_skip = 0;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	998 info.d_pixels = SDL_cursor->save[0];
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	999 info.d_width = w;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1000 info.d_height = h;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1001 info.d_skip = 0;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1002 info.aux_data = screen->map->sw_data->aux_data;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1003 info.src = screen->format;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1004 info.table = screen->map->table;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1005 info.dst = SDL_VideoSurface->format;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1006 RunBlit = screen->map->sw_data->blit;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1007
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1008 /* Run the actual software blit */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1009 RunBlit(&info);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1010 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1011
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1012 void
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1013 SDL_DrawCursorNoLock(SDL_Surface * screen)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1014 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1015 SDL_VideoDevice *_this = SDL_GetVideoDevice();
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1016 SDL_Rect area;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1017
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1018 /* Get the mouse rectangle, clipped to the screen */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1019 SDL_MouseRect(&area);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1020 if ((area.w == 0) \|\| (area.h == 0)) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1021 return;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1022 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1023
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1024 /* Copy mouse background */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1025 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1026 int w, h, screenbpp;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1027 Uint8 src, dst;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1028
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1029 /* Set up the copy pointers */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1030 screenbpp = screen->format->BytesPerPixel;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1031 if ((screen == SDL_VideoSurface) \|\|
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1032 FORMAT_EQUAL(screen->format, SDL_VideoSurface->format)) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1033 dst = SDL_cursor->save[0];
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1034 } else {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1035 dst = SDL_cursor->save[1];
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1036 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1037 src = (Uint8 ) screen->pixels + area.y screen->pitch +
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1038 area.x * screenbpp;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1039
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1040 /* Perform the copy */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1041 w = area.w * screenbpp;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1042 h = area.h;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1043 while (h--) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1044 SDL_memcpy(dst, src, w);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1045 dst += w;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1046 src += screen->pitch;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1047 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1048 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1049
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1050 /* Draw the mouse cursor */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1051 area.x -= SDL_cursor->area.x;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1052 area.y -= SDL_cursor->area.y;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1053 if ((area.x == 0) && (area.w == SDL_cursor->area.w)) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1054 SDL_DrawCursorFast(screen, &area);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1055 } else {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1056 SDL_DrawCursorSlow(screen, &area);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1057 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1058 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1059
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1060 void
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1061 SDL_DrawCursor(SDL_Surface * screen)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1062 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1063 /* Lock the screen if necessary */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1064 if (screen == NULL) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1065 return;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1066 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1067 if (SDL_MUSTLOCK(screen)) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1068 if (SDL_LockSurface(screen) < 0) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1069 return;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1070 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1071 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1072
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1073 SDL_DrawCursorNoLock(screen);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1074
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1075 /* Unlock the screen and update if necessary */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1076 if (SDL_MUSTLOCK(screen)) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1077 SDL_UnlockSurface(screen);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1078 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1079 if ((screen->flags & SDL_SCREEN_SURFACE) &&
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1080 !(screen->flags & SDL_HWSURFACE)) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1081 SDL_VideoDevice *_this = SDL_GetVideoDevice();
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1082 SDL_Window *window;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1083 SDL_Rect area;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1084
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1085 window = SDL_GetWindowFromSurface(screen);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1086 if (!window) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1087 return;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1088 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1089
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1090 SDL_MouseRect(&area);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1091
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1092 if (_this->UpdateWindowSurface) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1093 _this->UpdateWindowSurface(_this, window, 1, &area);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1094 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1095 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1096 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1097
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1098 void
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1099 SDL_EraseCursorNoLock(SDL_Surface * screen)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1100 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1101 SDL_VideoDevice *_this = SDL_GetVideoDevice();
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1102 SDL_Window *window;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1103 SDL_Rect area;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1104
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1105 /* Get the window associated with the surface */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1106 window = SDL_GetWindowFromSurface(screen);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1107 if (!window \|\| !window->surface) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1108 return;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1109 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1110
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1111 /* Get the mouse rectangle, clipped to the screen */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1112 SDL_MouseRect(&area);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1113 if ((area.w == 0) \|\| (area.h == 0)) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1114 return;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1115 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1116
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1117 /* Copy mouse background */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1118 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1119 int w, h, screenbpp;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1120 Uint8 src, dst;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1121
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1122 /* Set up the copy pointers */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1123 screenbpp = screen->format->BytesPerPixel;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1124 if ((screen->flags & SDL_SCREEN_SURFACE) \|\|
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1125 FORMAT_EQUAL(screen->format, window->surface->format)) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1126 src = SDL_cursor->save[0];
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1127 } else {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1128 src = SDL_cursor->save[1];
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1129 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1130 dst = (Uint8 ) screen->pixels + area.y screen->pitch +
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1131 area.x * screenbpp;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1132
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1133 /* Perform the copy */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1134 w = area.w * screenbpp;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1135 h = area.h;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1136 while (h--) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1137 SDL_memcpy(dst, src, w);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1138 src += w;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1139 dst += screen->pitch;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1140 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1141
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1142 /* Perform pixel conversion on cursor background */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1143 if (src > SDL_cursor->save[1]) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1144 SDL_ConvertCursorSave(screen, area.w, area.h);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1145 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1146 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1147 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1148
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1149 void
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1150 SDL_EraseCursor(SDL_Surface * screen)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1151 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1152 /* Lock the screen if necessary */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1153 if (screen == NULL) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1154 return;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1155 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1156 if (SDL_MUSTLOCK(screen)) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1157 if (SDL_LockSurface(screen) < 0) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1158 return;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1159 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1160 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1161
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1162 SDL_EraseCursorNoLock(screen);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1163
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1164 /* Unlock the screen and update if necessary */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1165 if (SDL_MUSTLOCK(screen)) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1166 SDL_UnlockSurface(screen);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1167 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1168 if ((screen->flags & SDL_SCREEN_SURFACE) &&
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1169 !(screen->flags & SDL_HWSURFACE)) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1170 SDL_VideoDevice *_this = SDL_GetVideoDevice();
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1171 SDL_Window *window;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1172 SDL_Rect area;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1173
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1174 window = SDL_GetWindowFromSurface(screen);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1175 if (!window) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1176 return;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1177 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1178
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1179 SDL_MouseRect(&area);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1180
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1181 if (_this->UpdateWindowSurface) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1182 _this->UpdateWindowSurface(_this, window, 1, &area);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1183 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1184 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1185 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1186
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1187 /* Reset the cursor on video mode change
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1188 FIXME: Keep track of all cursors, and reset them all.
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1189 */
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1190 void
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1191 SDL_ResetCursor(void)
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1192 {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1193 int savelen;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1194
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1195 if (SDL_cursor) {
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1196 savelen = SDL_cursor->area.w * 4 * SDL_cursor->area.h;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1197 SDL_cursor->area.x = 0;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1198 SDL_cursor->area.y = 0;
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1199 SDL_memset(SDL_cursor->save[0], 0, savelen);
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1200 }
eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1201 }
1684 c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1202 #endif
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1203
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1204 struct private_yuvhwdata
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1205 {
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1206 Uint16 pitches[3];
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1207 Uint8 *planes[3];
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1208
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1209 SDL_TextureID textureID;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1210 };
1670 eef792d31de8 Work in progress. :) Sam Lantinga <slouken@libsdl.org> parents: 1669 diff changeset	1211
1675 d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1212 SDL_Overlay *
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1213 SDL_CreateYUVOverlay(int w, int h, Uint32 format, SDL_Surface * display)
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1214 {
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1215 SDL_Overlay *overlay;
1684 c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1216 Uint32 texture_format;
1675 d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1217
1684 c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1218 if ((display->flags & SDL_OPENGL) == SDL_OPENGL) {
1675 d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1219 SDL_SetError("YUV overlays are not supported in OpenGL mode");
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1220 return NULL;
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1221 }
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1222
1684 c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1223 if (display != SDL_PublicSurface) {
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1224 SDL_SetError("YUV display is only supported on the screen surface");
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1225 return NULL;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1226 }
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1227
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1228 switch (format) {
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1229 case SDL_YV12_OVERLAY:
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1230 texture_format = SDL_PixelFormat_YV12;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1231 break;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1232 case SDL_IYUV_OVERLAY:
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1233 texture_format = SDL_PixelFormat_IYUV;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1234 break;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1235 case SDL_YUY2_OVERLAY:
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1236 texture_format = SDL_PixelFormat_YUY2;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1237 break;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1238 case SDL_UYVY_OVERLAY:
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1239 texture_format = SDL_PixelFormat_UYVY;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1240 break;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1241 case SDL_YVYU_OVERLAY:
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1242 texture_format = SDL_PixelFormat_YVYU;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1243 break;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1244 default:
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1245 SDL_SetError("Unknown YUV format");
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1246 return NULL;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1247 }
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1248
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1249 overlay = (SDL_Overlay ) SDL_malloc(sizeof(overlay));
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1250 if (!overlay) {
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1251 SDL_OutOfMemory();
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1252 return NULL;
1675 d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1253 }
1684 c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1254 SDL_zerop(overlay);
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1255
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1256 overlay->hwdata =
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1257 (struct private_yuvhwdata ) SDL_malloc(sizeof(overlay->hwdata));
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1258 if (!overlay->hwdata) {
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1259 SDL_free(overlay);
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1260 SDL_OutOfMemory();
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1261 return NULL;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1262 }
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1263
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1264 overlay->format = format;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1265 overlay->w = w;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1266 overlay->h = h;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1267 if (format == SDL_YV12_OVERLAY \|\| format == SDL_IYUV_OVERLAY) {
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1268 overlay->planes = 3;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1269 } else {
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1270 overlay->planes = 1;
1675 d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1271 }
1684 c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1272 overlay->pitches = overlay->hwdata->pitches;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1273 overlay->pixels = overlay->hwdata->planes;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1274
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1275 switch (format) {
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1276 case SDL_YV12_OVERLAY:
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1277 case SDL_IYUV_OVERLAY:
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1278 overlay->pitches[0] = overlay->w;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1279 overlay->pitches[1] = overlay->w / 2;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1280 overlay->pitches[2] = overlay->w / 2;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1281 break;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1282 case SDL_YUY2_OVERLAY:
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1283 case SDL_UYVY_OVERLAY:
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1284 case SDL_YVYU_OVERLAY:
1685 66267c6a0b12 Fixed YUV overlay crash Sam Lantinga <slouken@libsdl.org> parents: 1684 diff changeset	1285 overlay->pitches[0] = overlay->w * 2;
1684 c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1286 break;
1675 d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1287 }
1684 c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1288
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1289 overlay->hwdata->textureID =
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1290 SDL_CreateTexture(texture_format, SDL_TextureAccess_Local, w, h);
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1291 if (!overlay->hwdata->textureID) {
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1292 SDL_FreeYUVOverlay(overlay);
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1293 return NULL;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1294 }
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1295
1675 d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1296 return overlay;
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1297 }
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1298
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1299 int
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1300 SDL_LockYUVOverlay(SDL_Overlay * overlay)
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1301 {
1684 c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1302 void *pixels;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1303 int pitch;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1304 if (SDL_LockTexture(overlay->hwdata->textureID, NULL, 1, &pixels, &pitch)
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1305 < 0) {
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1306 return -1;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1307 }
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1308 switch (overlay->format) {
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1309 case SDL_YV12_OVERLAY:
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1310 case SDL_IYUV_OVERLAY:
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1311 overlay->pixels[0] = (Uint8 *) pixels;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1312 overlay->pixels[1] =
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1313 overlay->pixels[0] + overlay->pitches[0] * overlay->h;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1314 overlay->pixels[2] =
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1315 overlay->pixels[1] + overlay->pitches[1] * overlay->h;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1316 break;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1317 case SDL_YUY2_OVERLAY:
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1318 case SDL_UYVY_OVERLAY:
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1319 case SDL_YVYU_OVERLAY:
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1320 overlay->pixels[0] = (Uint8 *) pixels;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1321 break;
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1322 }
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1323 return 0;
1675 d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1324 }
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1325
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1326 void
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1327 SDL_UnlockYUVOverlay(SDL_Overlay * overlay)
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1328 {
1684 c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1329 SDL_UnlockTexture(overlay->hwdata->textureID);
1675 d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1330 }
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1331
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1332 int
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1333 SDL_DisplayYUVOverlay(SDL_Overlay * overlay, SDL_Rect * dstrect)
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1334 {
1684 c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1335 if (SDL_RenderCopy(overlay->hwdata->textureID, NULL, dstrect,
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1336 SDL_TextureBlendMode_None,
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1337 SDL_TextureScaleMode_Fast) < 0) {
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1338 return -1;
1675 d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1339 }
1684 c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1340 SDL_RenderPresent();
1720 a1ebb17f9c52 Cleaned up a bunch of warnings, started adding Win32 event support Sam Lantinga <slouken@libsdl.org> parents: 1716 diff changeset	1341 return 0;
1675 d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1342 }
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1343
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1344 void
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1345 SDL_FreeYUVOverlay(SDL_Overlay * overlay)
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1346 {
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1347 if (overlay) {
1684 c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1348 if (overlay->hwdata) {
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1349 if (overlay->hwdata->textureID) {
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1350 SDL_DestroyTexture(overlay->hwdata->textureID);
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1351 }
c4aa1a2f48f1 Software YUV texture support in progress... Sam Lantinga <slouken@libsdl.org> parents: 1683 diff changeset	1352 SDL_free(overlay->hwdata);
1675 d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1353 }
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1354 SDL_free(overlay);
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1355 }
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1356 }
d33dcfc3fde7 Overlay functions are being replaced by YUV textures. Sam Lantinga <slouken@libsdl.org> parents: 1670 diff changeset	1357
1667 1fddae038bc8 Implemented many compatibility functions Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1358 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/SDL_compat.c @ 1722:5daa04d862f1 SDL-1.3