pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

indent

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403336
This commit is contained in:
Sam Lantinga 2008-12-16 17:44:10 +00:00
parent a01b1f5aec
commit 67426e7b9f
3 changed files with 107 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

142
src/video/x11/SDL_x11modes.c
View file

@ -62,7 +62,7 @@ get_visualinfo(Display * display, int screen, XVisualInfo * vinfo)
} }
static Uint32 static Uint32
X11_GetPixelFormatFromVisualInfo(Display *display, XVisualInfo *vinfo) X11_GetPixelFormatFromVisualInfo(Display * display, XVisualInfo * vinfo)
{ {
if (vinfo->class == DirectColor || vinfo->class == TrueColor) { if (vinfo->class == DirectColor || vinfo->class == TrueColor) {
int bpp; int bpp;
@ -162,7 +162,7 @@ int vm_event, vm_error = -1;
#if SDL_VIDEO_DRIVER_X11_XINERAMA #if SDL_VIDEO_DRIVER_X11_XINERAMA
static SDL_bool static SDL_bool
CheckXinerama(Display *display, int *major, int *minor) CheckXinerama(Display * display, int *major, int *minor)
{ {
const char *env; const char *env;
@ -176,8 +176,8 @@ CheckXinerama(Display *display, int *major, int *minor)
} }
/* Query the extension version */ /* Query the extension version */
if (!SDL_NAME(XineramaQueryExtension)(display, major, minor) || if (!SDL_NAME(XineramaQueryExtension) (display, major, minor) ||
!SDL_NAME(XineramaIsActive)(display)) { !SDL_NAME(XineramaIsActive) (display)) {
return SDL_FALSE; return SDL_FALSE;
} }
return SDL_TRUE; return SDL_TRUE;
@ -186,7 +186,7 @@ CheckXinerama(Display *display, int *major, int *minor)
#if SDL_VIDEO_DRIVER_X11_XRANDR #if SDL_VIDEO_DRIVER_X11_XRANDR
static SDL_bool static SDL_bool
CheckXRandR(Display *display, int *major, int *minor) CheckXRandR(Display * display, int *major, int *minor)
{ {
const char *env; const char *env;
@ -213,7 +213,7 @@ CheckXRandR(Display *display, int *major, int *minor)
#if SDL_VIDEO_DRIVER_X11_VIDMODE #if SDL_VIDEO_DRIVER_X11_VIDMODE
static SDL_bool static SDL_bool
CheckVidMode(Display *display, int *major, int *minor) CheckVidMode(Display * display, int *major, int *minor)
{ {
const char *env; const char *env;
@ -225,24 +225,25 @@ CheckVidMode(Display *display, int *major, int *minor)
if (env && !SDL_atoi(env)) { if (env && !SDL_atoi(env)) {
return SDL_FALSE; return SDL_FALSE;
} }
/* Query the extension version */ /* Query the extension version */
vm_error = -1; vm_error = -1;
if (!SDL_NAME(XF86VidModeQueryExtension)(display, &vm_event, &vm_error) || if (!SDL_NAME(XF86VidModeQueryExtension) (display, &vm_event, &vm_error)
!SDL_NAME(XF86VidModeQueryVersion)(display, major, minor)) { || !SDL_NAME(XF86VidModeQueryVersion) (display, major, minor)) {
return SDL_FALSE; return SDL_FALSE;
} }
return SDL_TRUE; return SDL_TRUE;
} }
Bool SDL_NAME(XF86VidModeGetModeInfo)(Display *dpy, int scr, SDL_NAME(XF86VidModeModeInfo) *info) Bool SDL_NAME(XF86VidModeGetModeInfo) (Display * dpy, int scr,
SDL_NAME(XF86VidModeModeInfo) * info)
{ {
Bool retval; Bool retval;
int dotclock; int dotclock;
SDL_NAME(XF86VidModeModeLine) l; SDL_NAME(XF86VidModeModeLine) l;
SDL_zerop(info); SDL_zerop(info);
SDL_zero(l); SDL_zero(l);
retval = SDL_NAME(XF86VidModeGetModeLine)(dpy, scr, &dotclock, &l); retval = SDL_NAME(XF86VidModeGetModeLine) (dpy, scr, &dotclock, &l);
info->dotclock = dotclock; info->dotclock = dotclock;
info->hdisplay = l.hdisplay; info->hdisplay = l.hdisplay;
info->hsyncstart = l.hsyncstart; info->hsyncstart = l.hsyncstart;
@ -260,30 +261,38 @@ Bool SDL_NAME(XF86VidModeGetModeInfo)(Display *dpy, int scr, SDL_NAME(XF86VidMod
} }
static int static int
calculate_rate(SDL_NAME(XF86VidModeModeInfo) *info) calculate_rate(SDL_NAME(XF86VidModeModeInfo) * info)
{ {
return (info->htotal && info->vtotal) ? (1000 * info->dotclock / (info->htotal * info->vtotal)) : 0; return (info->htotal
&& info->vtotal) ? (1000 * info->dotclock / (info->htotal *
info->vtotal)) : 0;
} }
static void static void
save_mode(Display *display, SDL_DisplayData *data) save_mode(Display * display, SDL_DisplayData * data)
{ {
SDL_NAME(XF86VidModeGetModeInfo)(display, data->screen, &data->saved_mode); SDL_NAME(XF86VidModeGetModeInfo) (display, data->screen,
SDL_NAME(XF86VidModeGetViewPort)(display, data->screen, &data->saved_view.x,&data->saved_view.y); &data->saved_mode);
SDL_NAME(XF86VidModeGetViewPort) (display, data->screen,
&data->saved_view.x,
&data->saved_view.y);
} }
static void static void
restore_mode(Display *display, SDL_DisplayData *data) restore_mode(Display * display, SDL_DisplayData * data)
{ {
SDL_NAME(XF86VidModeModeInfo) mode; SDL_NAME(XF86VidModeModeInfo) mode;
if (SDL_NAME(XF86VidModeGetModeInfo)(display, data->screen, &mode)) { if (SDL_NAME(XF86VidModeGetModeInfo) (display, data->screen, &mode)) {
if (SDL_memcmp(&mode, &data->saved_mode, sizeof(mode)) != 0) { if (SDL_memcmp(&mode, &data->saved_mode, sizeof(mode)) != 0) {
SDL_NAME(XF86VidModeSwitchToMode)(display, data->screen, &data->saved_mode); SDL_NAME(XF86VidModeSwitchToMode) (display, data->screen,
&data->saved_mode);
} }
} }
if ((data->saved_view.x != 0) || (data->saved_view.y != 0)) { if ((data->saved_view.x != 0) || (data->saved_view.y != 0)) {
SDL_NAME(XF86VidModeSetViewPort)(display, data->screen, data->saved_view.x, data->saved_view.y); SDL_NAME(XF86VidModeSetViewPort) (display, data->screen,
data->saved_view.x,
data->saved_view.y);
} }
} }
#endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */ #endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */
@ -296,7 +305,7 @@ X11_GetDisplayModes(_THIS)
#if SDL_VIDEO_DRIVER_X11_XINERAMA #if SDL_VIDEO_DRIVER_X11_XINERAMA
int xinerama_major, xinerama_minor; int xinerama_major, xinerama_minor;
int screens; int screens;
SDL_NAME(XineramaScreenInfo) *xinerama; SDL_NAME(XineramaScreenInfo) * xinerama;
#endif #endif
#if SDL_VIDEO_DRIVER_X11_XRANDR #if SDL_VIDEO_DRIVER_X11_XRANDR
int xrandr_major, xrandr_minor; int xrandr_major, xrandr_minor;
@ -307,7 +316,7 @@ X11_GetDisplayModes(_THIS)
#if SDL_VIDEO_DRIVER_X11_VIDMODE #if SDL_VIDEO_DRIVER_X11_VIDMODE
int vm_major, vm_minor; int vm_major, vm_minor;
int nmodes; int nmodes;
SDL_NAME(XF86VidModeModeInfo) **modes; SDL_NAME(XF86VidModeModeInfo) ** modes;
#endif #endif
int screen_w; int screen_w;
int screen_h; int screen_h;
@ -334,18 +343,19 @@ X11_GetDisplayModes(_THIS)
#ifdef X11MODES_DEBUG #ifdef X11MODES_DEBUG
printf("X11 detected Xinerama:\n"); printf("X11 detected Xinerama:\n");
#endif #endif
xinerama = SDL_NAME(XineramaQueryScreens)(display, &screens); xinerama = SDL_NAME(XineramaQueryScreens) (display, &screens);
if (xinerama) { if (xinerama) {
int i; int i;
for (i = 0; i < screens; i++) { for (i = 0; i < screens; i++) {
#ifdef X11MODES_DEBUG #ifdef X11MODES_DEBUG
printf("xinerama %d: %dx%d+%d+%d\n", printf("xinerama %d: %dx%d+%d+%d\n",
xinerama[i].screen_number, xinerama[i].screen_number,
xinerama[i].width, xinerama[i].height, xinerama[i].width, xinerama[i].height,
xinerama[i].x_org, xinerama[i].y_org); xinerama[i].x_org, xinerama[i].y_org);
#endif #endif
if (xinerama[i].screen_number == data->screen) { if (xinerama[i].screen_number == data->screen) {
data->use_xinerama = xinerama_major * 100 + xinerama_minor; data->use_xinerama =
xinerama_major * 100 + xinerama_minor;
data->xinerama_info = xinerama[i]; data->xinerama_info = xinerama[i];
} }
} }
@ -374,7 +384,8 @@ X11_GetDisplayModes(_THIS)
#if SDL_VIDEO_DRIVER_X11_XRANDR #if SDL_VIDEO_DRIVER_X11_XRANDR
/* XRandR */ /* XRandR */
/* require at least XRandR v1.0 (arbitrary) */ /* require at least XRandR v1.0 (arbitrary) */
if (CheckXRandR(display, &xrandr_major, &xrandr_minor) && xrandr_major >= 1) { if (CheckXRandR(display, &xrandr_major, &xrandr_minor)
&& xrandr_major >= 1) {
#ifdef X11MODES_DEBUG #ifdef X11MODES_DEBUG
fprintf(stderr, "XRANDR: XRRQueryVersion: V%d.%d\n", fprintf(stderr, "XRANDR: XRRQueryVersion: V%d.%d\n",
xrandr_major, xrandr_minor); xrandr_major, xrandr_minor);
@ -382,14 +393,15 @@ X11_GetDisplayModes(_THIS)
/* save the screen configuration since we must reference it /* save the screen configuration since we must reference it
each time we toggle modes. each time we toggle modes.
*/ */
data->screen_config = XRRGetScreenInfo(display, RootWindow(display, data->screen)); data->screen_config =
XRRGetScreenInfo(display, RootWindow(display, data->screen));
/* retrieve the list of resolution */ /* retrieve the list of resolution */
sizes = XRRConfigSizes(data->screen_config, &nsizes); sizes = XRRConfigSizes(data->screen_config, &nsizes);
if (nsizes > 0) { if (nsizes > 0) {
int i, j; int i, j;
for ( i=0; i < nsizes; i++) { for (i = 0; i < nsizes; i++) {
mode.w = sizes[i].width; mode.w = sizes[i].width;
mode.h = sizes[i].height; mode.h = sizes[i].height;
@ -397,7 +409,8 @@ X11_GetDisplayModes(_THIS)
for (j = 0; j < nrates; ++j) { for (j = 0; j < nrates; ++j) {
mode.refresh_rate = rates[j]; mode.refresh_rate = rates[j];
#ifdef X11MODES_DEBUG #ifdef X11MODES_DEBUG
fprintf(stderr, "XRANDR: mode = %4d[%d], w = %4d, h = %4d, rate = %4d\n", fprintf(stderr,
"XRANDR: mode = %4d[%d], w = %4d, h = %4d, rate = %4d\n",
i, j, mode.w, mode.h, mode.refresh_rate); i, j, mode.w, mode.h, mode.refresh_rate);
#endif #endif
SDL_AddDisplayMode(_this->current_display, &mode); SDL_AddDisplayMode(_this->current_display, &mode);
@ -405,7 +418,9 @@ X11_GetDisplayModes(_THIS)
} }
data->use_xrandr = xrandr_major * 100 + xrandr_minor; data->use_xrandr = xrandr_major * 100 + xrandr_minor;
data->saved_size = XRRConfigCurrentConfiguration(data->screen_config, &data->saved_rotation); data->saved_size =
XRRConfigCurrentConfiguration(data->screen_config,
&data->saved_rotation);
data->saved_rate = XRRConfigCurrentRate(data->screen_config); data->saved_rate = XRRConfigCurrentRate(data->screen_config);
} }
} }
@ -418,16 +433,16 @@ X11_GetDisplayModes(_THIS)
(!data->use_xinerama || data->xinerama_info.screen_number == 0) && (!data->use_xinerama || data->xinerama_info.screen_number == 0) &&
#endif #endif
CheckVidMode(display, &vm_major, &vm_minor) && CheckVidMode(display, &vm_major, &vm_minor) &&
SDL_NAME(XF86VidModeGetAllModeLines)(display, data->screen, &nmodes, &modes) ) SDL_NAME(XF86VidModeGetAllModeLines) (display, data->screen, &nmodes,
{ &modes)) {
int i; int i;
#ifdef X11MODES_DEBUG #ifdef X11MODES_DEBUG
printf("VidMode modes: (unsorted)\n"); 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, printf("Mode %d: %d x %d @ %d\n", i,
modes[i]->hdisplay, modes[i]->vdisplay, modes[i]->hdisplay, modes[i]->vdisplay,
calculate_rate(modes[i])); calculate_rate(modes[i]));
} }
#endif #endif
for (i = 0; i < nmodes; ++i) { for (i = 0; i < nmodes; ++i) {
@ -448,8 +463,7 @@ X11_GetDisplayModes(_THIS)
mode.h = screen_h; mode.h = screen_h;
mode.refresh_rate = 0; mode.refresh_rate = 0;
SDL_AddDisplayMode(_this->current_display, &mode); SDL_AddDisplayMode(_this->current_display, &mode);
} }
#ifdef X11MODES_DEBUG #ifdef X11MODES_DEBUG
if (data->use_xinerama) { if (data->use_xinerama) {
printf("Xinerama is enabled\n"); printf("Xinerama is enabled\n");
@ -466,24 +480,29 @@ X11_GetDisplayModes(_THIS)
} }
static void static void
get_real_resolution(Display *display, SDL_DisplayData *data, int *w, int *h, int *rate) get_real_resolution(Display * display, SDL_DisplayData * data, int *w, int *h,
int *rate)
{ {
#if SDL_VIDEO_DRIVER_X11_XRANDR #if SDL_VIDEO_DRIVER_X11_XRANDR
if (data->use_xrandr) { if (data->use_xrandr) {
int nsizes; int nsizes;
XRRScreenSize *sizes; XRRScreenSize *sizes;
sizes = XRRConfigSizes(data->screen_config, &nsizes); sizes = XRRConfigSizes(data->screen_config, &nsizes);
if (nsizes > 0) { if (nsizes > 0) {
int cur_size; int cur_size;
Rotation cur_rotation; Rotation cur_rotation;
cur_size = XRRConfigCurrentConfiguration(data->screen_config, &cur_rotation); cur_size =
XRRConfigCurrentConfiguration(data->screen_config,
&cur_rotation);
*w = sizes[cur_size].width; *w = sizes[cur_size].width;
*h = sizes[cur_size].height; *h = sizes[cur_size].height;
*rate = XRRConfigCurrentRate(data->screen_config); *rate = XRRConfigCurrentRate(data->screen_config);
#ifdef X11MODES_DEBUG #ifdef X11MODES_DEBUG
fprintf(stderr, "XRANDR: get_real_resolution: w = %d, h = %d, rate = %d\n", *w, *h, *rate); fprintf(stderr,
"XRANDR: get_real_resolution: w = %d, h = %d, rate = %d\n",
*w, *h, *rate);
#endif #endif
return; return;
} }
@ -494,7 +513,7 @@ get_real_resolution(Display *display, SDL_DisplayData *data, int *w, int *h, int
if (data->use_vidmode) { if (data->use_vidmode) {
SDL_NAME(XF86VidModeModeInfo) mode; SDL_NAME(XF86VidModeModeInfo) mode;
if (SDL_NAME(XF86VidModeGetModeInfo)(display, data->screen, &mode)) { if (SDL_NAME(XF86VidModeGetModeInfo) (display, data->screen, &mode)) {
*w = mode.hdisplay; *w = mode.hdisplay;
*h = mode.vdisplay; *h = mode.vdisplay;
*rate = calculate_rate(&mode); *rate = calculate_rate(&mode);
@ -518,7 +537,8 @@ get_real_resolution(Display *display, SDL_DisplayData *data, int *w, int *h, int
} }
static void static void
set_best_resolution(Display *display, SDL_DisplayData *data, int w, int h, int rate) set_best_resolution(Display * display, SDL_DisplayData * data, int w, int h,
int rate)
{ {
int real_w, real_h, real_rate; int real_w, real_h, real_rate;
@ -527,7 +547,6 @@ set_best_resolution(Display *display, SDL_DisplayData *data, int w, int h, int r
if (w == real_w && h == real_h && (!rate || rate == real_rate)) { if (w == real_w && h == real_h && (!rate || rate == real_rate)) {
return; return;
} }
#if SDL_VIDEO_DRIVER_X11_XRANDR #if SDL_VIDEO_DRIVER_X11_XRANDR
if (data->use_xrandr) { if (data->use_xrandr) {
#ifdef X11MODES_DEBUG #ifdef X11MODES_DEBUG
@ -553,7 +572,8 @@ set_best_resolution(Display *display, SDL_DisplayData *data, int w, int h, int r
} }
if (best == -1 || if (best == -1 ||
(sizes[i].width < sizes[best].width) || (sizes[i].width < sizes[best].width) ||
(sizes[i].width == sizes[best].width && sizes[i].height < sizes[best].height)) { (sizes[i].width == sizes[best].width
&& sizes[i].height < sizes[best].height)) {
best = i; best = i;
} }
} }
@ -572,12 +592,15 @@ set_best_resolution(Display *display, SDL_DisplayData *data, int w, int h, int r
best_rate = rates[i]; best_rate = rates[i];
} }
} else { } else {
if (SDL_abs(rates[i]-rate) < SDL_abs(best_rate-rate)) { if (SDL_abs(rates[i] - rate) < SDL_abs(best_rate - rate)) {
best_rate = rates[i]; best_rate = rates[i];
} }
} }
} }
XRRSetScreenConfigAndRate(display, data->screen_config, RootWindow(display, data->screen), best, data->saved_rotation, best_rate, CurrentTime); XRRSetScreenConfigAndRate(display, data->screen_config,
RootWindow(display, data->screen), best,
data->saved_rotation, best_rate,
CurrentTime);
} }
return; return;
} }
@ -585,11 +608,12 @@ set_best_resolution(Display *display, SDL_DisplayData *data, int w, int h, int r
#if SDL_VIDEO_DRIVER_X11_VIDMODE #if SDL_VIDEO_DRIVER_X11_VIDMODE
if (data->use_vidmode) { if (data->use_vidmode) {
SDL_NAME(XF86VidModeModeInfo) **modes; SDL_NAME(XF86VidModeModeInfo) ** modes;
int i, nmodes; int i, nmodes;
int best; int best;
if (SDL_NAME(XF86VidModeGetAllModeLines)(display,data->screen,&nmodes,&modes)) { if (SDL_NAME(XF86VidModeGetAllModeLines)
(display, data->screen, &nmodes, &modes)) {
best = -1; best = -1;
for (i = 0; i < nmodes; ++i) { for (i = 0; i < nmodes; ++i) {
if (modes[i]->hdisplay < w || modes[i]->vdisplay < h) { if (modes[i]->hdisplay < w || modes[i]->vdisplay < h) {
@ -597,7 +621,8 @@ set_best_resolution(Display *display, SDL_DisplayData *data, int w, int h, int r
} }
if (best == -1 || if (best == -1 ||
(modes[i]->hdisplay < modes[best]->hdisplay) || (modes[i]->hdisplay < modes[best]->hdisplay) ||
(modes[i]->hdisplay == modes[best]->hdisplay && modes[i]->vdisplay < modes[best]->vdisplay)) { (modes[i]->hdisplay == modes[best]->hdisplay
&& modes[i]->vdisplay < modes[best]->vdisplay)) {
best = i; best = i;
continue; continue;
} }
@ -605,11 +630,13 @@ set_best_resolution(Display *display, SDL_DisplayData *data, int w, int h, int r
(modes[i]->vdisplay == modes[best]->vdisplay)) { (modes[i]->vdisplay == modes[best]->vdisplay)) {
if (!rate) { if (!rate) {
/* Higher is better, right? */ /* Higher is better, right? */
if (calculate_rate(modes[i]) > calculate_rate(modes[best])) { if (calculate_rate(modes[i]) >
calculate_rate(modes[best])) {
best = i; best = i;
} }
} else { } else {
if (SDL_abs(calculate_rate(modes[i])-rate) < SDL_abs(calculate_rate(modes[best])-rate)) { if (SDL_abs(calculate_rate(modes[i]) - rate) <
SDL_abs(calculate_rate(modes[best]) - rate)) {
best = i; best = i;
} }
} }
@ -618,10 +645,11 @@ set_best_resolution(Display *display, SDL_DisplayData *data, int w, int h, int r
if (best >= 0) { if (best >= 0) {
#ifdef X11MODES_DEBUG #ifdef X11MODES_DEBUG
printf("Best Mode %d: %d x %d @ %d\n", best, printf("Best Mode %d: %d x %d @ %d\n", best,
modes[best]->hdisplay, modes[best]->vdisplay, modes[best]->hdisplay, modes[best]->vdisplay,
calculate_rate(modes[best])); calculate_rate(modes[best]));
#endif #endif
SDL_NAME(XF86VidModeSwitchToMode)(display, data->screen, modes[best]); SDL_NAME(XF86VidModeSwitchToMode) (display, data->screen,
modes[best]);
} }
XFree(modes); XFree(modes);
} }

7
src/video/x11/SDL_x11modes.h
View file

@ -35,7 +35,7 @@ typedef struct
int use_vidmode; int use_vidmode;
#if SDL_VIDEO_DRIVER_X11_XINERAMA #if SDL_VIDEO_DRIVER_X11_XINERAMA
SDL_NAME(XineramaScreenInfo) xinerama_info; SDL_NAME(XineramaScreenInfo) xinerama_info;
#endif #endif
#if SDL_VIDEO_DRIVER_X11_XRANDR #if SDL_VIDEO_DRIVER_X11_XRANDR
XRRScreenConfiguration *screen_config; XRRScreenConfiguration *screen_config;
@ -44,8 +44,9 @@ typedef struct
short saved_rate; short saved_rate;
#endif #endif
#if SDL_VIDEO_DRIVER_X11_VIDMODE #if SDL_VIDEO_DRIVER_X11_VIDMODE
SDL_NAME(XF86VidModeModeInfo) saved_mode; SDL_NAME(XF86VidModeModeInfo) saved_mode;
struct { struct
{
int x, y; int x, y;
} saved_view; } saved_view;
#endif #endif

25
src/video/x11/SDL_x11render.c
View file

@ -236,7 +236,9 @@ X11_CreateRenderer(SDL_Window * window, Uint32 flags)
data->current_pixmap = 0; data->current_pixmap = 0;
/* Get the format of the window */ /* Get the format of the window */
if (!SDL_PixelFormatEnumToMasks(display->current_mode.format, &bpp, &Rmask, &Gmask, &Bmask, &Amask)) { if (!SDL_PixelFormatEnumToMasks
(display->current_mode.format, &bpp, &Rmask, &Gmask, &Bmask,
&Amask)) {
SDL_SetError("Unknown display format"); SDL_SetError("Unknown display format");
X11_DestroyRenderer(renderer); X11_DestroyRenderer(renderer);
return NULL; return NULL;
@ -325,7 +327,7 @@ X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
} else { } else {
/* The image/pixmap depth must be the same as the window or you /* The image/pixmap depth must be the same as the window or you
get a BadMatch error when trying to putimage or copyarea. get a BadMatch error when trying to putimage or copyarea.
*/ */
if (texture->format != display->current_mode.format) { if (texture->format != display->current_mode.format) {
SDL_SetError("Texture format doesn't match window format"); SDL_SetError("Texture format doesn't match window format");
return -1; return -1;
@ -364,7 +366,9 @@ X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
data->pixels = shminfo->shmaddr; data->pixels = shminfo->shmaddr;
data->image = data->image =
XShmCreateImage(renderdata->display, renderdata->visual, renderdata->depth, ZPixmap, shminfo->shmaddr, shminfo, texture->w, texture->h); XShmCreateImage(renderdata->display, renderdata->visual,
renderdata->depth, ZPixmap, shminfo->shmaddr,
shminfo, texture->w, texture->h);
if (!data->image) { if (!data->image) {
XShmDetach(renderdata->display, shminfo); XShmDetach(renderdata->display, shminfo);
XSync(renderdata->display, False); XSync(renderdata->display, False);
@ -386,7 +390,11 @@ X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
} }
data->image = data->image =
XCreateImage(renderdata->display, renderdata->visual, renderdata->depth, ZPixmap, 0, data->pixels, texture->w, texture->h, SDL_BYTESPERPIXEL(data->format) * 8, data->pitch); XCreateImage(renderdata->display, renderdata->visual,
renderdata->depth, ZPixmap, 0, data->pixels,
texture->w, texture->h,
SDL_BYTESPERPIXEL(data->format) * 8,
data->pitch);
if (!data->image) { if (!data->image) {
X11_DestroyTexture(renderer, texture); X11_DestroyTexture(renderer, texture);
SDL_SetError("XCreateImage() failed"); SDL_SetError("XCreateImage() failed");
@ -404,7 +412,10 @@ X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
} }
data->image = data->image =
XCreateImage(renderdata->display, renderdata->visual, renderdata->depth, ZPixmap, 0, NULL, texture->w, texture->h, SDL_BYTESPERPIXEL(data->format) * 8, data->pitch); XCreateImage(renderdata->display, renderdata->visual,
renderdata->depth, ZPixmap, 0, NULL, texture->w,
texture->h, SDL_BYTESPERPIXEL(data->format) * 8,
data->pitch);
if (!data->image) { if (!data->image) {
X11_DestroyTexture(renderer, texture); X11_DestroyTexture(renderer, texture);
SDL_SetError("XCreateImage() failed"); SDL_SetError("XCreateImage() failed");
@ -606,8 +617,8 @@ X11_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
} }
image = image =
XCreateImage(data->display, data->visual, data->depth, ZPixmap, XCreateImage(data->display, data->visual, data->depth,
0, pixels, dstrect->w, dstrect->h, ZPixmap, 0, pixels, dstrect->w, dstrect->h,
SDL_BYTESPERPIXEL(texturedata->format) * 8, SDL_BYTESPERPIXEL(texturedata->format) * 8,
pitch); pitch);
if (!image) { if (!image) {