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

annotate src/video/x11/SDL_x11modes.c @ 4590:1ad70fb49fcb

Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Fixes involved: 1. Fix handling of alpha channel when SDL_BLENDMODE_NONE is set. 2. Make xrendercolor use floating-point values for color channels and then convert to 16 bit ints. 3. Fix handling of visuals in SDL_x11modes.c so that a 32 bit ARGB visual is used. 4. Fix the background pixel value in SDL_x11window.c so that the window background has an alpha value of 0xFF and not 0.

author	Sunny Sachanandani <sunnysachanandani@gmail.com>
date	Fri, 09 Jul 2010 21:36:41 +0530
parents	f7b03b6838cb
children	1e998db9b597

rev	line source
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
3697 f7b03b6838cb Fixed bug #926 Sam Lantinga <slouken@libsdl.org> parents: 3521 diff changeset	3 Copyright (C) 1997-2010 Sam Lantinga
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 Lesser General Public License for more details.
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 License along with this library; if not, write to the Free Software
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 Sam Lantinga
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 slouken@libsdl.org
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 */
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	22 #include "SDL_config.h"
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	24 #include "SDL_x11video.h"
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	25
4590 1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	26 #define X11MODES_DEBUG
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	27 #undef SDL_VIDEO_DRIVER_X11_XINERAMA
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	28 #undef SDL_VIDEO_DRIVER_X11_XRANDR
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	29 #undef SDL_VIDEO_DRIVER_X11_VIDMODE
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	30
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	31 static int
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	32 get_visualinfo(Display * display, int screen, XVisualInfo * vinfo)
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	33 {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	34 const char *visual_id = SDL_getenv("SDL_VIDEO_X11_VISUALID");
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	35 int depth;
4590 1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	36 XVisualInfo *vi;
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	37 int nvis;
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	38
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	39 /* Look for an exact visual, if requested */
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	40 if (visual_id) {
4590 1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	41 XVisualInfo template;
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	42
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	43 SDL_zero(template);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	44 template.visualid = SDL_strtol(visual_id, NULL, 0);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	45 vi = XGetVisualInfo(display, VisualIDMask, &template, &nvis);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	46 if (vi) {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	47 vinfo = vi;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	48 XFree(vi);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	49 return 0;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	50 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	51 }
4590 1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	52 #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	53 depth = 32;
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	54 long vinfo_mask;
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	55 XVisualInfo vinfo_templ;
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	56 vinfo_mask = (VisualDepthMask \| VisualRedMaskMask \| VisualGreenMaskMask \| VisualBlueMaskMask);
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	57 vinfo_templ.depth = 32;
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	58 vinfo_templ.red_mask = 0xFF0000;
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	59 vinfo_templ.green_mask = 0xFF00;
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	60 vinfo_templ.blue_mask = 0xFF;
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	61 vi = XGetVisualInfo(display, vinfo_mask, &vinfo_templ, &nvis);
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	62 if(vi) {
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	63 vinfo = vi;
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	64 XFree(vi);
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	65 return 0;
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	66 }
1ad70fb49fcb Fix so many things that there is little place in this column to list them all but the result is that blending modes just work now for drawing primitives. Sunny Sachanandani <sunnysachanandani@gmail.com> parents: 3697 diff changeset	67 #endif
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	68 depth = DefaultDepth(display, screen);
2963 ee331407574f Don't use DirectColor visuals until we implement DirectColor colormap support Sam Lantinga <slouken@libsdl.org> parents: 2954 diff changeset	69 if ((X11_UseDirectColorVisuals() &&
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	70 XMatchVisualInfo(display, screen, depth, DirectColor, vinfo)) \|\|
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	71 XMatchVisualInfo(display, screen, depth, TrueColor, vinfo) \|\|
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	72 XMatchVisualInfo(display, screen, depth, PseudoColor, vinfo) \|\|
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	73 XMatchVisualInfo(display, screen, depth, StaticColor, vinfo)) {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	74 return 0;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	75 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	76 return -1;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	77 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	78
2870 b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	79 static Uint32
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	80 X11_GetPixelFormatFromVisualInfo(Display * display, XVisualInfo * vinfo)
2870 b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	81 {
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	82 if (vinfo->class == DirectColor \|\| vinfo->class == TrueColor) {
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	83 int bpp;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	84 Uint32 Rmask, Gmask, Bmask, Amask;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	85
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	86 Rmask = vinfo->visual->red_mask;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	87 Gmask = vinfo->visual->green_mask;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	88 Bmask = vinfo->visual->blue_mask;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	89 if (vinfo->depth == 32) {
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	90 Amask = (0xFFFFFFFF & ~(Rmask \| Gmask \| Bmask));
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	91 } else {
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	92 Amask = 0;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	93 }
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	94
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	95 bpp = vinfo->depth;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	96 if (bpp == 24) {
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	97 int i, n;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	98 XPixmapFormatValues *p = XListPixmapFormats(display, &n);
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	99 if (p) {
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	100 for (i = 0; i < n; ++i) {
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	101 if (p[i].depth == 24) {
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	102 bpp = p[i].bits_per_pixel;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	103 break;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	104 }
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	105 }
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	106 XFree(p);
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	107 }
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	108 }
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	109
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	110 return SDL_MasksToPixelFormatEnum(bpp, Rmask, Gmask, Bmask, Amask);
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	111 }
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	112
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	113 if (vinfo->class == PseudoColor \|\| vinfo->class == StaticColor) {
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	114 switch (vinfo->depth) {
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	115 case 8:
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	116 return SDL_PIXELTYPE_INDEX8;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	117 case 4:
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	118 if (BitmapBitOrder(display) == LSBFirst) {
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	119 return SDL_PIXELFORMAT_INDEX4LSB;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	120 } else {
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	121 return SDL_PIXELFORMAT_INDEX4MSB;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	122 }
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	123 break;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	124 case 1:
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	125 if (BitmapBitOrder(display) == LSBFirst) {
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	126 return SDL_PIXELFORMAT_INDEX1LSB;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	127 } else {
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	128 return SDL_PIXELFORMAT_INDEX1MSB;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	129 }
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	130 break;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	131 }
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	132 }
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	133
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	134 return SDL_PIXELFORMAT_UNKNOWN;
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	135 }
b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	136
3521 76f9b76ddf0f Don't add any renderers if you can't add any displays Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	137 int
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	138 X11_InitModes(_THIS)
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	139 {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	140 SDL_VideoData data = (SDL_VideoData ) _this->driverdata;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	141 int screen;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	142
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	143 for (screen = 0; screen < ScreenCount(data->display); ++screen) {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	144 XVisualInfo vinfo;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	145 SDL_VideoDisplay display;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	146 SDL_DisplayData *displaydata;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	147 SDL_DisplayMode mode;
2916 ffdd533f7add Fixed pitch alignment problem causing MITSHM error on 16-bit displays Sam Lantinga <slouken@libsdl.org> parents: 2906 diff changeset	148 XPixmapFormatValues *pixmapFormats;
ffdd533f7add Fixed pitch alignment problem causing MITSHM error on 16-bit displays Sam Lantinga <slouken@libsdl.org> parents: 2906 diff changeset	149 int i, n;
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	150
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	151 if (get_visualinfo(data->display, screen, &vinfo) < 0) {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	152 continue;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	153 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	154
2870 b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	155 mode.format = X11_GetPixelFormatFromVisualInfo(data->display, &vinfo);
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	156 mode.w = DisplayWidth(data->display, screen);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	157 mode.h = DisplayHeight(data->display, screen);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	158 mode.refresh_rate = 0;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	159 mode.driverdata = NULL;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	160
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	161 displaydata = (SDL_DisplayData ) SDL_malloc(sizeof(displaydata));
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	162 if (!displaydata) {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	163 continue;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	164 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	165 displaydata->screen = screen;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	166 displaydata->visual = vinfo.visual;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1950 diff changeset	167 displaydata->depth = vinfo.depth;
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	168
2920 cdb01906cb7e indent Sam Lantinga <slouken@libsdl.org> parents: 2916 diff changeset	169 displaydata->scanline_pad = SDL_BYTESPERPIXEL(mode.format) * 8;
2916 ffdd533f7add Fixed pitch alignment problem causing MITSHM error on 16-bit displays Sam Lantinga <slouken@libsdl.org> parents: 2906 diff changeset	170 pixmapFormats = XListPixmapFormats(data->display, &n);
ffdd533f7add Fixed pitch alignment problem causing MITSHM error on 16-bit displays Sam Lantinga <slouken@libsdl.org> parents: 2906 diff changeset	171 if (pixmapFormats) {
ffdd533f7add Fixed pitch alignment problem causing MITSHM error on 16-bit displays Sam Lantinga <slouken@libsdl.org> parents: 2906 diff changeset	172 for (i = 0; i < n; ++i) {
ffdd533f7add Fixed pitch alignment problem causing MITSHM error on 16-bit displays Sam Lantinga <slouken@libsdl.org> parents: 2906 diff changeset	173 if (pixmapFormats[i].depth == displaydata->depth) {
ffdd533f7add Fixed pitch alignment problem causing MITSHM error on 16-bit displays Sam Lantinga <slouken@libsdl.org> parents: 2906 diff changeset	174 displaydata->scanline_pad = pixmapFormats[i].scanline_pad;
ffdd533f7add Fixed pitch alignment problem causing MITSHM error on 16-bit displays Sam Lantinga <slouken@libsdl.org> parents: 2906 diff changeset	175 break;
ffdd533f7add Fixed pitch alignment problem causing MITSHM error on 16-bit displays Sam Lantinga <slouken@libsdl.org> parents: 2906 diff changeset	176 }
ffdd533f7add Fixed pitch alignment problem causing MITSHM error on 16-bit displays Sam Lantinga <slouken@libsdl.org> parents: 2906 diff changeset	177 }
ffdd533f7add Fixed pitch alignment problem causing MITSHM error on 16-bit displays Sam Lantinga <slouken@libsdl.org> parents: 2906 diff changeset	178 XFree(pixmapFormats);
ffdd533f7add Fixed pitch alignment problem causing MITSHM error on 16-bit displays Sam Lantinga <slouken@libsdl.org> parents: 2906 diff changeset	179 }
ffdd533f7add Fixed pitch alignment problem causing MITSHM error on 16-bit displays Sam Lantinga <slouken@libsdl.org> parents: 2906 diff changeset	180
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	181 SDL_zero(display);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	182 display.desktop_mode = mode;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	183 display.current_mode = mode;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	184 display.driverdata = displaydata;
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	185 SDL_AddVideoDisplay(&display);
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	186 }
3521 76f9b76ddf0f Don't add any renderers if you can't add any displays Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	187 if (_this->num_displays == 0) {
76f9b76ddf0f Don't add any renderers if you can't add any displays Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	188 SDL_SetError("No available displays");
76f9b76ddf0f Don't add any renderers if you can't add any displays Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	189 return -1;
76f9b76ddf0f Don't add any renderers if you can't add any displays Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	190 }
76f9b76ddf0f Don't add any renderers if you can't add any displays Sam Lantinga <slouken@libsdl.org> parents: 3500 diff changeset	191 return 0;
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	192 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	193
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	194 /* Global for the error handler */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	195 int vm_event, vm_error = -1;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	196
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	197 #if SDL_VIDEO_DRIVER_X11_XINERAMA
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	198 static SDL_bool
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	199 CheckXinerama(Display * display, int major, int minor)
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	200 {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	201 const char *env;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	202
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	203 /* Default the extension not available */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	204 major = minor = 0;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	205
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	206 /* Allow environment override */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	207 env = getenv("SDL_VIDEO_X11_XINERAMA");
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	208 if (env && !SDL_atoi(env)) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	209 return SDL_FALSE;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	210 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	211
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	212 /* Query the extension version */
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	213 if (!SDL_NAME(XineramaQueryExtension) (display, major, minor) \|\|
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	214 !SDL_NAME(XineramaIsActive) (display)) {
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	215 return SDL_FALSE;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	216 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	217 return SDL_TRUE;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	218 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	219 #endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	220
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	221 #if SDL_VIDEO_DRIVER_X11_XRANDR
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	222 static SDL_bool
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	223 CheckXRandR(Display * display, int major, int minor)
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	224 {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	225 const char *env;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	226
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	227 /* Default the extension not available */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	228 major = minor = 0;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	229
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	230 /* Allow environment override */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	231 env = getenv("SDL_VIDEO_X11_XRANDR");
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	232 if (env && !SDL_atoi(env)) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	233 return SDL_FALSE;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	234 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	235
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	236 if (!SDL_X11_HAVE_XRANDR) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	237 return SDL_FALSE;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	238 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	239
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	240 /* Query the extension version */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	241 if (!XRRQueryVersion(display, major, minor)) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	242 return SDL_FALSE;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	243 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	244 return SDL_TRUE;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	245 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	246 #endif /* SDL_VIDEO_DRIVER_X11_XRANDR */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	247
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	248 #if SDL_VIDEO_DRIVER_X11_VIDMODE
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	249 static SDL_bool
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	250 CheckVidMode(Display * display, int major, int minor)
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	251 {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	252 const char *env;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	253
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	254 /* Default the extension not available */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	255 major = minor = 0;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	256
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	257 /* Allow environment override */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	258 env = getenv("SDL_VIDEO_X11_VIDMODE");
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	259 if (env && !SDL_atoi(env)) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	260 return SDL_FALSE;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	261 }
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	262
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	263 /* Query the extension version */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	264 vm_error = -1;
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	265 if (!SDL_NAME(XF86VidModeQueryExtension) (display, &vm_event, &vm_error)
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	266 \|\| !SDL_NAME(XF86VidModeQueryVersion) (display, major, minor)) {
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	267 return SDL_FALSE;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	268 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	269 return SDL_TRUE;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	270 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	271
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	272 Bool SDL_NAME(XF86VidModeGetModeInfo) (Display * dpy, int scr,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	273 SDL_NAME(XF86VidModeModeInfo) * info)
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	274 {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	275 Bool retval;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	276 int dotclock;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	277 SDL_NAME(XF86VidModeModeLine) l;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	278 SDL_zerop(info);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	279 SDL_zero(l);
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	280 retval = SDL_NAME(XF86VidModeGetModeLine) (dpy, scr, &dotclock, &l);
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	281 info->dotclock = dotclock;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	282 info->hdisplay = l.hdisplay;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	283 info->hsyncstart = l.hsyncstart;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	284 info->hsyncend = l.hsyncend;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	285 info->htotal = l.htotal;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	286 info->hskew = l.hskew;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	287 info->vdisplay = l.vdisplay;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	288 info->vsyncstart = l.vsyncstart;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	289 info->vsyncend = l.vsyncend;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	290 info->vtotal = l.vtotal;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	291 info->flags = l.flags;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	292 info->privsize = l.privsize;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	293 info->private = l.private;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	294 return retval;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	295 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	296
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	297 static int
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	298 calculate_rate(SDL_NAME(XF86VidModeModeInfo) * info)
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	299 {
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	300 return (info->htotal
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	301 && info->vtotal) ? (1000 * info->dotclock / (info->htotal *
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	302 info->vtotal)) : 0;
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	303 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	304
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	305 static void
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	306 save_mode(Display * display, SDL_DisplayData * data)
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	307 {
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	308 SDL_NAME(XF86VidModeGetModeInfo) (display, data->screen,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	309 &data->saved_mode);
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	310 SDL_NAME(XF86VidModeGetViewPort) (display, data->screen,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	311 &data->saved_view.x,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	312 &data->saved_view.y);
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	313 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	314
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	315 static void
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	316 restore_mode(Display * display, SDL_DisplayData * data)
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	317 {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	318 SDL_NAME(XF86VidModeModeInfo) mode;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	319
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	320 if (SDL_NAME(XF86VidModeGetModeInfo) (display, data->screen, &mode)) {
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	321 if (SDL_memcmp(&mode, &data->saved_mode, sizeof(mode)) != 0) {
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	322 SDL_NAME(XF86VidModeSwitchToMode) (display, data->screen,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	323 &data->saved_mode);
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	324 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	325 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	326 if ((data->saved_view.x != 0) \|\| (data->saved_view.y != 0)) {
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	327 SDL_NAME(XF86VidModeSetViewPort) (display, data->screen,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	328 data->saved_view.x,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	329 data->saved_view.y);
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	330 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	331 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	332 #endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	333
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	334 void
3500 4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 2963 diff changeset	335 X11_GetDisplayModes(_THIS, SDL_VideoDisplay * sdl_display)
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	336 {
2870 b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	337 Display display = ((SDL_VideoData ) _this->driverdata)->display;
3500 4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 2963 diff changeset	338 SDL_DisplayData data = (SDL_DisplayData ) sdl_display->driverdata;
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	339 #if SDL_VIDEO_DRIVER_X11_XINERAMA
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	340 int xinerama_major, xinerama_minor;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	341 int screens;
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	342 SDL_NAME(XineramaScreenInfo) * xinerama;
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	343 #endif
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	344 #if SDL_VIDEO_DRIVER_X11_XRANDR
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	345 int xrandr_major, xrandr_minor;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	346 int nsizes, nrates;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	347 XRRScreenSize *sizes;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	348 short *rates;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	349 #endif
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	350 #if SDL_VIDEO_DRIVER_X11_VIDMODE
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	351 int vm_major, vm_minor;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	352 int nmodes;
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	353 SDL_NAME(XF86VidModeModeInfo) ** modes;
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	354 #endif
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	355 int screen_w;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	356 int screen_h;
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	357 SDL_DisplayMode mode;
2870 b801df19835f The X11 window and all pixmaps and images share the same visual and depth. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	358
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	359 /* Unfortunately X11 requires the window to be created with the correct
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	360 * visual and depth ahead of time, but the SDL API allows you to create
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	361 * a window before setting the fullscreen display mode. This means that
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	362 * we have to use the same format for all windows and all display modes.
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	363 * (or support recreating the window with a new visual behind the scenes)
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	364 */
3500 4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 2963 diff changeset	365 mode.format = sdl_display->current_mode.format;
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	366 mode.driverdata = NULL;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	367
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	368 data->use_xinerama = 0;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	369 data->use_xrandr = 0;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	370 data->use_vidmode = 0;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	371 screen_w = DisplayWidth(display, data->screen);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	372 screen_h = DisplayHeight(display, data->screen);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	373
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	374 #if SDL_VIDEO_DRIVER_X11_XINERAMA
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	375 /* Query Xinerama extention */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	376 if (CheckXinerama(display, &xinerama_major, &xinerama_minor)) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	377 #ifdef X11MODES_DEBUG
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	378 printf("X11 detected Xinerama:\n");
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	379 #endif
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	380 xinerama = SDL_NAME(XineramaQueryScreens) (display, &screens);
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	381 if (xinerama) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	382 int i;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	383 for (i = 0; i < screens; i++) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	384 #ifdef X11MODES_DEBUG
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	385 printf("xinerama %d: %dx%d+%d+%d\n",
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	386 xinerama[i].screen_number,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	387 xinerama[i].width, xinerama[i].height,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	388 xinerama[i].x_org, xinerama[i].y_org);
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	389 #endif
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	390 if (xinerama[i].screen_number == data->screen) {
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	391 data->use_xinerama =
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	392 xinerama_major * 100 + xinerama_minor;
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	393 data->xinerama_info = xinerama[i];
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	394 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	395 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	396 XFree(xinerama);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	397 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	398
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	399 if (data->use_xinerama) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	400 /* Add the full xinerama mode */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	401 if (screen_w > data->xinerama_info.width \|\|
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	402 screen_h > data->xinerama_info.height) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	403 mode.w = screen_w;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	404 mode.h = screen_h;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	405 mode.refresh_rate = 0;
3500 4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 2963 diff changeset	406 SDL_AddDisplayMode(sdl_display, &mode);
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	407 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	408
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	409 /* Add the head xinerama mode */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	410 mode.w = data->xinerama_info.width;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	411 mode.h = data->xinerama_info.height;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	412 mode.refresh_rate = 0;
3500 4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 2963 diff changeset	413 SDL_AddDisplayMode(sdl_display, &mode);
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	414 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	415 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	416 #endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	417
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	418 #if SDL_VIDEO_DRIVER_X11_XRANDR
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	419 /* XRandR */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	420 /* require at least XRandR v1.0 (arbitrary) */
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	421 if (CheckXRandR(display, &xrandr_major, &xrandr_minor)
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	422 && xrandr_major >= 1) {
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	423 #ifdef X11MODES_DEBUG
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	424 fprintf(stderr, "XRANDR: XRRQueryVersion: V%d.%d\n",
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	425 xrandr_major, xrandr_minor);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	426 #endif
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	427
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	428 /* save the screen configuration since we must reference it
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	429 each time we toggle modes.
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	430 */
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	431 data->screen_config =
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	432 XRRGetScreenInfo(display, RootWindow(display, data->screen));
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	433
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	434 /* retrieve the list of resolution */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	435 sizes = XRRConfigSizes(data->screen_config, &nsizes);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	436 if (nsizes > 0) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	437 int i, j;
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	438 for (i = 0; i < nsizes; i++) {
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	439 mode.w = sizes[i].width;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	440 mode.h = sizes[i].height;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	441
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	442 rates = XRRConfigRates(data->screen_config, i, &nrates);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	443 for (j = 0; j < nrates; ++j) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	444 mode.refresh_rate = rates[j];
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	445 #ifdef X11MODES_DEBUG
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	446 fprintf(stderr,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	447 "XRANDR: mode = %4d[%d], w = %4d, h = %4d, rate = %4d\n",
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	448 i, j, mode.w, mode.h, mode.refresh_rate);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	449 #endif
3500 4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 2963 diff changeset	450 SDL_AddDisplayMode(sdl_display, &mode);
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	451 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	452 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	453
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	454 data->use_xrandr = xrandr_major * 100 + xrandr_minor;
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	455 data->saved_size =
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	456 XRRConfigCurrentConfiguration(data->screen_config,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	457 &data->saved_rotation);
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	458 data->saved_rate = XRRConfigCurrentRate(data->screen_config);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	459 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	460 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	461 #endif /* SDL_VIDEO_DRIVER_X11_XRANDR */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	462
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	463 #if SDL_VIDEO_DRIVER_X11_VIDMODE
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	464 /* XVidMode */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	465 if (!data->use_xrandr &&
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	466 #if SDL_VIDEO_DRIVER_X11_XINERAMA
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	467 (!data->use_xinerama \|\| data->xinerama_info.screen_number == 0) &&
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	468 #endif
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	469 CheckVidMode(display, &vm_major, &vm_minor) &&
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	470 SDL_NAME(XF86VidModeGetAllModeLines) (display, data->screen, &nmodes,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	471 &modes)) {
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	472 int i;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	473
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	474 #ifdef X11MODES_DEBUG
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	475 printf("VidMode modes: (unsorted)\n");
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	476 for (i = 0; i < nmodes; ++i) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	477 printf("Mode %d: %d x %d @ %d\n", i,
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	478 modes[i]->hdisplay, modes[i]->vdisplay,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	479 calculate_rate(modes[i]));
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	480 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	481 #endif
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	482 for (i = 0; i < nmodes; ++i) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	483 mode.w = modes[i]->hdisplay;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	484 mode.h = modes[i]->vdisplay;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	485 mode.refresh_rate = calculate_rate(modes[i]);
3500 4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 2963 diff changeset	486 SDL_AddDisplayMode(sdl_display, &mode);
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	487 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	488 XFree(modes);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	489
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	490 data->use_vidmode = vm_major * 100 + vm_minor;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	491 save_mode(display, data);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	492 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	493 #endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	494
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	495 if (!data->use_xrandr && !data->use_vidmode) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	496 mode.w = screen_w;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	497 mode.h = screen_h;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	498 mode.refresh_rate = 0;
3500 4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 2963 diff changeset	499 SDL_AddDisplayMode(sdl_display, &mode);
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	500 }
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	501 #ifdef X11MODES_DEBUG
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	502 if (data->use_xinerama) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	503 printf("Xinerama is enabled\n");
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	504 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	505
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	506 if (data->use_xrandr) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	507 printf("XRandR is enabled\n");
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	508 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	509
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	510 if (data->use_vidmode) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	511 printf("VidMode is enabled\n");
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	512 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	513 #endif /* X11MODES_DEBUG */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	514 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	515
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	516 static void
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	517 get_real_resolution(Display * display, SDL_DisplayData * data, int w, int h,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	518 int *rate)
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	519 {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	520 #if SDL_VIDEO_DRIVER_X11_XRANDR
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	521 if (data->use_xrandr) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	522 int nsizes;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	523 XRRScreenSize *sizes;
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	524
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	525 sizes = XRRConfigSizes(data->screen_config, &nsizes);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	526 if (nsizes > 0) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	527 int cur_size;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	528 Rotation cur_rotation;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	529
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	530 cur_size =
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	531 XRRConfigCurrentConfiguration(data->screen_config,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	532 &cur_rotation);
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	533 *w = sizes[cur_size].width;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	534 *h = sizes[cur_size].height;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	535 *rate = XRRConfigCurrentRate(data->screen_config);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	536 #ifdef X11MODES_DEBUG
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	537 fprintf(stderr,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	538 "XRANDR: get_real_resolution: w = %d, h = %d, rate = %d\n",
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	539 w, h, *rate);
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	540 #endif
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	541 return;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	542 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	543 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	544 #endif /* SDL_VIDEO_DRIVER_X11_XRANDR */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	545
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	546 #if SDL_VIDEO_DRIVER_X11_VIDMODE
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	547 if (data->use_vidmode) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	548 SDL_NAME(XF86VidModeModeInfo) mode;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	549
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	550 if (SDL_NAME(XF86VidModeGetModeInfo) (display, data->screen, &mode)) {
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	551 *w = mode.hdisplay;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	552 *h = mode.vdisplay;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	553 *rate = calculate_rate(&mode);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	554 return;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	555 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	556 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	557 #endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	558
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	559 #if SDL_VIDEO_DRIVER_X11_XINERAMA
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	560 if (data->use_xinerama) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	561 *w = data->xinerama_info.width;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	562 *h = data->xinerama_info.height;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	563 *rate = 0;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	564 return;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	565 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	566 #endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	567
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	568 *w = DisplayWidth(display, data->screen);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	569 *h = DisplayHeight(display, data->screen);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	570 *rate = 0;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	571 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	572
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	573 static void
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	574 set_best_resolution(Display * display, SDL_DisplayData * data, int w, int h,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	575 int rate)
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	576 {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	577 int real_w, real_h, real_rate;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	578
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	579 /* check current mode so we can avoid uneccessary mode changes */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	580 get_real_resolution(display, data, &real_w, &real_h, &real_rate);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	581 if (w == real_w && h == real_h && (!rate \|\| rate == real_rate)) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	582 return;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	583 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	584 #if SDL_VIDEO_DRIVER_X11_XRANDR
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	585 if (data->use_xrandr) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	586 #ifdef X11MODES_DEBUG
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	587 fprintf(stderr, "XRANDR: set_best_resolution(): w = %d, h = %d\n",
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	588 w, h);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	589 #endif
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	590 int i, nsizes, nrates;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	591 int best;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	592 int best_rate;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	593 XRRScreenSize *sizes;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	594 short *rates;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	595
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	596 /* find the smallest resolution that is at least as big as the user requested */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	597 best = -1;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	598 sizes = XRRConfigSizes(data->screen_config, &nsizes);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	599 for (i = 0; i < nsizes; ++i) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	600 if (sizes[i].width < w \|\| sizes[i].height < h) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	601 continue;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	602 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	603 if (sizes[i].width == w && sizes[i].height == h) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	604 best = i;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	605 break;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	606 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	607 if (best == -1 \|\|
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	608 (sizes[i].width < sizes[best].width) \|\|
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	609 (sizes[i].width == sizes[best].width
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	610 && sizes[i].height < sizes[best].height)) {
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	611 best = i;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	612 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	613 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	614
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	615 if (best >= 0) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	616 best_rate = 0;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	617 rates = XRRConfigRates(data->screen_config, best, &nrates);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	618 for (i = 0; i < nrates; ++i) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	619 if (rates[i] == rate) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	620 best_rate = rate;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	621 break;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	622 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	623 if (!rate) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	624 /* Higher is better, right? */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	625 if (rates[i] > best_rate) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	626 best_rate = rates[i];
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	627 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	628 } else {
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	629 if (SDL_abs(rates[i] - rate) < SDL_abs(best_rate - rate)) {
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	630 best_rate = rates[i];
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	631 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	632 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	633 }
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	634 XRRSetScreenConfigAndRate(display, data->screen_config,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	635 RootWindow(display, data->screen), best,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	636 data->saved_rotation, best_rate,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	637 CurrentTime);
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	638 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	639 return;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	640 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	641 #endif /* SDL_VIDEO_DRIVER_X11_XRANDR */
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	642
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	643 #if SDL_VIDEO_DRIVER_X11_VIDMODE
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	644 if (data->use_vidmode) {
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	645 SDL_NAME(XF86VidModeModeInfo) ** modes;
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	646 int i, nmodes;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	647 int best;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	648
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	649 if (SDL_NAME(XF86VidModeGetAllModeLines)
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	650 (display, data->screen, &nmodes, &modes)) {
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	651 best = -1;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	652 for (i = 0; i < nmodes; ++i) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	653 if (modes[i]->hdisplay < w \|\| modes[i]->vdisplay < h) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	654 continue;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	655 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	656 if (best == -1 \|\|
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	657 (modes[i]->hdisplay < modes[best]->hdisplay) \|\|
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	658 (modes[i]->hdisplay == modes[best]->hdisplay
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	659 && modes[i]->vdisplay < modes[best]->vdisplay)) {
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	660 best = i;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	661 continue;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	662 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	663 if ((modes[i]->hdisplay == modes[best]->hdisplay) &&
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	664 (modes[i]->vdisplay == modes[best]->vdisplay)) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	665 if (!rate) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	666 /* Higher is better, right? */
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	667 if (calculate_rate(modes[i]) >
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	668 calculate_rate(modes[best])) {
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	669 best = i;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	670 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	671 } else {
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	672 if (SDL_abs(calculate_rate(modes[i]) - rate) <
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	673 SDL_abs(calculate_rate(modes[best]) - rate)) {
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	674 best = i;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	675 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	676 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	677 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	678 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	679 if (best >= 0) {
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	680 #ifdef X11MODES_DEBUG
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	681 printf("Best Mode %d: %d x %d @ %d\n", best,
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	682 modes[best]->hdisplay, modes[best]->vdisplay,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	683 calculate_rate(modes[best]));
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	684 #endif
2874 36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	685 SDL_NAME(XF86VidModeSwitchToMode) (display, data->screen,
36e312e0fac0 indent Sam Lantinga <slouken@libsdl.org> parents: 2873 diff changeset	686 modes[best]);
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	687 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	688 XFree(modes);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	689 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	690 return;
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	691 }
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	692 #endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	693 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	694
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	695 int
3500 4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 2963 diff changeset	696 X11_SetDisplayMode(_THIS, SDL_VideoDisplay * sdl_display, SDL_DisplayMode * mode)
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	697 {
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	698 Display display = ((SDL_VideoData ) _this->driverdata)->display;
3500 4b594623401b Work in progress on multi-display support: Sam Lantinga <slouken@libsdl.org> parents: 2963 diff changeset	699 SDL_DisplayData data = (SDL_DisplayData ) sdl_display->driverdata;
2873 b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	700
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	701 set_best_resolution(display, data, mode->w, mode->h, mode->refresh_rate);
b33e38aaa027 Progress on fullscreen mode switching on X11 Sam Lantinga <slouken@libsdl.org> parents: 2870 diff changeset	702 return 0;
1950 a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	703 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	704
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	705 void
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	706 X11_QuitModes(_THIS)
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	707 {
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	708 }
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	709
a344e42bce3b Started work on the new X11 driver. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	710 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/x11/SDL_x11modes.c @ 4590:1ad70fb49fcb