sdl-ios-xcode: src/video/x11/SDL

annotate src/video/x11/SDL_x11gamma.c @ 2884:9dde605c7540

Date: Fri, 19 Dec 2008 20:17:35 +0100 From: Couriersud Subject: Re: Aw: Experience using SDL1.3 in sdlmame/Proposal for api additions > For consistency you'd probably want: > SDL_SetRenderDrawColor(Uint8 r, Uint8 g, Uint8 b, Uint8 a); > SDL_SetRenderDrawBlendMode(SDL_BlendMode blendMode); > SDL_RenderLine(int x1, int y1, int x2, int y2); > SDL_RenderFill(SDL_Rect *rect); > > You probably also want to add API functions query the current state. > I have implemented the above api for the opengl, x11, directfb and software renderers. I have also renamed *TEXTUREBLENDMODE* constants to BLENDMODE*. The unix build compiles. The windows renderer still needs to be updated, but I have no windows development machine at hand. Have a look at the x11 renderer for a sample. Vector games now run at 90% both on opengl and directfb in comparison to sdlmame's own opengl renderer. The same applies to raster games. The diff also includes a) Changed XDrawRect to XFillRect in x11 renderer b) A number of changes to fix blending and modulation issues in the directfb renderer.

author	Sam Lantinga <slouken@libsdl.org>
date	Sat, 20 Dec 2008 12:00:00 +0000
parents	99210400e8b9
children	a6694a812119

