Mercurial > sdl-ios-xcode
diff src/video/x11/SDL_x11modes.c @ 1895:c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Mon, 10 Jul 2006 21:04:37 +0000 |
| parents | 0e44c6f90b95 |
| children |
line wrap: on
line diff
--- a/src/video/x11/SDL_x11modes.c Thu Jul 06 18:01:37 2006 +0000 +++ b/src/video/x11/SDL_x11modes.c Mon Jul 10 21:04:37 2006 +0000 @@ -37,208 +37,190 @@ #define MAX(a, b) (a > b ? a : b) -#if SDL_VIDEO_DRIVER_X11_XRANDR -static int cmpmodelist(const void *va, const void *vb) +#if SDL_VIDEO_DRIVER_X11_VIDMODE +int +vidmode_refreshrate(SDL_NAME(XF86VidModeModeInfo) * mode) { - const SDL_Rect *a = *(const SDL_Rect **)va; - const SDL_Rect *b = *(const SDL_Rect **)vb; - if ( a->w == b->w ) - return b->h - a->h; - else - return b->w - a->w; + return (mode->htotal + && mode->vtotal) ? (1000 * mode->dotclock / (mode->htotal * + mode->vtotal)) : 0; } #endif #if SDL_VIDEO_DRIVER_X11_VIDMODE -Bool SDL_NAME(XF86VidModeGetModeInfo)(Display *dpy, int scr, SDL_NAME(XF86VidModeModeInfo) *info) +Bool SDL_NAME(XF86VidModeGetModeInfo) (Display * dpy, int scr, + SDL_NAME(XF86VidModeModeInfo) * info) { - SDL_NAME(XF86VidModeModeLine) *l = (SDL_NAME(XF86VidModeModeLine)*)((char*)info + sizeof info->dotclock); - return SDL_NAME(XF86VidModeGetModeLine)(dpy, scr, (int*)&info->dotclock, l); + SDL_NAME(XF86VidModeModeLine) * l = + (SDL_NAME(XF86VidModeModeLine) *) ((char *) info + + sizeof info->dotclock); + return SDL_NAME(XF86VidModeGetModeLine) (dpy, scr, + (int *) &info->dotclock, l); } #endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */ #if SDL_VIDEO_DRIVER_X11_VIDMODE -static void save_mode(_THIS) +static void +save_mode(_THIS) { SDL_memset(&saved_mode, 0, sizeof(saved_mode)); - SDL_NAME(XF86VidModeGetModeInfo)(SDL_Display,SDL_Screen,&saved_mode); - SDL_NAME(XF86VidModeGetViewPort)(SDL_Display,SDL_Screen,&saved_view.x,&saved_view.y); -} -#endif - -#if SDL_VIDEO_DRIVER_X11_VIDMODE -static void restore_mode(_THIS) -{ - SDL_NAME(XF86VidModeModeLine) mode; - int unused; - - if ( SDL_NAME(XF86VidModeGetModeLine)(SDL_Display, SDL_Screen, &unused, &mode) ) { - if ( (saved_mode.hdisplay != mode.hdisplay) || - (saved_mode.vdisplay != mode.vdisplay) ) { - SDL_NAME(XF86VidModeSwitchToMode)(SDL_Display, SDL_Screen, &saved_mode); - } - } - if ( (saved_view.x != 0) || (saved_view.y != 0) ) { - SDL_NAME(XF86VidModeSetViewPort)(SDL_Display, SDL_Screen, saved_view.x, saved_view.y); - } + SDL_NAME(XF86VidModeGetModeInfo) (SDL_Display, SDL_Screen, &saved_mode); + SDL_NAME(XF86VidModeGetViewPort) (SDL_Display, SDL_Screen, &saved_view.x, + &saved_view.y); } #endif #if SDL_VIDEO_DRIVER_X11_VIDMODE -static int cmpmodes(const void *va, const void *vb) +static void +restore_mode(_THIS) { - const SDL_NAME(XF86VidModeModeInfo) *a = *(const SDL_NAME(XF86VidModeModeInfo)**)va; - const SDL_NAME(XF86VidModeModeInfo) *b = *(const SDL_NAME(XF86VidModeModeInfo)**)vb; - if ( a->hdisplay == b->hdisplay ) - return b->vdisplay - a->vdisplay; - else - return b->hdisplay - a->hdisplay; + SDL_NAME(XF86VidModeModeLine) mode; + int unused; + + if (SDL_NAME(XF86VidModeGetModeLine) + (SDL_Display, SDL_Screen, &unused, &mode)) { + if ((saved_mode.hdisplay != mode.hdisplay) || + (saved_mode.vdisplay != mode.vdisplay)) { + SDL_NAME(XF86VidModeSwitchToMode) (SDL_Display, SDL_Screen, + &saved_mode); + } + } + if ((saved_view.x != 0) || (saved_view.y != 0)) { + SDL_NAME(XF86VidModeSetViewPort) (SDL_Display, SDL_Screen, + saved_view.x, saved_view.y); + } } #endif -static void get_real_resolution(_THIS, int* w, int* h); +static void get_real_resolution(_THIS, int *w, int *h); + +static void +set_best_resolution(_THIS, int width, int height) +{ + SDL_DisplayMode mode; -static void set_best_resolution(_THIS, int width, int height) -{ + mode.format = 0; + mode.w = width; + mode.h = height; + mode.refresh_rate = 0; + SDL_GetClosestDisplayMode(&mode, &mode, SDL_FULLSCREEN); + #if SDL_VIDEO_DRIVER_X11_VIDMODE - if ( use_vidmode ) { - SDL_NAME(XF86VidModeModeLine) mode; - SDL_NAME(XF86VidModeModeInfo) **modes; - int i; + if (use_vidmode) { + SDL_NAME(XF86VidModeModeLine) vmode; + SDL_NAME(XF86VidModeModeInfo) vinfo; + SDL_NAME(XF86VidModeModeInfo) ** modes; + int i, dotclock; int nmodes; int best = -1; - if ( SDL_NAME(XF86VidModeGetModeLine)(SDL_Display, SDL_Screen, &i, &mode) && - SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display,SDL_Screen,&nmodes,&modes) ) { - for ( i = 0; i < nmodes ; i++ ) { - if ( (modes[i]->hdisplay == width) && - (modes[i]->vdisplay == height) ) { + if (SDL_NAME(XF86VidModeGetModeLine) + (SDL_Display, SDL_Screen, &dotclock, &vmode) + && SDL_NAME(XF86VidModeGetAllModeLines) (SDL_Display, + SDL_Screen, &nmodes, + &modes)) { + vinfo.dotclock = dotclock; + SDL_memcpy(&vinfo.hdisplay, &vmode, sizeof(vmode)); + + for (i = 0; i < nmodes; i++) { + if ((modes[i]->hdisplay == mode.w) && + (modes[i]->vdisplay == mode.h) && + (vidmode_refreshrate(modes[i]) == mode.refresh_rate)) { best = i; break; } - if ( modes[i]->hdisplay >= width && - modes[i]->vdisplay >= height ) { - if ( best < 0 || - (modes[i]->hdisplay < modes[best]->hdisplay && - modes[i]->vdisplay <= modes[best]->vdisplay) || - (modes[i]->vdisplay < modes[best]->vdisplay && - modes[i]->hdisplay <= modes[best]->hdisplay) ) { - best = i; - } - } } - if ( best >= 0 && - ((modes[best]->hdisplay != mode.hdisplay) || - (modes[best]->vdisplay != mode.vdisplay)) ) { + if (best >= 0 && + ((modes[best]->hdisplay != vmode.hdisplay) || + (modes[best]->vdisplay != vmode.vdisplay) || + (vidmode_refreshrate(modes[best]) != + vidmode_refreshrate(&vinfo)))) { #ifdef X11MODES_DEBUG printf("Best Mode %d: %d x %d @ %d\n", best, - modes[best]->hdisplay, modes[best]->vdisplay, - (modes[best]->htotal && modes[best]->vtotal) ? (1000 * modes[best]->dotclock / (modes[best]->htotal * modes[best]->vtotal)) : 0 ); + modes[best]->hdisplay, modes[best]->vdisplay, + vidmode_refreshrate(modes[best])); #endif - SDL_NAME(XF86VidModeSwitchToMode)(SDL_Display, SDL_Screen, modes[best]); + SDL_NAME(XF86VidModeSwitchToMode) (SDL_Display, + SDL_Screen, modes[best]); } XFree(modes); } } #endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */ - /* XiG */ + /* XiG */ #if SDL_VIDEO_DRIVER_X11_XME - if ( use_xme && SDL_modelist ) { + if (use_xme) { int i; + int w, h; + /* check current mode so we can avoid uneccessary mode changes */ + get_real_resolution(this, &w, &h); + + if ((mode.w != w) || (mode.h != h)) { #ifdef X11MODES_DEBUG - fprintf(stderr, "XME: set_best_resolution(): w = %d, h = %d\n", - width, height); + fprintf(stderr, "XME: set_best_resolution: " + "XiGMiscChangeResolution: %d %d\n", mode.w, mode.h); #endif - for ( i=0; SDL_modelist[i]; ++i ) { - if ( (SDL_modelist[i]->w >= width) && - (SDL_modelist[i]->h >= height) ) { - break; - } - } - - if ( SDL_modelist[i] ) { /* found one, lets try it */ - int w, h; - - /* check current mode so we can avoid uneccessary mode changes */ - get_real_resolution(this, &w, &h); - - if ( (SDL_modelist[i]->w != w) || (SDL_modelist[i]->h != h) ) { -#ifdef X11MODES_DEBUG - fprintf(stderr, "XME: set_best_resolution: " - "XiGMiscChangeResolution: %d %d\n", - SDL_modelist[i]->w, SDL_modelist[i]->h); -#endif - XiGMiscChangeResolution(SDL_Display, - SDL_Screen, - 0, /* view */ - SDL_modelist[i]->w, - SDL_modelist[i]->h, - 0); - XSync(SDL_Display, False); - } + XiGMiscChangeResolution(SDL_Display, SDL_Screen, 0, /* view */ + mode.w, mode.h, 0); + XSync(SDL_Display, False); } } #endif /* SDL_VIDEO_DRIVER_X11_XME */ #if SDL_VIDEO_DRIVER_X11_XRANDR - if ( use_xrandr && SDL_modelist ) { -#ifdef X11MODES_DEBUG - fprintf(stderr, "XRANDR: set_best_resolution(): w = %d, h = %d\n", - width, height); -#endif + if (use_xrandr) { int i, nsizes; XRRScreenSize *sizes; /* find the smallest resolution that is at least as big as the user requested */ sizes = XRRConfigSizes(screen_config, &nsizes); - for ( i = (nsizes-1); i >= 0; i-- ) { - if ( (SDL_modelist[i]->w >= width) && - (SDL_modelist[i]->h >= height) ) { + for (i = (nsizes - 1); i >= 0; i--) { + if ((mode.w >= width) && (mode.h >= height)) { break; } } - if ( i >= 0 && SDL_modelist[i] ) { /* found one, lets try it */ + if (i >= 0) { /* found one, lets try it */ int w, h; /* check current mode so we can avoid uneccessary mode changes */ get_real_resolution(this, &w, &h); - if ( (SDL_modelist[i]->w != w) || (SDL_modelist[i]->h != h) ) { + if ((mode.w != w) || (mode.h != h)) { int size_id; #ifdef X11MODES_DEBUG fprintf(stderr, "XRANDR: set_best_resolution: " - "XXRSetScreenConfig: %d %d\n", - SDL_modelist[i]->w, SDL_modelist[i]->h); + "XXRSetScreenConfig: %d %d\n", mode.w, mode.h); #endif /* find the matching size entry index */ - for ( size_id = 0; size_id < nsizes; ++size_id ) { - if ( (sizes[size_id].width == SDL_modelist[i]->w) && - (sizes[size_id].height == SDL_modelist[i]->h) ) + for (size_id = 0; size_id < nsizes; ++size_id) { + if ((sizes[size_id].width == mode.w) && + (sizes[size_id].height == mode.h)) break; } - XRRSetScreenConfig(SDL_Display, screen_config, SDL_Root, - size_id, saved_rotation, CurrentTime); + XRRSetScreenConfig(SDL_Display, screen_config, + SDL_Root, size_id, saved_rotation, + CurrentTime); } } } #endif /* SDL_VIDEO_DRIVER_X11_XRANDR */ } -static void get_real_resolution(_THIS, int* w, int* h) +static void +get_real_resolution(_THIS, int *w, int *h) { #if SDL_VIDEO_DRIVER_X11_XME - if ( use_xme ) { + if (use_xme) { int ractive; XiGMiscResolutionInfo *modelist; - XiGMiscQueryResolutions(SDL_Display, SDL_Screen, - 0, /* view */ + XiGMiscQueryResolutions(SDL_Display, SDL_Screen, 0, /* view */ &ractive, &modelist); *w = modelist[ractive].width; *h = modelist[ractive].height; @@ -251,11 +233,12 @@ #endif /* SDL_VIDEO_DRIVER_X11_XME */ #if SDL_VIDEO_DRIVER_X11_VIDMODE - if ( use_vidmode ) { + if (use_vidmode) { SDL_NAME(XF86VidModeModeLine) mode; int unused; - if ( SDL_NAME(XF86VidModeGetModeLine)(SDL_Display, SDL_Screen, &unused, &mode) ) { + if (SDL_NAME(XF86VidModeGetModeLine) + (SDL_Display, SDL_Screen, &unused, &mode)) { *w = mode.hdisplay; *h = mode.vdisplay; return; @@ -264,22 +247,24 @@ #endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */ #if SDL_VIDEO_DRIVER_X11_XRANDR - if ( use_xrandr ) { + if (use_xrandr) { int nsizes; - XRRScreenSize* sizes; + XRRScreenSize *sizes; sizes = XRRConfigSizes(screen_config, &nsizes); - if ( nsizes > 0 ) { + if (nsizes > 0) { int cur_size; Rotation cur_rotation; - cur_size = XRRConfigCurrentConfiguration(screen_config, &cur_rotation); - if ( cur_size >= 0 && cur_size < nsizes ) { + cur_size = + XRRConfigCurrentConfiguration(screen_config, &cur_rotation); + if (cur_size >= 0 && cur_size < nsizes) { *w = sizes[cur_size].width; *h = sizes[cur_size].height; } #ifdef X11MODES_DEBUG - fprintf(stderr, "XRANDR: get_real_resolution: w = %d h = %d\n", *w, *h); + fprintf(stderr, + "XRANDR: get_real_resolution: w = %d h = %d\n", *w, *h); #endif return; } @@ -287,9 +272,9 @@ #endif /* SDL_VIDEO_DRIVER_X11_XRANDR */ #if SDL_VIDEO_DRIVER_X11_XINERAMA - if ( use_xinerama ) { - *w = xinerama_info.width; - *h = xinerama_info.height; + if (use_xinerama) { + *w = xinerama[this->current_display].width; + *h = xinerama[this->current_display].height; return; } #endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */ @@ -299,49 +284,56 @@ } /* Called after mapping a window - waits until the window is mapped */ -void X11_WaitMapped(_THIS, Window win) +void +X11_WaitMapped(_THIS, Window win) { XEvent event; do { XMaskEvent(SDL_Display, StructureNotifyMask, &event); - } while ( (event.type != MapNotify) || (event.xmap.event != win) ); + } + while ((event.type != MapNotify) || (event.xmap.event != win)); } /* Called after unmapping a window - waits until the window is unmapped */ -void X11_WaitUnmapped(_THIS, Window win) +void +X11_WaitUnmapped(_THIS, Window win) { XEvent event; do { XMaskEvent(SDL_Display, StructureNotifyMask, &event); - } while ( (event.type != UnmapNotify) || (event.xunmap.event != win) ); + } + while ((event.type != UnmapNotify) || (event.xunmap.event != win)); } -static void move_cursor_to(_THIS, int x, int y) +static void +move_cursor_to(_THIS, int x, int y) { XWarpPointer(SDL_Display, None, SDL_Root, 0, 0, 0, 0, x, y); } -static int add_visual(_THIS, int depth, int class) +static int +add_visual(_THIS, int depth, int class) { XVisualInfo vi; - if(XMatchVisualInfo(SDL_Display, SDL_Screen, depth, class, &vi)) { + if (XMatchVisualInfo(SDL_Display, SDL_Screen, depth, class, &vi)) { int n = this->hidden->nvisuals; this->hidden->visuals[n].depth = vi.depth; this->hidden->visuals[n].visual = vi.visual; this->hidden->nvisuals++; } - return(this->hidden->nvisuals); + return (this->hidden->nvisuals); } -static int add_visual_byid(_THIS, const char *visual_id) +static int +add_visual_byid(_THIS, const char *visual_id) { XVisualInfo *vi, template; int nvis; - if ( visual_id ) { + if (visual_id) { SDL_memset(&template, 0, (sizeof template)); template.visualid = SDL_strtol(visual_id, NULL, 0); vi = XGetVisualInfo(SDL_Display, VisualIDMask, &template, &nvis); - if ( vi ) { + if (vi) { int n = this->hidden->nvisuals; this->hidden->visuals[n].depth = vi->depth; this->hidden->visuals[n].visual = vi->visual; @@ -349,14 +341,65 @@ XFree(vi); } } - return(this->hidden->nvisuals); + return (this->hidden->nvisuals); +} + +int +X11_GetVisuals(_THIS) +{ + /* It's interesting to note that if we allow 32 bit depths, + we get a visual with an alpha mask on composite servers. + static int depth_list[] = { 32, 24, 16, 15, 8 }; + */ + static int depth_list[] = { 24, 16, 15, 8 }; + int i, j, np; + int use_directcolor = 1; + XPixmapFormatValues *pf; + + /* Search for the visuals in deepest-first order, so that the first + will be the richest one */ + if (SDL_getenv("SDL_VIDEO_X11_NODIRECTCOLOR")) { + use_directcolor = 0; + } + this->hidden->nvisuals = 0; + if (!add_visual_byid(this, SDL_getenv("SDL_VIDEO_X11_VISUALID"))) { + for (i = 0; i < SDL_arraysize(depth_list); ++i) { + if (depth_list[i] > 8) { + if (use_directcolor) { + add_visual(this, depth_list[i], DirectColor); + } + add_visual(this, depth_list[i], TrueColor); + } else { + add_visual(this, depth_list[i], PseudoColor); + add_visual(this, depth_list[i], StaticColor); + } + } + } + if (this->hidden->nvisuals == 0) { + SDL_SetError("Found no sufficiently capable X11 visuals"); + return -1; + } + + /* look up the pixel quantum for each depth */ + pf = XListPixmapFormats(SDL_Display, &np); + for (i = 0; i < this->hidden->nvisuals; i++) { + int d = this->hidden->visuals[i].depth; + for (j = 0; j < np; j++) + if (pf[j].depth == d) + break; + this->hidden->visuals[i].bpp = j < np ? pf[j].bits_per_pixel : d; + } + + XFree(pf); + return 0; } /* Global for the error handler */ int vm_event, vm_error = -1; #if SDL_VIDEO_DRIVER_X11_XINERAMA -static int CheckXinerama(_THIS, int *major, int *minor) +static int +CheckXinerama(_THIS, int *major, int *minor) { const char *env; @@ -365,13 +408,13 @@ /* Allow environment override */ env = getenv("SDL_VIDEO_X11_XINERAMA"); - if ( env && !SDL_atoi(env) ) { + if (env && !SDL_atoi(env)) { return 0; } /* Query the extension version */ - if ( !SDL_NAME(XineramaQueryExtension)(SDL_Display, major, minor) || - !SDL_NAME(XineramaIsActive)(SDL_Display) ) { + if (!SDL_NAME(XineramaQueryExtension) (SDL_Display, major, minor) || + !SDL_NAME(XineramaIsActive) (SDL_Display)) { return 0; } return 1; @@ -379,7 +422,8 @@ #endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */ #if SDL_VIDEO_DRIVER_X11_XRANDR -static int CheckXRandR(_THIS, int *major, int *minor) +static int +CheckXRandR(_THIS, int *major, int *minor) { const char *env; @@ -388,21 +432,21 @@ /* Allow environment override */ env = getenv("SDL_VIDEO_X11_XRANDR"); - if ( env && !SDL_atoi(env) ) { + if (env && !SDL_atoi(env)) { return 0; } /* This defaults off now, due to KDE window maximize problems */ - if ( !env ) { + if (!env) { return 0; } - if ( !SDL_X11_HAVE_XRANDR ) { + if (!SDL_X11_HAVE_XRANDR) { return 0; } /* Query the extension version */ - if ( !XRRQueryVersion(SDL_Display, major, minor) ) { + if (!XRRQueryVersion(SDL_Display, major, minor)) { return 0; } return 1; @@ -410,7 +454,8 @@ #endif /* SDL_VIDEO_DRIVER_X11_XRANDR */ #if SDL_VIDEO_DRIVER_X11_VIDMODE -static int CheckVidMode(_THIS, int *major, int *minor) +static int +CheckVidMode(_THIS, int *major, int *minor) { const char *env; @@ -419,24 +464,26 @@ /* Allow environment override */ env = getenv("SDL_VIDEO_X11_VIDMODE"); - if ( env && !SDL_atoi(env) ) { + if (env && !SDL_atoi(env)) { return 0; } - + /* Metro-X 4.3.0 and earlier has a broken implementation of XF86VidModeGetAllModeLines() - it hangs the client. */ - if ( SDL_strcmp(ServerVendor(SDL_Display), "Metro Link Incorporated") == 0 ) { + if (SDL_strcmp(ServerVendor(SDL_Display), "Metro Link Incorporated") == 0) { FILE *metro_fp; metro_fp = fopen("/usr/X11R6/lib/X11/Metro/.version", "r"); - if ( metro_fp != NULL ) { + if (metro_fp != NULL) { int major, minor, patch, version; - major = 0; minor = 0; patch = 0; + major = 0; + minor = 0; + patch = 0; fscanf(metro_fp, "%d.%d.%d", &major, &minor, &patch); fclose(metro_fp); - version = major*100+minor*10+patch; - if ( version < 431 ) { + version = major * 100 + minor * 10 + patch; + if (version < 431) { return 0; } } @@ -444,8 +491,9 @@ /* Query the extension version */ vm_error = -1; - if ( !SDL_NAME(XF86VidModeQueryExtension)(SDL_Display, &vm_event, &vm_error) || - !SDL_NAME(XF86VidModeQueryVersion)(SDL_Display, major, minor) ) { + if (!SDL_NAME(XF86VidModeQueryExtension) + (SDL_Display, &vm_event, &vm_error) + || !SDL_NAME(XF86VidModeQueryVersion) (SDL_Display, major, minor)) { return 0; } return 1; @@ -453,7 +501,8 @@ #endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */ #if SDL_VIDEO_DRIVER_X11_XME -static int CheckXME(_THIS, int *major, int *minor) +static int +CheckXME(_THIS, int *major, int *minor) { const char *env; @@ -462,19 +511,20 @@ /* Allow environment override */ env = getenv("SDL_VIDEO_X11_VIDMODE"); - if ( env && !SDL_atoi(env) ) { + if (env && !SDL_atoi(env)) { return 0; } - + /* Query the extension version */ - if ( !XiGMiscQueryVersion(SDL_Display, major, minor) ) { + if (!XiGMiscQueryVersion(SDL_Display, major, minor)) { return 0; } return 1; } #endif /* SDL_VIDEO_DRIVER_X11_XME */ -int X11_GetVideoModes(_THIS) +int +X11_GetVideoModes(_THIS) { #if SDL_VIDEO_DRIVER_X11_XINERAMA int xinerama_major, xinerama_minor; @@ -483,20 +533,23 @@ int xrandr_major, xrandr_minor; int nsizes; XRRScreenSize *sizes; + int nrates; + short *rates; #endif #if SDL_VIDEO_DRIVER_X11_VIDMODE int vm_major, vm_minor; int nmodes; - SDL_NAME(XF86VidModeModeInfo) **modes; + SDL_NAME(XF86VidModeModeInfo) ** modes; #endif #if SDL_VIDEO_DRIVER_X11_XME int xme_major, xme_minor; int ractive, nummodes; XiGMiscResolutionInfo *modelist; #endif - int i, n; + int i; int screen_w; int screen_h; + SDL_DisplayMode mode; use_xinerama = 0; use_xrandr = 0; @@ -505,78 +558,44 @@ screen_w = DisplayWidth(SDL_Display, SDL_Screen); screen_h = DisplayHeight(SDL_Display, SDL_Screen); + mode.format = this->displays[this->current_display].desktop_mode.format; + mode.w = screen_w; + mode.h = screen_h; + mode.refresh_rate = 0; + SDL_AddDisplayMode(0, &mode); + #if SDL_VIDEO_DRIVER_X11_XINERAMA /* Query Xinerama extention */ - if ( CheckXinerama(this, &xinerama_major, &xinerama_minor) ) { - /* Find out which screen is the desired one */ - int desired = 0; + if (CheckXinerama(this, &xinerama_major, &xinerama_minor)) { int screens; - int w, h; - SDL_NAME(XineramaScreenInfo) *xinerama; - const char *variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_HEAD"); - if ( variable ) { - desired = SDL_atoi(variable); - } #ifdef X11MODES_DEBUG printf("X11 detected Xinerama:\n"); #endif - xinerama = SDL_NAME(XineramaQueryScreens)(SDL_Display, &screens); - for ( i = 0; i < screens; i++ ) { + xinerama = SDL_NAME(XineramaQueryScreens) (SDL_Display, &screens); + for (i = 0; i < screens; i++) { #ifdef X11MODES_DEBUG printf("xinerama %d: %dx%d+%d+%d\n", - xinerama[i].screen_number, - xinerama[i].width, xinerama[i].height, - xinerama[i].x_org, xinerama[i].y_org); + xinerama[i].screen_number, + xinerama[i].width, xinerama[i].height, + xinerama[i].x_org, xinerama[i].y_org); #endif - if ( xinerama[i].screen_number == desired ) { - use_xinerama = 1; - xinerama_info = xinerama[i]; - } - } - XFree(xinerama); - - if ( use_xinerama ) { - SDL_modelist = (SDL_Rect **)SDL_malloc(3*sizeof(SDL_Rect *)); - if ( !SDL_modelist ) { - SDL_OutOfMemory(); - return -1; + if (xinerama[i].screen_number != 0) { + SDL_AddVideoDisplay(&mode); } - - /* Add the full xinerama mode */ - n = 0; - w = xinerama_info.width; - h = xinerama_info.height; - if ( screen_w > w || screen_h > h) { - SDL_modelist[n] = (SDL_Rect *)SDL_malloc(sizeof(SDL_Rect)); - if ( SDL_modelist[n] ) { - SDL_modelist[n]->x = 0; - SDL_modelist[n]->y = 0; - SDL_modelist[n]->w = screen_w; - SDL_modelist[n]->h = screen_h; - ++n; - } - } - - /* Add the head xinerama mode */ - SDL_modelist[n] = (SDL_Rect *)SDL_malloc(sizeof(SDL_Rect)); - if ( SDL_modelist[n] ) { - SDL_modelist[n]->x = 0; - SDL_modelist[n]->y = 0; - SDL_modelist[n]->w = w; - SDL_modelist[n]->h = h; - ++n; - } - SDL_modelist[n] = NULL; + mode.w = xinerama[i].width; + mode.h = xinerama[i].height; + SDL_AddDisplayMode(xinerama[i].screen_number, &mode); } + use_xinerama = 1; } #endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */ #if SDL_VIDEO_DRIVER_X11_XRANDR /* XRandR */ /* require at least XRandR v1.0 (arbitrary) */ - if ( CheckXRandR(this, &xrandr_major, &xrandr_minor) && (xrandr_major >= 1) ) - { + if (CheckXRandR(this, &xrandr_major, &xrandr_minor) + && (xrandr_major >= 1)) { #ifdef X11MODES_DEBUG fprintf(stderr, "XRANDR: XRRQueryVersion: V%d.%d\n", xrandr_major, xrandr_minor); @@ -584,118 +603,56 @@ /* save the screen configuration since we must reference it each time we toggle modes. - */ + */ screen_config = XRRGetScreenInfo(SDL_Display, SDL_Root); /* retrieve the list of resolution */ sizes = XRRConfigSizes(screen_config, &nsizes); if (nsizes > 0) { - if ( SDL_modelist ) { - for ( i = 0; SDL_modelist[i]; ++i ) { - SDL_free(SDL_modelist[i]); + for (i = 0; i < nsizes; i++) { + mode.w = sizes[i].width; + mode.h = sizes[i].height; + + rates = XRRConfigRates(screen_config, i, &nrates); + if (nrates == 0) { + mode.refresh_rate = 0; + SDL_AddDisplayMode(0, &mode); + } else { + int j; + for (j = 0; j < nrates; ++j) { + mode.refresh_rate = rates[j]; + SDL_AddDisplayMode(0, &mode); + } } - SDL_free(SDL_modelist); - } - SDL_modelist = (SDL_Rect **)malloc((nsizes+1)*sizeof(SDL_Rect *)); - if ( !SDL_modelist ) { - SDL_OutOfMemory(); - return -1; } - for ( i=0; i < nsizes; i++ ) { - if ((SDL_modelist[i] = - (SDL_Rect *)malloc(sizeof(SDL_Rect))) == NULL) - break; -#ifdef X11MODES_DEBUG - fprintf(stderr, "XRANDR: mode = %4d, w = %4d, h = %4d\n", - i, sizes[i].width, sizes[i].height); -#endif - - SDL_modelist[i]->x = 0; - SDL_modelist[i]->y = 0; - SDL_modelist[i]->w = sizes[i].width; - SDL_modelist[i]->h = sizes[i].height; - - } - /* sort the mode list descending as SDL expects */ - SDL_qsort(SDL_modelist, nsizes, sizeof *SDL_modelist, cmpmodelist); - SDL_modelist[i] = NULL; /* terminator */ use_xrandr = xrandr_major * 100 + xrandr_minor; - saved_size_id = XRRConfigCurrentConfiguration(screen_config, &saved_rotation); + saved_size_id = + XRRConfigCurrentConfiguration(screen_config, &saved_rotation); } } #endif /* SDL_VIDEO_DRIVER_X11_XRANDR */ #if SDL_VIDEO_DRIVER_X11_VIDMODE /* XVidMode */ - if ( !use_xrandr && -#if SDL_VIDEO_DRIVER_X11_XINERAMA - (!use_xinerama || xinerama_info.screen_number == 0) && -#endif - CheckVidMode(this, &vm_major, &vm_minor) && - SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display, SDL_Screen,&nmodes,&modes) ) - { + if (!use_xrandr && + CheckVidMode(this, &vm_major, &vm_minor) && + SDL_NAME(XF86VidModeGetAllModeLines) (SDL_Display, SDL_Screen, + &nmodes, &modes)) { #ifdef X11MODES_DEBUG printf("VidMode modes: (unsorted)\n"); - for ( i = 0; i < nmodes; ++i ) { + for (i = 0; i < nmodes; ++i) { printf("Mode %d: %d x %d @ %d\n", i, - modes[i]->hdisplay, modes[i]->vdisplay, - (modes[i]->htotal && modes[i]->vtotal) ? (1000 * modes[i]->dotclock / (modes[i]->htotal * modes[i]->vtotal)) : 0 ); + modes[i]->hdisplay, modes[i]->vdisplay, + vidmode_refreshrate(modes[i])); } #endif - if ( SDL_modelist ) { - for ( i = 0; SDL_modelist[i]; ++i ) { - SDL_free(SDL_modelist[i]); - } - SDL_free(SDL_modelist); - } - SDL_modelist = (SDL_Rect **)SDL_malloc((nmodes+2)*sizeof(SDL_Rect *)); - if ( !SDL_modelist ) { - SDL_OutOfMemory(); - return -1; + for (i = 0; i < nmodes; ++i) { + mode.w = modes[i]->hdisplay; + mode.h = modes[i]->vdisplay; + mode.refresh_rate = vidmode_refreshrate(modes[i]); + SDL_AddDisplayMode(0, &mode); } - SDL_qsort(modes, nmodes, sizeof *modes, cmpmodes); - n = 0; - for ( i=0; i<nmodes; ++i ) { - int w, h; - - /* Eliminate duplicate modes with different refresh rates */ - if ( i > 0 && - modes[i]->hdisplay == modes[i-1]->hdisplay && - modes[i]->vdisplay == modes[i-1]->vdisplay ) { - continue; - } - - /* Check to see if we should add the screen size (Xinerama) */ - w = modes[i]->hdisplay; - h = modes[i]->vdisplay; - if ( (screen_w * screen_h) >= (w * h) ) { - if ( (screen_w != w) || (screen_h != h) ) { - SDL_modelist[n] = (SDL_Rect *)SDL_malloc(sizeof(SDL_Rect)); - if ( SDL_modelist[n] ) { - SDL_modelist[n]->x = 0; - SDL_modelist[n]->y = 0; - SDL_modelist[n]->w = screen_w; - SDL_modelist[n]->h = screen_h; - ++n; - } - } - screen_w = 0; - screen_h = 0; - } - - /* Add the size from the video mode list */ - SDL_modelist[n] = (SDL_Rect *)SDL_malloc(sizeof(SDL_Rect)); - if ( SDL_modelist[n] == NULL ) { - break; - } - SDL_modelist[n]->x = 0; - SDL_modelist[n]->y = 0; - SDL_modelist[n]->w = w; - SDL_modelist[n]->h = h; - ++n; - } - SDL_modelist[n] = NULL; XFree(modes); use_vidmode = vm_major * 100 + vm_minor; @@ -707,192 +664,70 @@ /* XiG */ modelist = NULL; /* first lets make sure we have the extension, and it's at least v2.0 */ - if ( CheckXME(this, &xme_major, &xme_minor) && xme_major >= 2 && - (nummodes = XiGMiscQueryResolutions(SDL_Display, SDL_Screen, - 0, /* view */ - &ractive, &modelist)) > 1 ) - { /* then we actually have some */ - int j; - + if (CheckXME(this, &xme_major, &xme_minor) && xme_major >= 2 && (nummodes = XiGMiscQueryResolutions(SDL_Display, SDL_Screen, 0, /* view */ + &ractive, + &modelist)) + > 1) { /* then we actually have some */ /* We get the list already sorted in descending order. We'll copy it in reverse order so SDL is happy */ #ifdef X11MODES_DEBUG fprintf(stderr, "XME: nummodes = %d, active mode = %d\n", nummodes, ractive); #endif - if ( SDL_modelist ) { - for ( i = 0; SDL_modelist[i]; ++i ) { - SDL_free(SDL_modelist[i]); - } - SDL_free(SDL_modelist); - } - SDL_modelist = (SDL_Rect **)SDL_malloc((nummodes+1)*sizeof(SDL_Rect *)); - if ( !SDL_modelist ) { - SDL_OutOfMemory(); - return -1; - } - for ( i=0, j=nummodes-1; j>=0; i++, j-- ) { - if ((SDL_modelist[i] = - (SDL_Rect *)SDL_malloc(sizeof(SDL_Rect))) == NULL) - break; + mode.refresh_rate = 0; + for (i = 0; i < nummodes; ++i) { #ifdef X11MODES_DEBUG fprintf(stderr, "XME: mode = %4d, w = %4d, h = %4d\n", - i, modelist[i].width, modelist[i].height); + i, modelist[i].width, modelist[i].height); #endif - - SDL_modelist[i]->x = 0; - SDL_modelist[i]->y = 0; - SDL_modelist[i]->w = modelist[j].width; - SDL_modelist[i]->h = modelist[j].height; - + mode.w = modelist[i].width; + mode.h = modelist[i].height; + SDL_AddDisplayMode(0, &mode); } - SDL_modelist[i] = NULL; /* terminator */ use_xme = xme_major * 100 + xme_minor; - saved_res = modelist[ractive]; /* save the current resolution */ + saved_res = modelist[ractive]; /* save the current resolution */ } - if ( modelist ) { + if (modelist) { XFree(modelist); } #endif /* SDL_VIDEO_DRIVER_X11_XME */ - { - /* It's interesting to note that if we allow 32 bit depths, - we get a visual with an alpha mask on composite servers. - static int depth_list[] = { 32, 24, 16, 15, 8 }; - */ - static int depth_list[] = { 24, 16, 15, 8 }; - int j, np; - int use_directcolor = 1; - XPixmapFormatValues *pf; - - /* Search for the visuals in deepest-first order, so that the first - will be the richest one */ - if ( SDL_getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ) { - use_directcolor = 0; - } - this->hidden->nvisuals = 0; - if ( ! add_visual_byid(this, SDL_getenv("SDL_VIDEO_X11_VISUALID")) ) { - for ( i=0; i<SDL_arraysize(depth_list); ++i ) { - if ( depth_list[i] > 8 ) { - if ( use_directcolor ) { - add_visual(this, depth_list[i], DirectColor); - } - add_visual(this, depth_list[i], TrueColor); - } else { - add_visual(this, depth_list[i], PseudoColor); - add_visual(this, depth_list[i], StaticColor); - } - } - } - if ( this->hidden->nvisuals == 0 ) { - SDL_SetError("Found no sufficiently capable X11 visuals"); - return -1; - } - - /* look up the pixel quantum for each depth */ - pf = XListPixmapFormats(SDL_Display, &np); - for(i = 0; i < this->hidden->nvisuals; i++) { - int d = this->hidden->visuals[i].depth; - for(j = 0; j < np; j++) - if(pf[j].depth == d) - break; - this->hidden->visuals[i].bpp = j < np ? pf[j].bits_per_pixel : d; - } - - XFree(pf); - } - - if ( SDL_modelist == NULL ) { - SDL_modelist = (SDL_Rect **)SDL_malloc((1+1)*sizeof(SDL_Rect *)); - if ( !SDL_modelist ) { - SDL_OutOfMemory(); - return -1; - } - n = 0; - SDL_modelist[n] = (SDL_Rect *)SDL_malloc(sizeof(SDL_Rect)); - if ( SDL_modelist[n] ) { - SDL_modelist[n]->x = 0; - SDL_modelist[n]->y = 0; - SDL_modelist[n]->w = screen_w; - SDL_modelist[n]->h = screen_h; - ++n; - } - SDL_modelist[n] = NULL; - } - #ifdef X11MODES_DEBUG - if ( use_xinerama ) { + if (use_xinerama) { printf("Xinerama is enabled\n"); } - if ( use_xrandr ) { + if (use_xrandr) { printf("XRandR is enabled\n"); } - if ( use_vidmode ) { + if (use_vidmode) { printf("VidMode is enabled\n"); } - if ( use_xme ) { + if (use_xme) { printf("Xi Graphics XME fullscreen is enabled\n"); } - - if ( SDL_modelist ) { - printf("X11 video mode list:\n"); - for ( i=0; SDL_modelist[i]; ++i ) { - printf("\t%dx%d\n", SDL_modelist[i]->w, SDL_modelist[i]->h); - } - } #endif /* X11MODES_DEBUG */ return 0; } -int X11_SupportedVisual(_THIS, SDL_PixelFormat *format) -{ - int i; - for(i = 0; i < this->hidden->nvisuals; i++) - if(this->hidden->visuals[i].bpp == format->BitsPerPixel) - return 1; - return 0; -} - -SDL_Rect **X11_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags) +void +X11_FreeVideoModes(_THIS) { - if ( X11_SupportedVisual(this, format) ) { - if ( flags & SDL_FULLSCREEN ) { - return(SDL_modelist); - } else { - return((SDL_Rect **)-1); - } - } else { - return((SDL_Rect **)0); - } -} - -void X11_FreeVideoModes(_THIS) -{ - int i; - - if ( SDL_modelist ) { - for ( i=0; SDL_modelist[i]; ++i ) { - SDL_free(SDL_modelist[i]); - } - SDL_free(SDL_modelist); - SDL_modelist = NULL; - } - #if SDL_VIDEO_DRIVER_X11_XRANDR /* Free the Xrandr screen configuration */ - if ( screen_config ) { + if (screen_config) { XRRFreeScreenConfigInfo(screen_config); screen_config = NULL; } #endif /* SDL_VIDEO_DRIVER_X11_XRANDR */ } -int X11_ResizeFullScreen(_THIS) +int +X11_ResizeFullScreen(_THIS) { int x = 0, y = 0; int real_w, real_h; @@ -903,49 +738,51 @@ screen_h = DisplayHeight(SDL_Display, SDL_Screen); #if SDL_VIDEO_DRIVER_X11_XINERAMA - if ( use_xinerama && - window_w <= xinerama_info.width && - window_h <= xinerama_info.height ) { - x = xinerama_info.x_org; - y = xinerama_info.y_org; + if (use_xinerama && + window_w <= xinerama[this->current_display].width && + window_h <= xinerama[this->current_display].height) { + x = xinerama[this->current_display].x_org; + y = xinerama[this->current_display].y_org; } #endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */ - if ( currently_fullscreen ) { + if (currently_fullscreen) { /* Switch resolution and cover it with the FSwindow */ move_cursor_to(this, x, y); set_best_resolution(this, window_w, window_h); move_cursor_to(this, x, y); get_real_resolution(this, &real_w, &real_h); - if ( window_w > real_w ) { + if (window_w > real_w) { real_w = MAX(real_w, screen_w); } - if ( window_h > real_h ) { + if (window_h > real_h) { real_h = MAX(real_h, screen_h); } XMoveResizeWindow(SDL_Display, FSwindow, x, y, real_w, real_h); - move_cursor_to(this, real_w/2, real_h/2); + move_cursor_to(this, real_w / 2, real_h / 2); /* Center and reparent the drawing window */ - x = (real_w - window_w)/2; - y = (real_h - window_h)/2; + x = (real_w - window_w) / 2; + y = (real_h - window_h) / 2; XReparentWindow(SDL_Display, SDL_Window, FSwindow, x, y); /* FIXME: move the mouse to the old relative location */ - XSync(SDL_Display, True); /* Flush spurious mode change events */ + XSync(SDL_Display, True); /* Flush spurious mode change events */ } - return(1); + return (1); } -void X11_QueueEnterFullScreen(_THIS) +void +X11_QueueEnterFullScreen(_THIS) { switch_waiting = 0x01 | SDL_FULLSCREEN; switch_time = SDL_GetTicks() + 1500; -#if 0 /* This causes a BadMatch error if the window is iconified (not needed) */ +#if 0 /* This causes a BadMatch error if the window is iconified (not needed) */ XSetInputFocus(SDL_Display, WMwindow, RevertToNone, CurrentTime); #endif } -int X11_EnterFullScreen(_THIS) +int +X11_EnterFullScreen(_THIS) { int okay; #if 0 @@ -958,19 +795,19 @@ int screen_h; okay = 1; - if ( currently_fullscreen ) { - return(okay); + if (currently_fullscreen) { + return (okay); } /* Ungrab the input so that we can move the mouse around */ X11_GrabInputNoLock(this, SDL_GRAB_OFF); #if SDL_VIDEO_DRIVER_X11_XINERAMA - if ( use_xinerama && - window_w <= xinerama_info.width && - window_h <= xinerama_info.height ) { - x = xinerama_info.x_org; - y = xinerama_info.y_org; + if (use_xinerama && + window_w <= xinerama[this->current_display].width && + window_h <= xinerama[this->current_display].height) { + x = xinerama[this->current_display].x_org; + y = xinerama[this->current_display].y_org; } #endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */ @@ -978,32 +815,31 @@ screen_w = DisplayWidth(SDL_Display, SDL_Screen); screen_h = DisplayHeight(SDL_Display, SDL_Screen); get_real_resolution(this, &real_w, &real_h); - if ( window_w > real_w ) { + if (window_w > real_w) { real_w = MAX(real_w, screen_w); } - if ( window_h > real_h ) { + if (window_h > real_h) { real_h = MAX(real_h, screen_h); } - XMoveResizeWindow(SDL_Display, FSwindow, - x, y, real_w, real_h); + XMoveResizeWindow(SDL_Display, FSwindow, x, y, real_w, real_h); XMapRaised(SDL_Display, FSwindow); X11_WaitMapped(this, FSwindow); -#if 0 /* This seems to break WindowMaker in focus-follows-mouse mode */ +#if 0 /* This seems to break WindowMaker in focus-follows-mouse mode */ /* Make sure we got to the top of the window stack */ - if ( XQueryTree(SDL_Display, SDL_Root, &tmpwin, &tmpwin, - &windows, &nwindows) && windows ) { + if (XQueryTree(SDL_Display, SDL_Root, &tmpwin, &tmpwin, + &windows, &nwindows) && windows) { /* If not, try to put us there - if fail... oh well */ - if ( windows[nwindows-1] != FSwindow ) { - tmpwin = windows[nwindows-1]; - for ( i=0; i<nwindows; ++i ) { - if ( windows[i] == FSwindow ) { - SDL_memcpy(&windows[i], &windows[i+1], - (nwindows-i-1)*sizeof(windows[i])); + if (windows[nwindows - 1] != FSwindow) { + tmpwin = windows[nwindows - 1]; + for (i = 0; i < nwindows; ++i) { + if (windows[i] == FSwindow) { + SDL_memcpy(&windows[i], &windows[i + 1], + (nwindows - i - 1) * sizeof(windows[i])); break; } } - windows[nwindows-1] = FSwindow; + windows[nwindows - 1] = FSwindow; XRestackWindows(SDL_Display, windows, nwindows); XSync(SDL_Display, False); } @@ -1015,70 +851,70 @@ #if SDL_VIDEO_DRIVER_X11_VIDMODE /* Save the current video mode */ - if ( use_vidmode ) { - SDL_NAME(XF86VidModeLockModeSwitch)(SDL_Display, SDL_Screen, True); + if (use_vidmode) { + SDL_NAME(XF86VidModeLockModeSwitch) (SDL_Display, SDL_Screen, True); } #endif currently_fullscreen = 1; /* Set the new resolution */ okay = X11_ResizeFullScreen(this); - if ( ! okay ) { + if (!okay) { X11_LeaveFullScreen(this); } /* Set the colormap */ - if ( SDL_XColorMap ) { + if (SDL_XColorMap) { XInstallColormap(SDL_Display, SDL_XColorMap); } - if ( okay ) { - X11_GrabInputNoLock(this, this->input_grab | SDL_GRAB_FULLSCREEN); + if (okay) { + X11_GrabInputNoLock(this, + SDL_CurrentWindow. + input_grab | SDL_GRAB_FULLSCREEN); } /* We may need to refresh the screen at this point (no backing store) We also don't get an event, which is why we explicitly refresh. */ - if ( this->screen ) { - if ( this->screen->flags & SDL_OPENGL ) { + if (SDL_VideoSurface) { + if (SDL_VideoSurface->flags & SDL_INTERNALOPENGL) { SDL_PrivateExpose(); } else { X11_RefreshDisplay(this); } } - return(okay); + return (okay); } -int X11_LeaveFullScreen(_THIS) +int +X11_LeaveFullScreen(_THIS) { - if ( currently_fullscreen ) { + if (currently_fullscreen) { XReparentWindow(SDL_Display, SDL_Window, WMwindow, 0, 0); #if SDL_VIDEO_DRIVER_X11_VIDMODE - if ( use_vidmode ) { + if (use_vidmode) { restore_mode(this); - SDL_NAME(XF86VidModeLockModeSwitch)(SDL_Display, SDL_Screen, False); + SDL_NAME(XF86VidModeLockModeSwitch) (SDL_Display, SDL_Screen, + False); } #endif #if SDL_VIDEO_DRIVER_X11_XME - if ( use_xme ) { - int rw, rh; - + if (use_xme) { + int rw, rh; + /* check current mode so we can avoid uneccessary mode changes */ get_real_resolution(this, &rw, &rh); if (rw != saved_res.width || rh != saved_res.height) { - XiGMiscChangeResolution(SDL_Display, - SDL_Screen, - 0, /* view */ - saved_res.width, - saved_res.height, - 0); + XiGMiscChangeResolution(SDL_Display, SDL_Screen, 0, /* view */ + saved_res.width, saved_res.height, 0); XSync(SDL_Display, False); } } #endif #if SDL_VIDEO_DRIVER_X11_XRANDR - if ( use_xrandr ) { + if (use_xrandr) { XRRSetScreenConfig(SDL_Display, screen_config, SDL_Root, saved_size_id, saved_rotation, CurrentTime); } @@ -1086,7 +922,7 @@ XUnmapWindow(SDL_Display, FSwindow); X11_WaitUnmapped(this, FSwindow); - XSync(SDL_Display, True); /* Flush spurious mode change events */ + XSync(SDL_Display, True); /* Flush spurious mode change events */ currently_fullscreen = 0; } /* If we get popped out of fullscreen mode for some reason, input_grab @@ -1094,17 +930,36 @@ temporary. In this case, release the grab unless the input has been explicitly grabbed. */ - X11_GrabInputNoLock(this, this->input_grab & ~SDL_GRAB_FULLSCREEN); + X11_GrabInputNoLock(this, + SDL_CurrentWindow.input_grab & ~SDL_GRAB_FULLSCREEN); /* We may need to refresh the screen at this point (no backing store) We also don't get an event, which is why we explicitly refresh. */ - if ( this->screen ) { - if ( this->screen->flags & SDL_OPENGL ) { + if (SDL_VideoSurface) { + if (SDL_VideoSurface->flags & SDL_INTERNALOPENGL) { SDL_PrivateExpose(); } else { X11_RefreshDisplay(this); } } - return(0); + return (0); } + +Uint32 +X11_VisualToFormat(const Visual * visual, int depth, int bpp) +{ + Uint32 Rmask = visual->red_mask; + Uint32 Gmask = visual->green_mask; + Uint32 Bmask = visual->blue_mask; + Uint32 Amask; + + if (depth == 32) { + Amask = (0xFFFFFFFF & ~(Rmask | Gmask | Bmask)); + } else { + Amask = 0; + } + return (SDL_MasksToPixelFormatEnum(bpp, Rmask, Gmask, Bmask, Amask)); +} + +/* vi: set ts=4 sw=4 expandtab: */