rev	line source
2162 1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	1 /*
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	2 SDL - Simple DirectMedia Layer
2859 99210400e8b9 Updated copyright date Sam Lantinga <slouken@libsdl.org> parents: 2221 diff changeset	3 Copyright (C) 1997-2009 Sam Lantinga
2162 1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	4
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	5 This library is free software; you can redistribute it and/or
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	7 License as published by the Free Software Foundation; either
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	9
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	13 Lesser General Public License for more details.
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	14
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	16 License along with this library; if not, write to the Free Software
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	18
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	19 Sam Lantinga
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	20 slouken@libsdl.org
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	21 */
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	22 #include "SDL_config.h"
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	23 #include "../SDL_sysvideo.h"
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	24 #include "SDL_x11video.h"
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	25
2213 59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	26 static int numCmaps = 0;
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	27
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	28 typedef struct
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	29 {
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	30 Display *display;
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	31 int scrNum;
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	32 Colormap colormap;
2213 59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	33 XStandardColormap cmap;
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	34 Visual visual;
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	35 } cmapTableEntry;
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	36
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	37 cmapTableEntry *cmapTable = NULL;
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	38
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	39 /* To reduce the overhead as much as possible lets do as little as
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	40 possible. When we do have to create a colormap keep track of it and
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	41 reuse it. We're going to do this for both DirectColor and
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	42 PseudoColor colormaps. */
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	43
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	44 Colormap
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	45 X11_LookupColormap(Display * display, int scrNum, VisualID vid)
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	46 {
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	47 int i;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	48
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	49 for (i = 0; i < numCmaps; i++) {
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	50 if (cmapTable[i].display == display &&
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	51 cmapTable[i].scrNum == scrNum &&
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	52 cmapTable[i].cmap.visualid == vid) {
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	53 return cmapTable[i].cmap.colormap;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	54 }
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	55 }
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	56
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	57 return 0;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	58 }
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	59
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	60
2213 59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	61 void
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	62 X11_TrackColormap(Display * display, int scrNum, Colormap colormap,
2213 59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	63 XStandardColormap * cmap, Visual * visual)
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	64 {
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	65 int i;
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	66
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	67 /* search the table to find out if we already have this one. We
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	68 only want one entry for each display, screen number, visualid,
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	69 and colormap combination */
2213 59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	70 for (i = 0; i < numCmaps; i++) {
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	71 if (cmapTable[i].display == display &&
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	72 cmapTable[i].scrNum == scrNum &&
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	73 cmapTable[i].cmap.visualid == cmap->visualid &&
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	74 cmapTable[i].cmap.colormap == colormap) {
2213 59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	75 return;
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	76 }
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	77 }
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	78
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	79 /* increase the table by one entry. If the table is NULL create the
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	80 first entrty */
2221 1d75c38e1e5c indent Sam Lantinga <slouken@libsdl.org> parents: 2216 diff changeset	81 cmapTable =
1d75c38e1e5c indent Sam Lantinga <slouken@libsdl.org> parents: 2216 diff changeset	82 SDL_realloc(cmapTable, (numCmaps + 1) * sizeof(cmapTableEntry));
2216 82a133b784c9 changed to use SDL_realloc() Bob Pendleton <bob@pendleton.com> parents: 2214 diff changeset	83 if (NULL == cmapTable) {
2213 59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	84 SDL_SetError("Out of memory in X11_TrackColormap()");
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	85 return;
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	86 }
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	87
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	88 cmapTable[numCmaps].display = display;
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	89 cmapTable[numCmaps].scrNum = scrNum;
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	90 cmapTable[numCmaps].colormap = colormap;
2213 59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	91 SDL_memcpy(&cmapTable[numCmaps].cmap, cmap, sizeof(XStandardColormap));
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	92 SDL_memcpy(&cmapTable[numCmaps].visual, visual, sizeof(Visual));
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	93
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	94 numCmaps++;
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	95 }
59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	96
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	97 /* The problem is that you have to have at least one DirectColor
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	98 colormap before you can set the gamma ramps or read the gamma
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	99 ramps. If the application has created a DirectColor window then the
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	100 cmapTable will have at least one colormap in it and everything is
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	101 cool. If not, then we just fail */
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	102
2162 1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	103 int
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	104 X11_SetDisplayGammaRamp(_THIS, Uint16 * ramp)
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	105 {
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	106 Display *display;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	107 Colormap colormap;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	108 XColor *colorcells;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	109 int ncolors;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	110 int i;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	111 int j;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	112
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	113 int rmax, gmax, bmax;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	114 int rmul, gmul, bmul;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	115
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	116 for (j = 0; j < numCmaps; j++) {
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	117 if (cmapTable[j].visual.class == DirectColor) {
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	118 display = cmapTable[j].display;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	119 colormap = cmapTable[j].colormap;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	120 ncolors = cmapTable[j].visual.map_entries;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	121
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	122 colorcells = SDL_malloc(ncolors * sizeof(XColor));
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	123 if (NULL == colorcells) {
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	124 SDL_SetError("out of memory in X11_SetDisplayGammaRamp");
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	125 return -1;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	126 }
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	127
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	128 rmax = cmapTable[j].cmap.red_max + 1;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	129 gmax = cmapTable[j].cmap.blue_max + 1;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	130 bmax = cmapTable[j].cmap.green_max + 1;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	131
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	132 rmul = cmapTable[j].cmap.red_mult;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	133 gmul = cmapTable[j].cmap.blue_mult;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	134 bmul = cmapTable[j].cmap.green_mult;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	135
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	136 /* build the color table pixel values */
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	137 for (i = 0; i < ncolors; i++) {
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	138 Uint32 red = (rmax * i) / ncolors;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	139 Uint32 green = (gmax * i) / ncolors;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	140 Uint32 blue = (bmax * i) / ncolors;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	141
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	142 colorcells[i].pixel =
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	143 (red * rmul) \| (green * gmul) \| (blue * bmul);
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	144 colorcells[i].flags = DoRed \| DoGreen \| DoBlue;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	145
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	146 colorcells[i].red = ramp[(0 * 256) + i];
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	147 colorcells[i].green = ramp[(1 * 256) + i];
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	148 colorcells[i].blue = ramp[(2 * 256) + i];
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	149 }
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	150
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	151 XStoreColors(display, colormap, colorcells, ncolors);
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	152 XFlush(display);
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	153 SDL_free(colorcells);
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	154 }
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	155 }
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	156
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	157 return 0;
2162 1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	158 }
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	159
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	160 int
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	161 X11_GetDisplayGammaRamp(_THIS, Uint16 * ramp)
1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	162 {
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	163 Display *display;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	164 Colormap colormap;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	165 XColor *colorcells;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	166 int ncolors;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	167 int dc;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	168 int i;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	169
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	170 int rmax, gmax, bmax;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	171 int rmul, gmul, bmul;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	172
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	173 /* find the first DirectColor colormap and use it to get the gamma
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	174 ramp */
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	175
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	176 dc = -1;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	177 for (i = 0; i < numCmaps; i++) {
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	178 if (cmapTable[i].visual.class == DirectColor) {
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	179 dc = i;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	180 break;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	181 }
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	182 }
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	183
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	184 if (dc < 0) {
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	185 return -1;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	186 }
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	187
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	188 /* there is at least one DirectColor colormap in the cmapTable,
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	189 let's just get the entries from that colormap */
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	190
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	191 display = cmapTable[dc].display;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	192 colormap = cmapTable[dc].colormap;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	193 ncolors = cmapTable[dc].visual.map_entries;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	194 colorcells = SDL_malloc(ncolors * sizeof(XColor));
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	195 if (NULL == colorcells) {
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	196 SDL_SetError("out of memory in X11_GetDisplayGammaRamp");
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	197 return -1;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	198 }
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	199
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	200 rmax = cmapTable[dc].cmap.red_max + 1;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	201 gmax = cmapTable[dc].cmap.blue_max + 1;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	202 bmax = cmapTable[dc].cmap.green_max + 1;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	203
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	204 rmul = cmapTable[dc].cmap.red_mult;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	205 gmul = cmapTable[dc].cmap.blue_mult;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	206 bmul = cmapTable[dc].cmap.green_mult;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	207
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	208 /* build the color table pixel values */
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	209 for (i = 0; i < ncolors; i++) {
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	210 Uint32 red = (rmax * i) / ncolors;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	211 Uint32 green = (gmax * i) / ncolors;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	212 Uint32 blue = (bmax * i) / ncolors;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	213
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	214 colorcells[i].pixel = (red * rmul) \| (green * gmul) \| (blue * bmul);
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	215 }
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	216
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	217 XQueryColors(display, colormap, colorcells, ncolors);
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	218
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	219 /* prepare the values to be returned. Note that SDL assumes that
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	220 gamma ramps are always 3 * 256 entries long with the red entries
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	221 in the first 256 elements, the green in the second 256 elements
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	222 and the blue in the last 256 elements */
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	223
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	224 for (i = 0; i < ncolors; i++) {
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	225 ramp[(0 * 256) + i] = colorcells[i].red;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	226 ramp[(1 * 256) + i] = colorcells[i].green;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	227 ramp[(2 * 256) + i] = colorcells[i].blue;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	228 }
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	229
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	230 SDL_free(colorcells);
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	231 return 0;
2162 1d23870d8c49 Added stubs for x11 gamma functions and enabled them in SDL_x11video.c Bob Pendleton <bob@pendleton.com> parents: diff changeset	232 }

Mercurial > sdl-ios-xcode

annotate src/video/x11/SDL_x11gamma.c @ 2884:9dde605c7540